[hibernate-commits] [hibernate/hibernate-orm] 9304c2: Least-effort fix for HHH-2692

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 9304c2b3e94cb289f6144fcce8982beac9dc392e
      https://github.com/hibernate/hibernate-orm/commit/9304c2b3e94cb289f6144fcce8982beac9dc392e
  Author: Manuel Bernhardt <bernhardt.manuel at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M hibernate-core/src/main/antlr/hql-sql.g
    M hibernate-core/src/main/antlr/sql-gen.g
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectExpressionList.java
    M hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java

  Log Message:
  -----------
  Least-effort fix for HHH-2692

Conflicts:
	hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java
	hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java
	hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionList.java
	hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java


  Commit: 6ad0d4cfbefb8a198c52a14b8b4665fdf0a28e24
      https://github.com/hibernate/hibernate-orm/commit/6ad0d4cfbefb8a198c52a14b8b4665fdf0a28e24
  Author: Manuel Bernhardt <bernhardt.manuel at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java
    M hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java

  Log Message:
  -----------
  HHH-2692: Correctly reporting type mismatch in select...insert

Conflicts:
	hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java
	hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java


  Commit: f1e4bfbffdd7de412e35ec9599678a0b5569b3e3
      https://github.com/hibernate/hibernate-orm/commit/f1e4bfbffdd7de412e35ec9599678a0b5569b3e3
  Author: Manuel Bernhardt <bernhardt.manuel at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java
    M hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java

  Log Message:
  -----------
  HHH-2692 Handling subqueries in INSERT...SELECT, disallowing use of
:parameters in SELECT if not in INSERT...SELECT, additional test cases

Conflicts:
	hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java
	hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java


  Commit: 10930af5160f0b5d8aad37876e9618d978e947b6
      https://github.com/hibernate/hibernate-orm/commit/10930af5160f0b5d8aad37876e9618d978e947b6
  Author: Brett Meyer <brett at 3riverdev.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java

  Log Message:
  -----------
  HHH-2692 corrected failing test


Compare: https://github.com/hibernate/hibernate-orm/compare/51deee1e66b9...10930af5160f