[hibernate-commits] Hibernate SVN: r11321 - in branches/Branch_3_2/Hibernate3/src/org/hibernate: loader/criteria and 1 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Mar 20 07:51:09 EDT 2007
Author: steve.ebersole at jboss.com
Date: 2007-03-20 07:51:09 -0400 (Tue, 20 Mar 2007)
New Revision: 11321
Modified:
branches/Branch_3_2/Hibernate3/src/org/hibernate/id/MultipleHiLoPerTableGenerator.java
branches/Branch_3_2/Hibernate3/src/org/hibernate/loader/criteria/CriteriaLoader.java
branches/Branch_3_2/Hibernate3/src/org/hibernate/sql/ForUpdateFragment.java
Log:
fixed test suite failures
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/id/MultipleHiLoPerTableGenerator.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/id/MultipleHiLoPerTableGenerator.java 2007-03-20 11:50:53 UTC (rev 11320)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/id/MultipleHiLoPerTableGenerator.java 2007-03-20 11:51:09 UTC (rev 11321)
@@ -88,19 +88,19 @@
public String[] sqlCreateStrings(Dialect dialect) throws HibernateException {
return new String[] {
- new StringBuffer()
- .append( dialect.getCreateTableString() )
- .append( tableName )
- .append( " ( " )
- .append( pkColumnName )
- .append( ' ' )
- .append( dialect.getTypeName( Types.VARCHAR, keySize, 0, 0 ) )
- .append( ", " )
- .append( valueColumnName )
- .append( ' ' )
- .append( dialect.getTypeName( Types.INTEGER ) )
- .append( " ) " )
- .toString()
+ new StringBuffer( dialect.getCreateTableString() )
+ .append( ' ' )
+ .append( tableName )
+ .append( " ( " )
+ .append( pkColumnName )
+ .append( ' ' )
+ .append( dialect.getTypeName( Types.VARCHAR, keySize, 0, 0 ) )
+ .append( ", " )
+ .append( valueColumnName )
+ .append( ' ' )
+ .append( dialect.getTypeName( Types.INTEGER ) )
+ .append( " ) " )
+ .toString()
};
}
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/loader/criteria/CriteriaLoader.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/loader/criteria/CriteriaLoader.java 2007-03-20 11:50:53 UTC (rev 11320)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/loader/criteria/CriteriaLoader.java 2007-03-20 11:51:09 UTC (rev 11321)
@@ -129,11 +129,14 @@
final Map keyColumnNames = dialect.forUpdateOfColumns() ? new HashMap() : null;
final String[] drivingSqlAliases = getAliases();
for ( int i = 0; i < drivingSqlAliases.length; i++ ) {
- final Lockable drivingPersister = ( Lockable ) getEntityPersisters()[i];
- final String sqlAlias = drivingPersister.getRootTableAlias( drivingSqlAliases[i] );
- aliasedLockModes.put( sqlAlias, lockModes.get( drivingSqlAliases[i] ) );
- if ( keyColumnNames != null ) {
- keyColumnNames.put( sqlAlias, drivingPersister.getRootTableIdentifierColumnNames() );
+ final LockMode lockMode = ( LockMode ) lockModes.get( drivingSqlAliases[i] );
+ if ( lockMode != null ) {
+ final Lockable drivingPersister = ( Lockable ) getEntityPersisters()[i];
+ final String rootSqlAlias = drivingPersister.getRootTableAlias( drivingSqlAliases[i] );
+ aliasedLockModes.put( rootSqlAlias, lockMode );
+ if ( keyColumnNames != null ) {
+ keyColumnNames.put( rootSqlAlias, drivingPersister.getRootTableIdentifierColumnNames() );
+ }
}
}
return dialect.applyLocksToSql( sqlSelectString, aliasedLockModes, keyColumnNames );
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/sql/ForUpdateFragment.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/sql/ForUpdateFragment.java 2007-03-20 11:50:53 UTC (rev 11320)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/sql/ForUpdateFragment.java 2007-03-20 11:51:09 UTC (rev 11321)
@@ -16,57 +16,64 @@
private final StringBuffer aliases = new StringBuffer();
private boolean isNowaitEnabled;
private final Dialect dialect;
-
+
public ForUpdateFragment(Dialect dialect) {
this.dialect = dialect;
}
- public ForUpdateFragment addTableAlias(String alias) {
- if ( aliases.length()>0 ) aliases.append(", ");
- aliases.append(alias);
- return this;
- }
-
- public String toFragmentString() {
- if ( aliases.length()==0 ) return "";
- return isNowaitEnabled ?
- dialect.getForUpdateNowaitString( aliases.toString() ) :
- dialect.getForUpdateString( aliases.toString() );
- }
-
- public ForUpdateFragment setNowaitEnabled(boolean nowait) {
- isNowaitEnabled = nowait;
- return this;
- }
-
- public ForUpdateFragment(Dialect dialect, Map lockModes, Map keyColumnNames)
- throws QueryException {
- this(dialect);
+ public ForUpdateFragment(Dialect dialect, Map lockModes, Map keyColumnNames) throws QueryException {
+ this( dialect );
LockMode upgradeType = null;
Iterator iter = lockModes.entrySet().iterator();
while ( iter.hasNext() ) {
- final Map.Entry me = (Map.Entry) iter.next();
- final LockMode lockMode = (LockMode) me.getValue();
- if ( LockMode.READ.lessThan(lockMode) ) {
- final String tableAlias = (String) me.getKey();
+ final Map.Entry me = ( Map.Entry ) iter.next();
+ final LockMode lockMode = ( LockMode ) me.getValue();
+ if ( LockMode.READ.lessThan( lockMode ) ) {
+ final String tableAlias = ( String ) me.getKey();
if ( dialect.forUpdateOfColumns() ) {
- String[] keyColumns = (String[]) keyColumnNames.get(tableAlias); //use the id column alias
- if (keyColumns==null) {
- throw new IllegalArgumentException("alias not found: " + tableAlias);
+ String[] keyColumns = ( String[] ) keyColumnNames.get( tableAlias ); //use the id column alias
+ if ( keyColumns == null ) {
+ throw new IllegalArgumentException( "alias not found: " + tableAlias );
}
- keyColumns = StringHelper.qualify(tableAlias, keyColumns);
- for (int i=0; i<keyColumns.length; i++) addTableAlias( keyColumns[i] );
+ keyColumns = StringHelper.qualify( tableAlias, keyColumns );
+ for ( int i = 0; i < keyColumns.length; i++ ) {
+ addTableAlias( keyColumns[i] );
+ }
}
else {
- addTableAlias(tableAlias);
+ addTableAlias( tableAlias );
}
- if ( upgradeType!=null && lockMode!=upgradeType ) {
- throw new QueryException("mixed LockModes");
+ if ( upgradeType != null && lockMode != upgradeType ) {
+ throw new QueryException( "mixed LockModes" );
}
upgradeType = lockMode;
}
}
- if ( upgradeType==LockMode.UPGRADE_NOWAIT ) setNowaitEnabled(true);
+ if ( upgradeType == LockMode.UPGRADE_NOWAIT ) {
+ setNowaitEnabled( true );
+ }
}
+
+ public ForUpdateFragment addTableAlias(String alias) {
+ if ( aliases.length() > 0 ) {
+ aliases.append( ", " );
+ }
+ aliases.append( alias );
+ return this;
+ }
+
+ public String toFragmentString() {
+ if ( aliases.length() == 0 ) {
+ return "";
+ }
+ return isNowaitEnabled ?
+ dialect.getForUpdateNowaitString( aliases.toString() ) :
+ dialect.getForUpdateString( aliases.toString() );
+ }
+
+ public ForUpdateFragment setNowaitEnabled(boolean nowait) {
+ isNowaitEnabled = nowait;
+ return this;
+ }
}
More information about the hibernate-commits
mailing list