Hibernate SVN: r10843 - in branches/Branch_3_2/Hibernate3/src/org/hibernate: cfg impl
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-11-17 17:15:05 -0500 (Fri, 17 Nov 2006)
New Revision: 10843
Modified:
branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Environment.java
branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Settings.java
branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/SettingsFactory.java
branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/SessionFactoryImpl.java
Log:
HHH-2193 : flag to control named query checking
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Environment.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Environment.java 2006-11-17 18:38:15 UTC (rev 10842)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Environment.java 2006-11-17 22:15:05 UTC (rev 10843)
@@ -414,12 +414,21 @@
* The classname of the HQL query parser factory
*/
public static final String QUERY_TRANSLATOR = "hibernate.query.factory_class";
+
/**
* A comma-seperated list of token substitutions to use when translating a Hibernate
* query to SQL
*/
public static final String QUERY_SUBSTITUTIONS = "hibernate.query.substitutions";
+
/**
+ * Should named queries be checked during startup (the default is enabled).
+ * <p/>
+ * Mainly intended for test environments.
+ */
+ public static final String QUERY_STARTUP_CHECKING = "hibernate.query.startup_check";
+
+ /**
* Auto export/update schema using hbm2ddl tool. Valid values are <tt>update</tt>,
* <tt>create</tt>, <tt>create-drop</tt> and <tt>validate</tt>.
*/
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Settings.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Settings.java 2006-11-17 18:38:15 UTC (rev 10842)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Settings.java 2006-11-17 22:15:05 UTC (rev 10843)
@@ -65,6 +65,7 @@
private boolean dataDefinitionImplicitCommit;
private boolean dataDefinitionInTransactionSupported;
private boolean strictJPAQLCompliance;
+ private boolean namedQueryStartupCheckingEnabled;
// private BytecodeProvider bytecodeProvider;
/**
@@ -247,7 +248,11 @@
return strictJPAQLCompliance;
}
+ public boolean isNamedQueryStartupCheckingEnabled() {
+ return namedQueryStartupCheckingEnabled;
+ }
+
// package protected setters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
void setDefaultSchemaName(String string) {
@@ -422,6 +427,9 @@
this.strictJPAQLCompliance = strictJPAQLCompliance;
}
+ void setNamedQueryStartupCheckingEnabled(boolean namedQueryStartupCheckingEnabled) {
+ this.namedQueryStartupCheckingEnabled = namedQueryStartupCheckingEnabled;
+ }
// public BytecodeProvider getBytecodeProvider() {
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/SettingsFactory.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/SettingsFactory.java 2006-11-17 18:38:15 UTC (rev 10842)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/SettingsFactory.java 2006-11-17 22:15:05 UTC (rev 10843)
@@ -296,6 +296,10 @@
log.info( "Default entity-mode: " + defaultEntityMode );
settings.setDefaultEntityMode( defaultEntityMode );
+ boolean namedQueryChecking = PropertiesHelper.getBoolean( Environment.QUERY_STARTUP_CHECKING, properties, true );
+ log.info( "Named query checking : " + enabledDisabled( namedQueryChecking ) );
+ settings.setNamedQueryStartupCheckingEnabled( namedQueryChecking );
+
// String provider = properties.getProperty( Environment.BYTECODE_PROVIDER );
// log.info( "Bytecode provider name : " + provider );
// BytecodeProvider bytecodeProvider = buildBytecodeProvider( provider );
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/SessionFactoryImpl.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/SessionFactoryImpl.java 2006-11-17 18:38:15 UTC (rev 10842)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/impl/SessionFactoryImpl.java 2006-11-17 22:15:05 UTC (rev 10843)
@@ -348,20 +348,22 @@
}
//checking for named queries
- Map errors = checkNamedQueries();
- if ( !errors.isEmpty() ) {
- Set keys = errors.keySet();
- StringBuffer failingQueries = new StringBuffer( "Errors in named queries: " );
- for ( Iterator iterator = keys.iterator() ; iterator.hasNext() ; ) {
- String queryName = ( String ) iterator.next();
- HibernateException e = ( HibernateException ) errors.get( queryName );
- failingQueries.append( queryName );
- if ( iterator.hasNext() ) {
- failingQueries.append( ", " );
+ if ( settings.isNamedQueryStartupCheckingEnabled() ) {
+ Map errors = checkNamedQueries();
+ if ( !errors.isEmpty() ) {
+ Set keys = errors.keySet();
+ StringBuffer failingQueries = new StringBuffer( "Errors in named queries: " );
+ for ( Iterator iterator = keys.iterator() ; iterator.hasNext() ; ) {
+ String queryName = ( String ) iterator.next();
+ HibernateException e = ( HibernateException ) errors.get( queryName );
+ failingQueries.append( queryName );
+ if ( iterator.hasNext() ) {
+ failingQueries.append( ", " );
+ }
+ log.error( "Error in named query: " + queryName, e );
}
- log.error( "Error in named query: " + queryName, e );
+ throw new HibernateException( failingQueries.toString() );
}
- throw new HibernateException( failingQueries.toString() );
}
//stats
17 years, 5 months
Hibernate SVN: r10842 - branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-11-17 13:38:15 -0500 (Fri, 17 Nov 2006)
New Revision: 10842
Modified:
branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Configuration.java
Log:
HHH-2251 Settings build unnecessary in schemaupdate/schemavalidate
(merge from branch_3_2)
Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Configuration.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Configuration.java 2006-11-17 18:29:10 UTC (rev 10841)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/cfg/Configuration.java 2006-11-17 18:38:15 UTC (rev 10842)
@@ -944,11 +944,11 @@
while ( iter.hasNext() ) {
Table table = (Table) iter.next();
if ( table.isPhysicalTable() ) {
- Settings settings = buildSettings();
+
TableMetadata tableInfo = databaseMetadata.getTableMetadata(
table.getName(),
- ( table.getSchema() == null ) ? settings.getDefaultSchemaName() : table.getSchema(),
- ( table.getCatalog() == null ) ? settings.getDefaultCatalogName() : table.getCatalog(),
+ ( table.getSchema() == null ) ? defaultSchema : table.getSchema(),
+ ( table.getCatalog() == null ) ? defaultCatalog : table.getCatalog(),
table.isQuoted()
);
@@ -1062,16 +1062,19 @@
throws HibernateException {
secondPassCompile();
+ String defaultCatalog = properties.getProperty( Environment.DEFAULT_CATALOG );
+ String defaultSchema = properties.getProperty( Environment.DEFAULT_SCHEMA );
+
Iterator iter = getTableMappings();
while ( iter.hasNext() ) {
Table table = (Table) iter.next();
if ( table.isPhysicalTable() ) {
- Settings settings = buildSettings();
+
TableMetadata tableInfo = databaseMetadata.getTableMetadata(
table.getName(),
- ( table.getSchema() == null ) ? settings.getDefaultSchemaName() : table.getSchema(),
- ( table.getCatalog() == null ) ? settings.getDefaultCatalogName() : table.getCatalog(),
+ ( table.getSchema() == null ) ? defaultSchema : table.getSchema(),
+ ( table.getCatalog() == null ) ? defaultCatalog : table.getCatalog(),
table.isQuoted());
if ( tableInfo == null ) {
throw new HibernateException( "Missing table: " + table.getName() );
17 years, 5 months
Hibernate SVN: r10841 - trunk/Hibernate3/src/org/hibernate/cfg
by hibernate-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2006-11-17 13:29:10 -0500 (Fri, 17 Nov 2006)
New Revision: 10841
Modified:
trunk/Hibernate3/src/org/hibernate/cfg/Configuration.java
Log:
HHH-2251 Settings build unnecessary in schemaupdate/schemavalidate
Modified: trunk/Hibernate3/src/org/hibernate/cfg/Configuration.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/cfg/Configuration.java 2006-11-16 22:26:22 UTC (rev 10840)
+++ trunk/Hibernate3/src/org/hibernate/cfg/Configuration.java 2006-11-17 18:29:10 UTC (rev 10841)
@@ -944,11 +944,11 @@
while ( iter.hasNext() ) {
Table table = (Table) iter.next();
if ( table.isPhysicalTable() ) {
- Settings settings = buildSettings();
+
TableMetadata tableInfo = databaseMetadata.getTableMetadata(
table.getName(),
- ( table.getSchema() == null ) ? settings.getDefaultSchemaName() : table.getSchema(),
- ( table.getCatalog() == null ) ? settings.getDefaultCatalogName() : table.getCatalog(),
+ ( table.getSchema() == null ) ? defaultSchema : table.getSchema(),
+ ( table.getCatalog() == null ) ? defaultCatalog : table.getCatalog(),
table.isQuoted()
);
@@ -1062,16 +1062,19 @@
throws HibernateException {
secondPassCompile();
+ String defaultCatalog = properties.getProperty( Environment.DEFAULT_CATALOG );
+ String defaultSchema = properties.getProperty( Environment.DEFAULT_SCHEMA );
+
Iterator iter = getTableMappings();
while ( iter.hasNext() ) {
Table table = (Table) iter.next();
if ( table.isPhysicalTable() ) {
- Settings settings = buildSettings();
+
TableMetadata tableInfo = databaseMetadata.getTableMetadata(
table.getName(),
- ( table.getSchema() == null ) ? settings.getDefaultSchemaName() : table.getSchema(),
- ( table.getCatalog() == null ) ? settings.getDefaultCatalogName() : table.getCatalog(),
+ ( table.getSchema() == null ) ? defaultSchema : table.getSchema(),
+ ( table.getCatalog() == null ) ? defaultCatalog : table.getCatalog(),
table.isQuoted());
if ( tableInfo == null ) {
throw new HibernateException( "Missing table: " + table.getName() );
17 years, 5 months
Hibernate SVN: r10840 - tags/v321
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-11-16 17:26:22 -0500 (Thu, 16 Nov 2006)
New Revision: 10840
Added:
tags/v321/Hibernate3/
Log:
(re)tagged 3.2.1 release
Copied: tags/v321/Hibernate3 (from rev 10839, branches/Branch_3_2/Hibernate3)
17 years, 5 months
Hibernate SVN: r10839 - tags/v321
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-11-16 17:25:17 -0500 (Thu, 16 Nov 2006)
New Revision: 10839
Removed:
tags/v321/Hibernate3/
Log:
apparently the second copy did not work so well :(
17 years, 5 months
Hibernate SVN: r10838 - tags/v321/Hibernate3
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-11-16 16:58:32 -0500 (Thu, 16 Nov 2006)
New Revision: 10838
Added:
tags/v321/Hibernate3/Hibernate3/
Log:
fixed problem in initial tag creation for 3.2.1
Copied: tags/v321/Hibernate3/Hibernate3 (from rev 10837, branches/Branch_3_2/Hibernate3)
17 years, 5 months
Hibernate SVN: r10837 - in branches/Branch_3_2/Hibernate3/test/org/hibernate/test: . lob
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-11-16 16:56:15 -0500 (Thu, 16 Nov 2006)
New Revision: 10837
Modified:
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/TestCase.java
branches/Branch_3_2/Hibernate3/test/org/hibernate/test/lob/ClobTest.java
Log:
fixed f'd up import
Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/TestCase.java
===================================================================
--- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/TestCase.java 2006-11-16 21:56:01 UTC (rev 10836)
+++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/TestCase.java 2006-11-16 21:56:15 UTC (rev 10837)
@@ -577,9 +577,8 @@
* @return True if expected usage pattern is support; false otherwise.
*/
protected boolean supportsExpectedLobUsagePattern() {
- // note : For H2, the insertions get truncated...
// note : For Derby, the insertions get truncated...
- Class[] exceptions = new Class[] { H2Dialect.class, DerbyDialect.class };
+ Class[] exceptions = new Class[] { DerbyDialect.class };
if ( dialectIsOneOf( exceptions ) ) {
reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" );
return false;
@@ -600,7 +599,7 @@
// note: at least my local MySQL 5.1 install shows this not working...
// note: at least my local SQL Server 2005 Express shows this not working...
Class[] exceptions = new Class[] {
- HSQLDialect.class, MySQLDialect.class, SQLServerDialect.class
+ HSQLDialect.class, H2Dialect.class, MySQLDialect.class, SQLServerDialect.class
};
if ( dialectIsOneOf( exceptions ) ) {
reportSkip( "database/driver does not support propogating LOB value change back to database", "LOB support" );
Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/lob/ClobTest.java
===================================================================
--- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/lob/ClobTest.java 2006-11-16 21:56:01 UTC (rev 10836)
+++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/lob/ClobTest.java 2006-11-16 21:56:15 UTC (rev 10837)
@@ -9,9 +9,8 @@
import org.hibernate.Session;
import org.hibernate.Hibernate;
import org.hibernate.LockMode;
+import org.hibernate.dialect.H2Dialect;
-import org.h2.engine.Constants;
-
/**
* Test various access scenarios for eager and lazy materialization
* of CLOB data, as well as bounded and unbounded materialization
@@ -175,9 +174,14 @@
}
private String extractData(Clob clob) throws Throwable {
- char[] data = new char[ (int) clob.length() ];
- clob.getCharacterStream().read( data );
- return new String( data );
+ if ( getDialect() instanceof H2Dialect ) {
+ return clob.getSubString( 1, ( int ) clob.length() );
+ }
+ else {
+ char[] data = new char[ (int) clob.length() ];
+ clob.getCharacterStream().read( data );
+ return new String( data );
+ }
}
17 years, 5 months
Hibernate SVN: r10836 - in trunk/Hibernate3/test/org/hibernate/test: . lob
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-11-16 16:56:01 -0500 (Thu, 16 Nov 2006)
New Revision: 10836
Modified:
trunk/Hibernate3/test/org/hibernate/test/TestCase.java
trunk/Hibernate3/test/org/hibernate/test/lob/ClobTest.java
Log:
fixed f'd up import
Modified: trunk/Hibernate3/test/org/hibernate/test/TestCase.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/TestCase.java 2006-11-16 21:37:53 UTC (rev 10835)
+++ trunk/Hibernate3/test/org/hibernate/test/TestCase.java 2006-11-16 21:56:01 UTC (rev 10836)
@@ -572,9 +572,8 @@
* @return True if expected usage pattern is support; false otherwise.
*/
protected boolean supportsExpectedLobUsagePattern() {
- // note : For H2, the insertions get truncated...
// note : For Derby, the insertions get truncated...
- Class[] exceptions = new Class[] { H2Dialect.class, DerbyDialect.class };
+ Class[] exceptions = new Class[] { DerbyDialect.class };
if ( dialectIsOneOf( exceptions ) ) {
reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" );
return false;
@@ -595,7 +594,7 @@
// note: at least my local MySQL 5.1 install shows this not working...
// note: at least my local SQL Server 2005 Express shows this not working...
Class[] exceptions = new Class[] {
- HSQLDialect.class, MySQLDialect.class, SQLServerDialect.class
+ HSQLDialect.class, H2Dialect.class, MySQLDialect.class, SQLServerDialect.class
};
if ( dialectIsOneOf( exceptions ) ) {
reportSkip( "database/driver does not support propogating LOB value change back to database", "LOB support" );
Modified: trunk/Hibernate3/test/org/hibernate/test/lob/ClobTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/lob/ClobTest.java 2006-11-16 21:37:53 UTC (rev 10835)
+++ trunk/Hibernate3/test/org/hibernate/test/lob/ClobTest.java 2006-11-16 21:56:01 UTC (rev 10836)
@@ -1,6 +1,7 @@
package org.hibernate.test.lob;
import java.sql.Clob;
+import java.io.Reader;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -9,6 +10,7 @@
import org.hibernate.Session;
import org.hibernate.Hibernate;
import org.hibernate.LockMode;
+import org.hibernate.dialect.H2Dialect;
/**
* Test various access scenarios for eager and lazy materialization
@@ -173,9 +175,14 @@
}
private String extractData(Clob clob) throws Throwable {
- char[] data = new char[ (int) clob.length() ];
- clob.getCharacterStream().read( data );
- return new String( data );
+ if ( getDialect() instanceof H2Dialect ) {
+ return clob.getSubString( 1, ( int ) clob.length() );
+ }
+ else {
+ char[] data = new char[ (int) clob.length() ];
+ clob.getCharacterStream().read( data );
+ return new String( data );
+ }
}
17 years, 5 months
Hibernate SVN: r10835 - tags/v321
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-11-16 16:37:53 -0500 (Thu, 16 Nov 2006)
New Revision: 10835
Added:
tags/v321/Hibernate3/
Log:
created 3.2.1 release tag
Copied: tags/v321/Hibernate3 (from rev 10834, branches/Branch_3_2/Hibernate3)
17 years, 5 months
Hibernate SVN: r10834 - tags
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2006-11-16 16:36:43 -0500 (Thu, 16 Nov 2006)
New Revision: 10834
Added:
tags/v321/
Log:
create tag folder for 3.2.1 release
17 years, 5 months