Hibernate SVN: r18345 - core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 10:56:44 -0500 (Tue, 29 Dec 2009)
New Revision: 18345
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java
Log:
minor change, correct javadoc spell
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java 2009-12-29 15:56:02 UTC (rev 18344)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java 2009-12-29 15:56:44 UTC (rev 18345)
@@ -39,7 +39,7 @@
import java.util.Set;
/**
- * Defines the constract of an HQL->SQL translator.
+ * Defines the contract of an HQL->SQL translator.
*
* @author josh
*/
14 years, 11 months
Hibernate SVN: r18344 - core/trunk/core/src/main/java/org/hibernate/hql.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 10:56:02 -0500 (Tue, 29 Dec 2009)
New Revision: 18344
Modified:
core/trunk/core/src/main/java/org/hibernate/hql/QueryTranslator.java
Log:
minor change, correct javadoc spell
Modified: core/trunk/core/src/main/java/org/hibernate/hql/QueryTranslator.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/hql/QueryTranslator.java 2009-12-29 15:55:12 UTC (rev 18343)
+++ core/trunk/core/src/main/java/org/hibernate/hql/QueryTranslator.java 2009-12-29 15:56:02 UTC (rev 18344)
@@ -39,7 +39,7 @@
import java.util.Set;
/**
- * Defines the constract of an HQL->SQL translator.
+ * Defines the contract of an HQL->SQL translator.
*
* @author josh
*/
@@ -74,7 +74,7 @@
throws HibernateException;
/**
- * Perform an iterate operation given the underlying query defintion.
+ * Perform an iterate operation given the underlying query definition.
*
* @param queryParameters The query bind parameters.
* @param session The session owning this query.
@@ -85,7 +85,7 @@
throws HibernateException;
/**
- * Perform a scroll operation given the underlying query defintion.
+ * Perform a scroll operation given the underlying query definition.
*
* @param queryParameters The query bind parameters.
* @param session The session owning this query.
@@ -96,7 +96,7 @@
throws HibernateException;
/**
- * Perform a bulk update/delete operation given the underlying query defintion.
+ * Perform a bulk update/delete operation given the underlying query definition.
*
* @param queryParameters The query bind parameters.
* @param session The session owning this query.
@@ -107,7 +107,7 @@
throws HibernateException;
/**
- * Returns the set of query spaces (table names) that the query referrs to.
+ * Returns the set of query spaces (table names) that the query refers to.
*
* @return A set of query spaces (table names).
*/
@@ -115,7 +115,7 @@
/**
* Retrieve the query identifier for this translator. The query identifier is
- * used in stats collection.
+ * used in states collection.
*
* @return the identifier
*/
@@ -181,7 +181,7 @@
/**
* Does the translated query contain collection fetches?
*
- * @return tru if the query does contain collection fetched;
+ * @return true if the query does contain collection fetched;
* false otherwise.
*/
boolean containsCollectionFetches();
14 years, 11 months
Hibernate SVN: r18343 - core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 10:55:12 -0500 (Tue, 29 Dec 2009)
New Revision: 18343
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java
Log:
minor change, correct javadoc spell
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java 2009-12-29 14:47:06 UTC (rev 18342)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java 2009-12-29 15:55:12 UTC (rev 18343)
@@ -74,7 +74,7 @@
throws HibernateException;
/**
- * Perform an iterate operation given the underlying query defintion.
+ * Perform an iterate operation given the underlying query definition.
*
* @param queryParameters The query bind parameters.
* @param session The session owning this query.
@@ -85,7 +85,7 @@
throws HibernateException;
/**
- * Perform a scroll operation given the underlying query defintion.
+ * Perform a scroll operation given the underlying query definition.
*
* @param queryParameters The query bind parameters.
* @param session The session owning this query.
@@ -96,7 +96,7 @@
throws HibernateException;
/**
- * Perform a bulk update/delete operation given the underlying query defintion.
+ * Perform a bulk update/delete operation given the underlying query definition.
*
* @param queryParameters The query bind parameters.
* @param session The session owning this query.
@@ -107,7 +107,7 @@
throws HibernateException;
/**
- * Returns the set of query spaces (table names) that the query referrs to.
+ * Returns the set of query spaces (table names) that the query refers to.
*
* @return A set of query spaces (table names).
*/
@@ -115,7 +115,7 @@
/**
* Retrieve the query identifier for this translator. The query identifier is
- * used in stats collection.
+ * used in states collection.
*
* @return the identifier
*/
@@ -181,7 +181,7 @@
/**
* Does the translated query contain collection fetches?
*
- * @return tru if the query does contain collection fetched;
+ * @return true if the query does contain collection fetched;
* false otherwise.
*/
boolean containsCollectionFetches();
14 years, 11 months
Hibernate SVN: r18342 - in core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast: tree and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 09:47:06 -0500 (Tue, 29 Dec 2009)
New Revision: 18342
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java
Log:
minor chanage, correct javadoc spell
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java 2009-12-29 08:08:58 UTC (rev 18341)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java 2009-12-29 14:47:06 UTC (rev 18342)
@@ -104,7 +104,7 @@
* Implements methods used by the HQL->SQL tree transform grammar (a.k.a. the second phase).
* <ul>
* <li>Isolates the Hibernate API-specific code from the ANTLR generated code.</li>
- * <li>Handles the SQL framgents generated by the persisters in order to create the SELECT and FROM clauses,
+ * <li>Handles the SQL fragments generated by the persisters in order to create the SELECT and FROM clauses,
* taking into account the joins and projections that are implied by the mappings (persister/queryable).</li>
* <li>Uses SqlASTFactory to create customized AST nodes.</li>
* </ul>
@@ -231,7 +231,7 @@
// }
if ( isFilter() ) {
- // Handle collection-fiter compilation.
+ // Handle collection-filter compilation.
// IMPORTANT NOTE: This is modifying the INPUT (HQL) tree, not the output tree!
QueryableCollection persister = sessionFactoryHelper.getCollectionPersister( collectionFilterRole );
Type collectionElementType = persister.getElementType();
@@ -452,7 +452,7 @@
joinAlias = extractAppliedAlias( dotNode );
// todo : temporary
// needed because currently persister is the one that
- // creates and renders the join fragments for inheritence
+ // creates and renders the join fragments for inheritance
// hierarchies...
if ( !joinAlias.equals( referencedFromElement.getTableAlias() ) ) {
throw new InvalidWithClauseException( "with clause can only reference columns in the driving table" );
@@ -763,7 +763,7 @@
parameters.add( 0, paramSpec );
if ( sessionFactoryHelper.getFactory().getDialect().requiresCastingOfParametersInSelectClause() ) {
- // we need to wrtap the param in a cast()
+ // we need to wrap the param in a cast()
MethodNode versionMethodNode = ( MethodNode ) getASTFactory().create( HqlSqlTokenTypes.METHOD_CALL, "(" );
AST methodIdentNode = getASTFactory().create( HqlSqlTokenTypes.IDENT, "cast" );
versionMethodNode.addChild( methodIdentNode );
@@ -1015,7 +1015,7 @@
}
public boolean isShallowQuery() {
- // select clauses for insert statements should alwasy be treated as shallow
+ // select clauses for insert statements should always be treated as shallow
return getStatementType() == INSERT || queryTranslatorImpl.isShallowQuery();
}
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java 2009-12-29 08:08:58 UTC (rev 18341)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java 2009-12-29 14:47:06 UTC (rev 18342)
@@ -28,7 +28,7 @@
/**
* Currently this is needed in order to deal with {@link FromElement FromElements} which
- * conatin "hidden" JDBC parameters from applying filters.
+ * contains "hidden" JDBC parameters from applying filters.
* <p/>
* Would love for this to go away, but that would require that Hibernate's
* internal {@link org.hibernate.engine.JoinSequence join handling} be able to either:<ul>
@@ -60,7 +60,7 @@
public void addEmbeddedParameter(ParameterSpecification specification);
/**
- * Determine whether this node contans embedded parameters. The implication is that
+ * Determine whether this node contains embedded parameters. The implication is that
* {@link #getEmbeddedParameters()} is allowed to return null if this method returns false.
*
* @return True if this node contains embedded parameters; false otherwise.
14 years, 11 months
Hibernate SVN: r18341 - core/trunk/core/src/main/java/org/hibernate.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 03:08:58 -0500 (Tue, 29 Dec 2009)
New Revision: 18341
Modified:
core/trunk/core/src/main/java/org/hibernate/Session.java
Log:
minor change, correct javadoc spell
Modified: core/trunk/core/src/main/java/org/hibernate/Session.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/Session.java 2009-12-29 08:06:43 UTC (rev 18340)
+++ core/trunk/core/src/main/java/org/hibernate/Session.java 2009-12-29 08:08:58 UTC (rev 18341)
@@ -111,7 +111,7 @@
/**
* Force this session to flush. Must be called at the end of a
- * unit of work, before commiting the transaction and closing the
+ * unit of work, before committing the transaction and closing the
* session (depending on {@link #setFlushMode flush-mode},
* {@link Transaction#commit()} calls this method).
* <p/>
@@ -816,7 +816,7 @@
* Enable the named filter for this current session.
*
* @param filterName The name of the filter to be enabled.
- * @return The Filter instance representing the enabled fiter.
+ * @return The Filter instance representing the enabled filter.
*/
public Filter enableFilter(String filterName);
@@ -824,7 +824,7 @@
* Retrieve a currently enabled filter by name.
*
* @param filterName The name of the filter to be retrieved.
- * @return The Filter instance representing the enabled fiter.
+ * @return The Filter instance representing the enabled filter.
*/
public Filter getEnabledFilter(String filterName);
14 years, 11 months
Hibernate SVN: r18340 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 03:06:43 -0500 (Tue, 29 Dec 2009)
New Revision: 18340
Modified:
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml
Log:
JBPAPP-3310 HHH-4741 org.hibernate.test.filter.DynamicFilterTest.testSqlSyntaxOfFiltersWithUnions fails on MySQL
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml 2009-12-29 08:05:58 UTC (rev 18339)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml 2009-12-29 08:06:43 UTC (rev 18340)
@@ -21,7 +21,7 @@
<filter name="effectiveDate" condition=":asOfDate BETWEEN eff_start_dt and eff_end_dt"/>
<filter name="unioned">
- 'abc' in ( select d.reg from department d where (d.dept_id=123) union select p.name from sales_person p )
+ 'abc' in ( select d.reg from DEPARTMENT d where (d.dept_id=123) union select p.name from SALES_PERSON p )
</filter>
</class>
14 years, 11 months
Hibernate SVN: r18339 - core/trunk/testsuite/src/test/java/org/hibernate/test/filter.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 03:05:58 -0500 (Tue, 29 Dec 2009)
New Revision: 18339
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml
Log:
HHH-4741 org.hibernate.test.filter.DynamicFilterTest.testSqlSyntaxOfFiltersWithUnions fails on MySQL
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml 2009-12-29 08:04:16 UTC (rev 18338)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml 2009-12-29 08:05:58 UTC (rev 18339)
@@ -21,7 +21,7 @@
<filter name="effectiveDate" condition=":asOfDate BETWEEN eff_start_dt and eff_end_dt"/>
<filter name="unioned">
- 'abc' in ( select d.reg from department d where (d.dept_id=123) union select p.name from sales_person p )
+ 'abc' in ( select d.reg from DEPARTMENT d where (d.dept_id=123) union select p.name from SALES_PERSON p )
</filter>
</class>
14 years, 11 months
Hibernate SVN: r18338 - core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/filter.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 03:04:16 -0500 (Tue, 29 Dec 2009)
New Revision: 18338
Modified:
core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml
Log:
HHH-4741 org.hibernate.test.filter.DynamicFilterTest.testSqlSyntaxOfFiltersWithUnions fails on MySQL
Modified: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml 2009-12-29 07:50:55 UTC (rev 18337)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/filter/Category.hbm.xml 2009-12-29 08:04:16 UTC (rev 18338)
@@ -21,7 +21,7 @@
<filter name="effectiveDate" condition=":asOfDate BETWEEN eff_start_dt and eff_end_dt"/>
<filter name="unioned">
- 'abc' in ( select d.reg from department d where (d.dept_id=123) union select p.name from sales_person p )
+ 'abc' in ( select d.reg from DEPARTMENT d where (d.dept_id=123) union select p.name from SALES_PERSON p )
</filter>
</class>
14 years, 11 months
Hibernate SVN: r18337 - core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 02:50:55 -0500 (Tue, 29 Dec 2009)
New Revision: 18337
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Session.java
Log:
minor change, correct javadoc spell
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Session.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Session.java 2009-12-29 06:28:50 UTC (rev 18336)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Session.java 2009-12-29 07:50:55 UTC (rev 18337)
@@ -111,7 +111,7 @@
/**
* Force this session to flush. Must be called at the end of a
- * unit of work, before commiting the transaction and closing the
+ * unit of work, before committing the transaction and closing the
* session (depending on {@link #setFlushMode flush-mode},
* {@link Transaction#commit()} calls this method).
* <p/>
@@ -731,7 +731,7 @@
* Enable the named filter for this current session.
*
* @param filterName The name of the filter to be enabled.
- * @return The Filter instance representing the enabled fiter.
+ * @return The Filter instance representing the enabled filter.
*/
public Filter enableFilter(String filterName);
@@ -739,7 +739,7 @@
* Retrieve a currently enabled filter by name.
*
* @param filterName The name of the filter to be retrieved.
- * @return The Filter instance representing the enabled fiter.
+ * @return The Filter instance representing the enabled filter.
*/
public Filter getEnabledFilter(String filterName);
14 years, 11 months
Hibernate SVN: r18336 - core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/criteria.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-12-29 01:28:50 -0500 (Tue, 29 Dec 2009)
New Revision: 18336
Modified:
core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java
Log:
HHH-2166 update testcase to skip mssql server and oracle due to HHH-1123
Modified: core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java
===================================================================
--- core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java 2009-12-29 06:28:20 UTC (rev 18335)
+++ core/branches/Branch_3_3/testsuite/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java 2009-12-29 06:28:50 UTC (rev 18336)
@@ -32,6 +32,9 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.Oracle8iDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.test.hql.StateProvince;
@@ -53,7 +56,7 @@
return new String[] { "criteria/Animal.hbm.xml" };
}
- //HHH-1123
+ //HHH-2166
public void testLongInElementsByHQL(){
Session session = openSession();
Transaction t = session.beginTransaction();
@@ -77,8 +80,8 @@
}
- //HHH-1123
- public void te2stLongInElementsByCriteria(){
+ //HHH-2166
+ public void testLongInElementsByCriteria(){
Session session = openSession();
Transaction t = session.beginTransaction();
@@ -101,6 +104,13 @@
}
+ @Override
+ public boolean appliesTo( Dialect dialect ) {
+ //HHH-1123
+ return !(dialect instanceof SQLServerDialect) && !(dialect instanceof Oracle8iDialect);
+
+ }
+
private List createLotsOfElements(){
List list = new ArrayList();
for ( int i = 0; i < ELEMENTS_SIZE; i++ ){
14 years, 11 months