hibernate-commits — CVS commits

[Hibernate-commits] Hibernate Code SVN: r9935 - trunk/Hibernate3/doc/reference/en/modules

[<hib...@li...>]

Author: chr...@jb...
Date: 2006-05-19 03:18:08 -0400 (Fri, 19 May 2006)
New Revision: 9935

Modified:
   trunk/Hibernate3/doc/reference/en/modules/session_api.xml
Log:
Minor doc addition

Modified: trunk/Hibernate3/doc/reference/en/modules/session_api.xml
===================================================================
--- trunk/Hibernate3/doc/reference/en/modules/session_api.xml	2006-05-18 22:27:26 UTC (rev 9934)
+++ trunk/Hibernate3/doc/reference/en/modules/session_api.xml	2006-05-19 07:18:08 UTC (rev 9935)
@@ -455,7 +455,7 @@
 
             </sect3>
 
-            <sect3 id="objectstate-querying-executing-named">
+            <sect3 id="objectstate-querying-executing-named" revision="1">
                 <title>Externalizing named queries</title>
 
                 <para>
@@ -464,7 +464,7 @@
                     be interpreted as markup.)
                 </para>
 
-                <programlisting><![CDATA[<query name="eg.DomesticCat.by.name.and.minimum.weight"><![CDATA[
+                <programlisting><![CDATA[<query name="ByNameAndMaximumWeight"><![CDATA[
     from eg.DomesticCat as cat
         where cat.name = ?
         and cat.weight > ?
@@ -474,7 +474,7 @@
                     Parameter binding and executing is done programatically:
                 </para>
 
-                <programlisting><![CDATA[Query q = sess.getNamedQuery("eg.DomesticCat.by.name.and.minimum.weight");
+                <programlisting><![CDATA[Query q = sess.getNamedQuery("ByNameAndMaximumWeight");
 q.setString(0, name);
 q.setInt(1, minWeight);
 List cats = q.list();]]></programlisting>
@@ -485,6 +485,14 @@
                     existing queries to Hibernate by placing them in mapping files.
                 </para>
 
+                <para>
+                    Also note that a query declaration inside a <literal>&lt;hibernate-mapping&gt;</literal>
+                    element requires a global unique name for the query, while a query declaration inside a
+                    <literal>&lt;class&gt;</literal> element is made unique automatically by prepending the
+                    fully qualified name of the class, for example
+                    <literal>eg.Cat.ByNameAndMaximumWeight</literal>.
+                </para>
+
             </sect3>
 
         </sect2>

[Hibernate-commits] Hibernate Code SVN: r9934 - trunk/HibernateExt/metadata/src/java/org/hibernate/cfg

[<hib...@li...>]

Author: epbernard
Date: 2006-05-18 18:27:26 -0400 (Thu, 18 May 2006)
New Revision: 9934

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3NamingStrategy.java
Log:
ANN-345 make naming strategy serializable

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3NamingStrategy.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3NamingStrategy.java	2006-05-17 20:27:06 UTC (rev 9933)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/EJB3NamingStrategy.java	2006-05-18 22:27:26 UTC (rev 9934)
@@ -1,6 +1,8 @@
 //$Id$
 package org.hibernate.cfg;
 
+import java.io.Serializable;
+
 import org.hibernate.AssertionFailure;
 import org.hibernate.util.StringHelper;
 
@@ -9,7 +11,7 @@
  *
  * @author Emmanuel Bernard
  */
-public class EJB3NamingStrategy implements NamingStrategy {
+public class EJB3NamingStrategy implements NamingStrategy, Serializable {
 	public static final NamingStrategy INSTANCE = new EJB3NamingStrategy();
 
 	public String classToTableName(String className) {

[Hibernate-commits] Hibernate Code SVN: r9933 - trunk/Hibernate3/src/org/hibernate/util

[<hib...@li...>]

Author: epbernard
Date: 2006-05-17 16:27:06 -0400 (Wed, 17 May 2006)
New Revision: 9933

Modified:
   trunk/Hibernate3/src/org/hibernate/util/ConfigHelper.java
Log:
HHH-1763 minor

Modified: trunk/Hibernate3/src/org/hibernate/util/ConfigHelper.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/util/ConfigHelper.java	2006-05-14 03:05:46 UTC (rev 9932)
+++ trunk/Hibernate3/src/org/hibernate/util/ConfigHelper.java	2006-05-17 20:27:06 UTC (rev 9933)
@@ -138,7 +138,7 @@
 			stream = classLoader.getResourceAsStream( stripped );
 		}
 		if ( stream == null ) {
-			Environment.class.getResourceAsStream( resource );
+			stream = Environment.class.getResourceAsStream( resource );
 		}
 		if ( stream == null ) {
 			stream = Environment.class.getClassLoader().getResourceAsStream( stripped );

[Hibernate-commits] Hibernate Code SVN: r9932 - tags/entitymanager_v32cr1

[<hib...@li...>]

Author: epbernard
Date: 2006-05-13 23:05:46 -0400 (Sat, 13 May 2006)
New Revision: 9932

Added:
   tags/entitymanager_v32cr1/HibernateExt/
Log:
release tag

Copied: tags/entitymanager_v32cr1/HibernateExt (from rev 9931, trunk/HibernateExt)

[Hibernate-commits] Hibernate Code SVN: r9931 - tags/annotations_v32cr1

[<hib...@li...>]

Author: epbernard
Date: 2006-05-13 23:04:57 -0400 (Sat, 13 May 2006)
New Revision: 9931

Added:
   tags/annotations_v32cr1/HibernateExt/
Log:
release tags

Copied: tags/annotations_v32cr1/HibernateExt (from rev 9930, trunk/HibernateExt)

[Hibernate-commits] Hibernate Code SVN: r9930 - tags

[<hib...@li...>]

Author: epbernard
Date: 2006-05-13 23:03:43 -0400 (Sat, 13 May 2006)
New Revision: 9930

Added:
   tags/entitymanager_v32cr1/
Log:
release tag

[Hibernate-commits] Hibernate Code SVN: r9929 - tags

[<hib...@li...>]

Author: epbernard
Date: 2006-05-13 23:02:46 -0400 (Sat, 13 May 2006)
New Revision: 9929

Added:
   tags/annotations_v32cr1/
Log:
release tag

[Hibernate-commits] Hibernate Code SVN: r9928 - in trunk/HibernateExt/ejb: . lib

[<hib...@li...>]

Author: epbernard
Date: 2006-05-13 23:00:58 -0400 (Sat, 13 May 2006)
New Revision: 9928

Modified:
   trunk/HibernateExt/ejb/changelog.txt
   trunk/HibernateExt/ejb/lib/hibernate-annotations.jar
   trunk/HibernateExt/ejb/readme.txt
Log:
release changes

Modified: trunk/HibernateExt/ejb/changelog.txt
===================================================================
--- trunk/HibernateExt/ejb/changelog.txt	2006-05-14 03:00:41 UTC (rev 9927)
+++ trunk/HibernateExt/ejb/changelog.txt	2006-05-14 03:00:58 UTC (rev 9928)
@@ -1,7 +1,7 @@
 Hibernate EntityManager Changelog
 ==================================
 
-3.2.0.CR1 (08-05-2006)
+3.2.0.CR1 (13-05-2006)
 ----------------------
 ** Bug
     * [EJB-9] - Proxied instances should raise ENFE not LIE
@@ -12,6 +12,7 @@
     * [EJB-168] - Do not register Synchronization on Transaction marked as rollback
     * [EJB-169] - MappingException thrown when META-INF/orm.xml is not found
     * [EJB-173] - Resetting joined transaction state on a closed entity manager raise an exception
+    * [EJB-177] - in beforeCompletion phase, the transaction might not be returned causing an NPE
 
 
 ** Improvement
@@ -24,6 +25,7 @@
     * [EJB-165] - Support interceptor and callback XML overriding
     * [EJB-170] - Try to find <mapping-file/> in the parsed JAR before delegating to the regular resource locator
 
+
 3.1.0.Beta8b (27-04-2006)
 -------------------------
 

Modified: trunk/HibernateExt/ejb/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)

Modified: trunk/HibernateExt/ejb/readme.txt
===================================================================
--- trunk/HibernateExt/ejb/readme.txt	2006-05-14 03:00:41 UTC (rev 9927)
+++ trunk/HibernateExt/ejb/readme.txt	2006-05-14 03:00:58 UTC (rev 9928)
@@ -1,6 +1,6 @@
 Hibernate EntityManager
 ==================================================
-Version: 3.2.0.CR1, 8.05.2006
+Version: 3.2.0.CR1, 13.05.2006
 
 THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE 3.2.0.CR2 AND DOES
 NOT WORK WITH HIBERNATE 3.1.x OR ANY OLDER VERSION OF HIBERNATE.

[Hibernate-commits] Hibernate Code SVN: r9927 - trunk/HibernateExt/metadata

[<hib...@li...>]

Author: epbernard
Date: 2006-05-13 23:00:41 -0400 (Sat, 13 May 2006)
New Revision: 9927

Modified:
   trunk/HibernateExt/metadata/changelog.txt
   trunk/HibernateExt/metadata/readme.txt
Log:
release changes

Modified: trunk/HibernateExt/metadata/changelog.txt
===================================================================
--- trunk/HibernateExt/metadata/changelog.txt	2006-05-12 07:17:10 UTC (rev 9926)
+++ trunk/HibernateExt/metadata/changelog.txt	2006-05-14 03:00:41 UTC (rev 9927)
@@ -1,7 +1,7 @@
 Hibernate Annotations Changelog
 ===============================
 
-3.1.0.CR1 (08-05-2006)
+3.2.0.CR1 (13-05-2006)
 ----------------------
 ** Bug
     * [ANN-95] - Cannot create a unique constraint on columns belonging to both the superclass and the class
@@ -20,6 +20,7 @@
     * [ANN-333] - CollectionOfElements not using specified JoinTable
     * [ANN-335] - AnnotationBinder just throws NPE if @OneToMany annotation is not on a Collection or Array
     * [ANN-339] - @OrderBy does not work when an association table is involved
+    * [ANN-340] - Hard dependency to CGLIB classes in mustBeSkipped()
 
 
 ** Improvement
@@ -39,6 +40,7 @@
     * [ANN-224] - Ability to override fetching and lazy options through annotations
     * [ANN-276] - Proper support of @OneToOne @PrimaryKeyJoinColumns
 
+
 3.1.0.Beta10b Preview (27-04-2006)
 ----------------------------------
 ** Bug

Modified: trunk/HibernateExt/metadata/readme.txt
===================================================================
--- trunk/HibernateExt/metadata/readme.txt	2006-05-12 07:17:10 UTC (rev 9926)
+++ trunk/HibernateExt/metadata/readme.txt	2006-05-14 03:00:41 UTC (rev 9927)
@@ -1,6 +1,6 @@
 Hibernate Annotations
 ==================================================
-Version: 3.2.0 CR1, 8.05.2006
+Version: 3.2.0 CR1, 13.05.2006
 
 THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE 3.2.0.CR2 AND DOES NOT WORK
 WITH HIBERNATE 3.1.x OR ANY OLDER VERSION OF HIBERNATE.

[Hibernate-commits] Hibernate Code SVN: r9926 - in trunk/Hibernate3/doc/reference: en/modules tutorial/src/events

[<hib...@li...>]

Author: chr...@jb...
Date: 2006-05-12 03:17:10 -0400 (Fri, 12 May 2006)
New Revision: 9926

Modified:
   trunk/Hibernate3/doc/reference/en/modules/tutorial.xml
   trunk/Hibernate3/doc/reference/tutorial/src/events/EventManagerServlet.java
Log:
HHH-1741, Documentation fix

Modified: trunk/Hibernate3/doc/reference/en/modules/tutorial.xml
===================================================================
--- trunk/Hibernate3/doc/reference/en/modules/tutorial.xml	2006-05-11 15:35:59 UTC (rev 9925)
+++ trunk/Hibernate3/doc/reference/en/modules/tutorial.xml	2006-05-12 07:17:10 UTC (rev 9926)
@@ -1254,7 +1254,7 @@
             database, and it provides an HTML form to enter new events.
         </para>
 
-        <sect2 id="tutorial-webapp-servlet">
+        <sect2 id="tutorial-webapp-servlet" revision="1">
             <title>Writing the basic servlet</title>
 
             <para>
@@ -1268,19 +1268,10 @@
 
 public class EventManagerServlet extends HttpServlet {
 
-    private final SimpleDateFormat dateFormatter =
-                            new SimpleDateFormat("dd.MM.yyyy");
-
     // Servlet code
 }]]></programlisting>
 
             <para>
-                The <literal>dateFormatter</literal> is a tool we'll need later to convert
-                <literal>Date</literal> objects from and to strings. It makes sense to only
-                have one formatter as a member of the servlet.
-            </para>
-
-            <para>
                 The servlet handles HTTP <literal>GET</literal> requests only, hence, the method
                 we implement is <literal>doGet()</literal>:
             </para>
@@ -1289,6 +1280,8 @@
                      HttpServletResponse response)
         throws ServletException, IOException {
 
+    SimpleDateFormat dateFormatter = new SimpleDateFormat("dd.MM.yyyy");
+
     try {
         // Begin unit of work
         HibernateUtil.getSessionFactory()
@@ -1335,7 +1328,7 @@
 
         </sect2>
 
-        <sect2 id="tutorial-webapp-processing">
+        <sect2 id="tutorial-webapp-processing" revision="1">
             <title>Processing and rendering</title>
 
             <para>
@@ -1362,7 +1355,7 @@
 
 // Print page
 printEventForm(out);
-listEvents(out);
+listEvents(out, dateFormatter);
 
 // Write HTML footer
 out.println("</body></html>");
@@ -1393,7 +1386,8 @@
                 a query:
             </para>
 
-            <programlisting><![CDATA[private void listEvents(PrintWriter out) {
+            <programlisting><![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat dateFormatter) {
+
     List result = HibernateUtil.getSessionFactory()
                     .getCurrentSession().createCriteria(Event.class).list();
     if (result.size() > 0) {

Modified: trunk/Hibernate3/doc/reference/tutorial/src/events/EventManagerServlet.java
===================================================================
--- trunk/Hibernate3/doc/reference/tutorial/src/events/EventManagerServlet.java	2006-05-11 15:35:59 UTC (rev 9925)
+++ trunk/Hibernate3/doc/reference/tutorial/src/events/EventManagerServlet.java	2006-05-12 07:17:10 UTC (rev 9926)
@@ -10,13 +10,12 @@
 
 public class EventManagerServlet extends HttpServlet {
 
-    private final SimpleDateFormat dateFormatter =
-                            new SimpleDateFormat("dd.MM.yyyy");
-
     protected void doGet(HttpServletRequest request,
                          HttpServletResponse response)
             throws ServletException, IOException {
 
+        SimpleDateFormat dateFormatter = new SimpleDateFormat("dd.MM.yyyy");
+
         try {
             // Begin unit of work
             HibernateUtil.getSessionFactory()
@@ -42,7 +41,7 @@
 
             // Print page
             printEventForm(out);
-            listEvents(out);
+            listEvents(out, dateFormatter);
 
             // Write HTML footer
             out.println("</body></html>");
@@ -69,7 +68,7 @@
         out.println("</form>");
     }
 
-    private void listEvents(PrintWriter out) {
+    private void listEvents(PrintWriter out, SimpleDateFormat dateFormatter) {
         List result = HibernateUtil.getSessionFactory()
                         .getCurrentSession().createCriteria(Event.class).list();
         if (result.size() > 0) {

[Hibernate-commits] Hibernate Code SVN: r9924 - in trunk/HibernateExt/tools/src: java/org/hibernate/cfg/reveng test/org/hibernate/tool/test/jdbc2cfg

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-11 05:16:38 -0400 (Thu, 11 May 2006)
New Revision: 9924

Modified:
   trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java
   trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
   trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml
Log:
HBX-658 

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java	2006-05-11 05:44:27 UTC (rev 9923)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java	2006-05-11 09:16:38 UTC (rev 9924)
@@ -318,7 +318,16 @@
 				String className = (String) tableToClassName.get(tableIdentifier);
 				
 				if(className!=null) {
-					return className;
+					 if(className.indexOf( "." )>=0) {
+						 return className;
+					 } else {
+						 String packageName = getPackageName(tableIdentifier);
+						 if(packageName==null) {
+							 return className;
+						 } else {
+							 return StringHelper.qualify(packageName, className);
+						 }
+					 }
 				} 
 				
 				String packageName = getPackageName(tableIdentifier);

Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java	2006-05-11 05:44:27 UTC (rev 9923)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java	2006-05-11 09:16:38 UTC (rev 9924)
@@ -246,6 +246,9 @@
 		assertEquals("org.werd.Q", repository.tableToClassName(new TableIdentifier("q","Werd", "Q") ) );
 		assertEquals("Notknown", repository.tableToClassName(new TableIdentifier(null,null, "notknown") ) );
 		
+		assertEquals("org.werd.MyWorld", repository.tableToClassName(new TableIdentifier(null,"Werd", "TBL_PKG") ) );
+		assertEquals("other.MyWorld", repository.tableToClassName(new TableIdentifier(null,"Werd", "TBL_OTHER") ) );
+		
 	}
 	
 	public Table findTable(String name) {

Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml	2006-05-11 05:44:27 UTC (rev 9923)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml	2006-05-11 09:16:38 UTC (rev 9924)
@@ -79,7 +79,9 @@
     	<column name="EXCOLUMN" exclude="true"/>
     </table>
     
-   <table name="TblTest" class="org.test.Test"/>
-   		
+    <table name="TblTest" class="org.test.Test"/>
+ 
+    <table schema="Werd" name="TBL_PKG" class="MyWorld"/>
+    <table schema="Werd" name="TBL_OTHER" class="other.MyWorld"/>
 
 </hibernate-reverse-engineering>
\ No newline at end of file

[Hibernate-commits] Hibernate Code SVN: r9923 - trunk/HibernateExt/ejb/src/java/org/hibernate/ejb

[<hib...@li...>]

Author: epbernard
Date: 2006-05-11 01:44:27 -0400 (Thu, 11 May 2006)
New Revision: 9923

Modified:
   trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
Log:
EJB-177 workaround JBossTM bug

Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java	2006-05-10 16:58:09 UTC (rev 9922)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java	2006-05-11 05:44:27 UTC (rev 9923)
@@ -446,10 +446,14 @@
 									try {
 										ctx = (TransactionFactory.Context) session;
 										JoinableCMTTransaction joinable = (JoinableCMTTransaction) session.getTransaction();
+										javax.transaction.Transaction transaction = joinable.getTransaction();
+										if ( transaction == null )
+											log.warn( "Transaction not available on beforeCompletionPhase: assuming valid" );
 										flush = !ctx.isFlushModeNever() &&
 												//ctx.isFlushBeforeCompletionEnabled() &&
 												//TODO probably make it ! isFlushBeforecompletion()
-												!JTAHelper.isRollback( joinable.getTransaction().getStatus() );
+												( transaction == null || !JTAHelper.isRollback( transaction.getStatus() ) );
+												//transaction == null workaround a JBoss TMBug
 									}
 									catch (SystemException se) {
 										log.error( "could not determine transaction status", se );

[Hibernate-commits] Hibernate Code SVN: r9922 - trunk/Hibernate3/src/org/hibernate/sql

[<hib...@li...>]

Author: ste...@jb...
Date: 2006-05-10 12:58:09 -0400 (Wed, 10 May 2006)
New Revision: 9922

Modified:
   trunk/Hibernate3/src/org/hibernate/sql/Template.java
Log:
added back renderWhereStringTemplate() signature needed by annotations

Modified: trunk/Hibernate3/src/org/hibernate/sql/Template.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/sql/Template.java	2006-05-10 13:40:04 UTC (rev 9921)
+++ trunk/Hibernate3/src/org/hibernate/sql/Template.java	2006-05-10 16:58:09 UTC (rev 9922)
@@ -70,11 +70,29 @@
 	public static String renderWhereStringTemplate(String sqlWhereString, Dialect dialect, SQLFunctionRegistry functionRegistry) {
 		return renderWhereStringTemplate(sqlWhereString, TEMPLATE, dialect, functionRegistry);
 	}
-	
+
 	/**
+	 * Same functionality as {@link #renderWhereStringTemplate(String, String, Dialect, SQLFunctionRegistry)},
+	 * except that a SQLFunctionRegistry is not provided (i.e., only the dialect-defined functions are
+	 * considered).  This is only intended for use by the annotations project until the
+	 * many-to-many/map-key-from-target-table feature is pulled into core.
+	 *
+	 * @deprecated Only intended for annotations usage; use {@link #renderWhereStringTemplate(String, String, Dialect, SQLFunctionRegistry)} instead
+	 */
+	public static String renderWhereStringTemplate(String sqlWhereString, String placeholder, Dialect dialect) {
+		return renderWhereStringTemplate( sqlWhereString, placeholder, dialect, new SQLFunctionRegistry( dialect, java.util.Collections.EMPTY_MAP ) );
+	}
+
+	/**
 	 * Takes the where condition provided in the mapping attribute and interpolates the alias. 
 	 * Handles subselects, quoted identifiers, quoted strings, expressions, SQL functions, 
 	 * named parameters.
+	 *
+	 * @param sqlWhereString The string into which to interpolate the placeholder value
+	 * @param placeholder The value to be interpolated into the the sqlWhereString
+	 * @param dialect The dialect to apply
+	 * @param functionRegistry The registry of all sql functions
+	 * @return The rendered sql fragment
 	 */
 	public static String renderWhereStringTemplate(String sqlWhereString, String placeholder, Dialect dialect, SQLFunctionRegistry functionRegistry ) {
 		//TODO: make this a bit nicer

[Hibernate-commits] Hibernate Code SVN: r9921 - trunk/HibernateExt/metadata/src/java/org/hibernate/cfg

[<hib...@li...>]

Author: epbernard
Date: 2006-05-10 09:40:04 -0400 (Wed, 10 May 2006)
New Revision: 9921

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
Log:
ANN-340 soft deps to CGLIB

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-05-10 13:22:15 UTC (rev 9920)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-05-10 13:40:04 UTC (rev 9921)
@@ -46,7 +46,6 @@
 import javax.persistence.Transient;
 import javax.persistence.Version;
 
-import net.sf.cglib.transform.impl.InterceptFieldCallback;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
@@ -995,8 +994,10 @@
 	}
 
 	private static boolean mustBeSkipped(XProperty property, ExtendedMappings mappings) {
+		//TODO make those hardcoded tests more portable (through the bytecode provider?)
 		return property.isAnnotationPresent( Transient.class )
-				|| mappings.getReflectionManager().equals( property.getType(), InterceptFieldCallback.class );
+				|| "net.sf.cglib.transform.impl.InterceptFieldCallback".equals( property.getType().getName() )
+				|| "org.hibernate.tool.instrument.javassist.FieldHandler".equals( property.getType().getName() );
 	}
 
 	/**

[Hibernate-commits] Hibernate Code SVN: r9920 - trunk/Hibernate3/src/org/hibernate/property

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-10 09:22:15 -0400 (Wed, 10 May 2006)
New Revision: 9920

Modified:
   trunk/Hibernate3/src/org/hibernate/property/DirectPropertyAccessor.java
Log:
tell the user what we are actually complaining about.

Modified: trunk/Hibernate3/src/org/hibernate/property/DirectPropertyAccessor.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/property/DirectPropertyAccessor.java	2006-05-10 05:40:41 UTC (rev 9919)
+++ trunk/Hibernate3/src/org/hibernate/property/DirectPropertyAccessor.java	2006-05-10 13:22:15 UTC (rev 9920)
@@ -94,19 +94,34 @@
 
 	private static Field getField(Class clazz, String name) throws PropertyNotFoundException {
 		if ( clazz==null || clazz==Object.class ) {
-			throw new PropertyNotFoundException("field not found: " + name); // TODO: we should report what class we started searching for the property - right now it will always end on Object.class.
+			throw new PropertyNotFoundException("field not found: " + name); 
 		}
 		Field field;
 		try {
 			field = clazz.getDeclaredField(name);
 		}
 		catch (NoSuchFieldException nsfe) {
-			field = getField( clazz.getSuperclass(), name );
+			field = getField( clazz, clazz.getSuperclass(), name );
 		}
 		if ( !ReflectHelper.isPublic(clazz, field) ) field.setAccessible(true);
 		return field;
 	}
 
+	private static Field getField(Class root, Class clazz, String name) throws PropertyNotFoundException {
+		if ( clazz==null || clazz==Object.class ) {
+			throw new PropertyNotFoundException("field [" + name + "] not found on " + root.getName()); 
+		}
+		Field field;
+		try {
+			field = clazz.getDeclaredField(name);
+		}
+		catch (NoSuchFieldException nsfe) {
+			field = getField( root, clazz.getSuperclass(), name );
+		}
+		if ( !ReflectHelper.isPublic(clazz, field) ) field.setAccessible(true);
+		return field;
+	}
+	
 	public Getter getGetter(Class theClass, String propertyName)
 		throws PropertyNotFoundException {
 		return new DirectGetter( getField(theClass, propertyName), theClass, propertyName );

[Hibernate-commits] Hibernate Code SVN: r9919 - trunk/Hibernate3/src/org/hibernate/engine/transaction

[<hib...@li...>]

Author: epbernard
Date: 2006-05-10 01:40:41 -0400 (Wed, 10 May 2006)
New Revision: 9919

Modified:
   trunk/Hibernate3/src/org/hibernate/engine/transaction/Isolater.java
Log:
HHH-1734 bad connection lead when hilo and JDBCTransactionStrategy are used

Modified: trunk/Hibernate3/src/org/hibernate/engine/transaction/Isolater.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/engine/transaction/Isolater.java	2006-05-09 13:06:55 UTC (rev 9918)
+++ trunk/Hibernate3/src/org/hibernate/engine/transaction/Isolater.java	2006-05-10 05:40:41 UTC (rev 9919)
@@ -186,8 +186,8 @@
 					catch( Throwable ignore ) {
 						log.trace( "was unable to reset connection back to auto-commit" );
 					}
-					session.getBatcher().closeConnection( connection );
 				}
+				session.getBatcher().closeConnection( connection );
 			}
 		}
 	}

[Hibernate-commits] Hibernate Code SVN: r9918 - trunk/Hibernate3/src/org/hibernate/cache

[<hib...@li...>]

Author: epbernard
Date: 2006-05-09 09:06:55 -0400 (Tue, 09 May 2006)
New Revision: 9918

Modified:
   trunk/Hibernate3/src/org/hibernate/cache/EhCache.java
Log:
HHH-1732

Modified: trunk/Hibernate3/src/org/hibernate/cache/EhCache.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/cache/EhCache.java	2006-05-09 09:43:31 UTC (rev 9917)
+++ trunk/Hibernate3/src/org/hibernate/cache/EhCache.java	2006-05-09 13:06:55 UTC (rev 9918)
@@ -17,7 +17,6 @@
 package org.hibernate.cache;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -97,9 +96,9 @@
 	/**
 	 * Puts an object into the cache.
 	 *
-	 * @param key   a {@link Serializable} key
-	 * @param value a {@link Serializable} value
-	 * @throws CacheException if the parameters are not {@link Serializable}, the {@link CacheManager}
+	 * @param key   a key
+	 * @param value a value
+	 * @throws CacheException if the {@link CacheManager}
 	 *                        is shutdown or another {@link Exception} occurs.
 	 */
 	public void update(Object key, Object value) throws CacheException {
@@ -109,9 +108,9 @@
 	/**
 	 * Puts an object into the cache.
 	 *
-	 * @param key   a {@link Serializable} key
-	 * @param value a {@link Serializable} value
-	 * @throws CacheException if the parameters are not {@link Serializable}, the {@link CacheManager}
+	 * @param key   a key
+	 * @param value a value
+	 * @throws CacheException if the {@link CacheManager}
 	 *                        is shutdown or another {@link Exception} occurs.
 	 */
 	public void put(Object key, Object value) throws CacheException {
@@ -254,7 +253,7 @@
 			Iterator iter = cache.getKeys().iterator();
 			while ( iter.hasNext() ) {
 				Object key = iter.next();
-				result.put( key, cache.get( (Serializable) key ).getValue() );
+				result.put( key, cache.get( key ).getObjectValue() );
 			}
 			return result;
 		}

[Hibernate-commits] Hibernate Code SVN: r9917 - trunk/Hibernate3/test/org/hibernate/test/ternary

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-09 05:43:31 -0400 (Tue, 09 May 2006)
New Revision: 9917

Modified:
   trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java
Log:
minor

Modified: trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java	2006-05-09 09:43:09 UTC (rev 9916)
+++ trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java	2006-05-09 09:43:31 UTC (rev 9917)
@@ -95,7 +95,7 @@
 			emp.setManagerBySite( new HashMap() );
 			s.delete( emp );
 		}
-		s.delete("from Site");
+		((org.hibernate.classic.Session)s).delete("from Site");
 		t.commit();
 		s.close();
 	}

[Hibernate-commits] Hibernate Code SVN: r9916 - trunk/Hibernate3/test/org/hibernate/test/typedonetoone

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-09 05:43:09 -0400 (Tue, 09 May 2006)
New Revision: 9916

Modified:
   trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java
Log:
minor

Modified: trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java	2006-05-09 09:38:15 UTC (rev 9915)
+++ trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java	2006-05-09 09:43:09 UTC (rev 9916)
@@ -65,17 +65,6 @@
 		t.commit();
 		s.close();
 		
-		s = openSession();
-		t = s.beginTransaction();
-		cust.setBillingAddress( null );
-		cust.setShippingAddress( null );
-		s.delete( cust );
-		((org.hibernate.classic.Session)s).delete("from BillingAddress");
-		((org.hibernate.classic.Session)s).delete("from ShippingAddress");
-		s.flush();
-		t.commit();
-		s.close();
-		
 	}
 	
 	public void testCreateQueryNull() {

[Hibernate-commits] Hibernate Code SVN: r9915 - trunk/Hibernate3/src/org/hibernate/hql/classic

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-09 05:38:15 -0400 (Tue, 09 May 2006)
New Revision: 9915

Modified:
   trunk/Hibernate3/src/org/hibernate/hql/classic/SelectParser.java
Log:
Revert HHH-1724 Criteria/HQL alignment (missing classic query translator count(*))


Modified: trunk/Hibernate3/src/org/hibernate/hql/classic/SelectParser.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/hql/classic/SelectParser.java	2006-05-09 09:37:18 UTC (rev 9914)
+++ trunk/Hibernate3/src/org/hibernate/hql/classic/SelectParser.java	2006-05-09 09:38:15 UTC (rev 9915)
@@ -121,7 +121,7 @@
 		else if ( COUNT_MODIFIERS.contains( lctoken ) ) {
 			if ( !ready || !aggregate ) throw new QueryException( token + " only allowed inside aggregate function in SELECT" );
 			q.appendScalarSelectToken( token );
-			if ( "*".equals( token ) ) q.addSelectScalar( Hibernate.LONG ); //special case
+			if ( "*".equals( token ) ) q.addSelectScalar( getFunction( "count", q ).getReturnType( Hibernate.LONG, q.getFactory() ) ); //special case
 		}
 		else if ( getFunction( lctoken, q ) != null && token.equals( q.unalias( token ) ) ) {
 			// the name of an SQL function

[Hibernate-commits] Hibernate Code SVN: r9914 - in trunk/Hibernate3/test/org/hibernate/test: . compositeelement comppropertyref cuk dom4j formulajoin id joinfetch onetomany onetoone/joined subclassfilter ternary typedonetoone typeparameters unionsubclass

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-09 05:37:18 -0400 (Tue, 09 May 2006)
New Revision: 9914

Modified:
   trunk/Hibernate3/test/org/hibernate/test/TestCase.java
   trunk/Hibernate3/test/org/hibernate/test/compositeelement/CompositeElementTest.java
   trunk/Hibernate3/test/org/hibernate/test/comppropertyref/ComponentPropertyRefTest.java
   trunk/Hibernate3/test/org/hibernate/test/cuk/CompositePropertyRefTest.java
   trunk/Hibernate3/test/org/hibernate/test/dom4j/Dom4jTest.java
   trunk/Hibernate3/test/org/hibernate/test/formulajoin/FormulaJoinTest.java
   trunk/Hibernate3/test/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java
   trunk/Hibernate3/test/org/hibernate/test/joinfetch/JoinFetchTest.java
   trunk/Hibernate3/test/org/hibernate/test/onetomany/OneToManyTest.java
   trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/Address.java
   trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/OneToOneTest.java
   trunk/Hibernate3/test/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java
   trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java
   trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java
   trunk/Hibernate3/test/org/hibernate/test/typeparameters/TypeParameterTest.java
   trunk/Hibernate3/test/org/hibernate/test/unionsubclass/UnionSubclassTest.java
Log:
todays share of test data clean up

Modified: trunk/Hibernate3/test/org/hibernate/test/TestCase.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/TestCase.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/TestCase.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -3,15 +3,21 @@
 
 import java.sql.Blob;
 import java.sql.Clob;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
+import junit.framework.AssertionFailedError;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
+import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.DB2Dialect;
@@ -29,8 +35,6 @@
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.SimpleValue;
 
-import junit.framework.AssertionFailedError;
-
 public abstract class TestCase extends junit.framework.TestCase {
 
 	private static SessionFactory sessions;
@@ -38,7 +42,7 @@
 	private static Dialect dialect;
 	private static Class lastTestClass;
 	private org.hibernate.classic.Session session;
-
+	
 	protected boolean recreateSchema() {
 		return true;
 	}
@@ -190,10 +194,36 @@
 		}
 	}
 
-	private void assertAllDataRemoved() {
+	protected void assertAllDataRemoved() {
+		if(!recreateSchema()) {
+			return; // no tables were created...
+		}
+		
 		Session tmpSession = openSession();
-		assertEquals("Data is left in the database",0, tmpSession.createQuery( "from java.lang.Object" ).list().size());
-		tmpSession.close();
+		List list = tmpSession.createQuery( "from java.lang.Object" ).list();
+		
+		StringBuffer sb = new StringBuffer();
+		Map items = new HashMap();
+		
+		if(!list.isEmpty()) {
+			for (Iterator iter = list.iterator(); iter.hasNext();) {
+				Object element = iter.next();
+				Integer l = (Integer) items.get(tmpSession.getEntityName( element ));
+				if(l==null) {
+					l = new Integer(0);					
+				}
+				l = new Integer(l.intValue()+1);
+				items.put(tmpSession.getEntityName( element ), l);
+				System.out.println("Data left: " + element);
+			}
+			try {
+				tmpSession.close();
+			} finally {
+				fail("Data is left in the database: " + items.toString() );
+			}
+		} else {
+			tmpSession.close();
+		}
 	}
 
 	protected boolean dropAfterFailure() {

Modified: trunk/Hibernate3/test/org/hibernate/test/compositeelement/CompositeElementTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/compositeelement/CompositeElementTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/compositeelement/CompositeElementTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -47,6 +47,12 @@
 		p = (Parent) s.createQuery("from Parent p left join fetch p.children").uniqueResult();
 		t.commit();
 		s.close();
+		
+		s = openSession();
+		t = s.beginTransaction();
+		s.delete(p);
+		t.commit();
+		s.close();
 	}
 
 	

Modified: trunk/Hibernate3/test/org/hibernate/test/comppropertyref/ComponentPropertyRefTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/comppropertyref/ComponentPropertyRefTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/comppropertyref/ComponentPropertyRefTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -57,6 +57,8 @@
 		assertEquals( "Gavin", a.getOwner().getIdentity().getName() );
 		assertTrue( Hibernate.isInitialized( a.getOwner() ) );
 		
+		s.delete( a );
+		s.delete( a.getOwner() );
 		tx.commit();
 		s.close();
 		

Modified: trunk/Hibernate3/test/org/hibernate/test/cuk/CompositePropertyRefTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/cuk/CompositePropertyRefTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/cuk/CompositePropertyRefTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -100,6 +100,10 @@
 		
 		l = s.createQuery("from Person p left join fetch p.address").list();
 		
+		s.clear();
+		((org.hibernate.classic.Session)s).delete( "from Address" );
+		((org.hibernate.classic.Session)s).delete( "from Person" );
+		((org.hibernate.classic.Session)s).delete( "from Account" );
 		t.commit();
 		s.close();
 	}

Modified: trunk/Hibernate3/test/org/hibernate/test/dom4j/Dom4jTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/dom4j/Dom4jTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/dom4j/Dom4jTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -285,6 +285,7 @@
 		t = s.beginTransaction();
 		s.delete( "Account", acct );
 		s.delete( "Location", loc );
+		s.createQuery( "delete from Account" ).executeUpdate();
 		t.commit();
 		s.close();
 	}

Modified: trunk/Hibernate3/test/org/hibernate/test/formulajoin/FormulaJoinTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/formulajoin/FormulaJoinTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/formulajoin/FormulaJoinTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -79,6 +79,10 @@
 		tx = s.beginTransaction();
 		l = s.createQuery("from Detail d join fetch d.currentMaster.master m join fetch m.detail").list();
 		assertEquals( l.size(), 2 );
+		
+		s.createQuery("delete from Detail").executeUpdate();
+		s.createQuery("delete from Master").executeUpdate();
+		
 		tx.commit();
 		s.close();
 

Modified: trunk/Hibernate3/test/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -43,6 +43,12 @@
 			assertEquals(i+1, cars[i].getId().intValue());
 			//assertEquals(i+1, planes[i].getId().intValue());
 		}
+		
+		s = openSession();
+		tx = s.beginTransaction();
+		s.createQuery( "delete from Car" ).executeUpdate();
+		tx.commit();
+		s.close();
 	}
 
 	public void testRollingBack() throws Throwable {
@@ -90,6 +96,12 @@
 		assertEquals( new Integer(2), radio.getId() );
 		tx.commit();
 		s.close();
+		
+		s = openSession();
+		tx = s.beginTransaction();
+		s.createQuery( "delete from Radio" ).executeUpdate();
+		tx.commit();
+		s.close();
 	}
 
 	public static Test suite() {

Modified: trunk/Hibernate3/test/org/hibernate/test/joinfetch/JoinFetchTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/joinfetch/JoinFetchTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/joinfetch/JoinFetchTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -167,6 +167,7 @@
 		s.createQuery( "delete from Bid" ).executeUpdate();
 		s.createQuery( "delete from Comment" ).executeUpdate();
 		s.createQuery( "delete from Item" ).executeUpdate();
+		s.createQuery( "delete from Category" ).executeUpdate();
 		t.commit();
 		s.close();
 

Modified: trunk/Hibernate3/test/org/hibernate/test/onetomany/OneToManyTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/onetomany/OneToManyTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/onetomany/OneToManyTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -62,6 +62,14 @@
 		p = (Parent) s.createQuery("from Parent p left join fetch p.children").uniqueResult();
 		t.commit();
 		s.close();
+		
+		s = openSession();
+		t = s.beginTransaction();
+		s.createQuery("delete from Child").executeUpdate();
+		s.createQuery("delete from Parent").executeUpdate();		
+		t.commit();
+		s.close();
+
 	}
 
 	public void testManyToManySize() {

Modified: trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/Address.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/Address.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/Address.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -9,4 +9,8 @@
 	public String street;
 	public String state;
 	public String zip;
+	
+	public String toString() {
+		return this.getClass() + ":" + street;
+	}
 }

Modified: trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/OneToOneTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/OneToOneTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/OneToOneTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -131,8 +131,12 @@
 		org = (Org) list.get(1);
 		assertNotNull(p.address); assertNull(p.mailingAddress);
 		
+		s.clear();
 		s.delete(p);
-		
+		s.delete( p.address );
+		s.delete( org );
+		s.delete( a2 );
+		s.flush();
 		t.commit();
 		s.close();
 		

Modified: trunk/Hibernate3/test/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -73,9 +73,16 @@
 				break;
 			}
 		}
-
+		
 		t.commit();
 		s.close();
+		
+		s = openSession();
+		t = s.beginTransaction();
+		s.delete("from Person"); 
+		t.commit();
+		s.close();
+		
 	}
 
 	private void prepareTestData(Session s) {

Modified: trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -95,6 +95,7 @@
 			emp.setManagerBySite( new HashMap() );
 			s.delete( emp );
 		}
+		s.delete("from Site");
 		t.commit();
 		s.close();
 	}

Modified: trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -61,8 +61,21 @@
 		assertEquals( "30326", cust.getShippingAddress().getZip() );
 		assertEquals( "BILLING", cust.getBillingAddress().getAddressId().getType() );
 		assertEquals( "SHIPPING", cust.getShippingAddress().getAddressId().getType() );
+				
 		t.commit();
 		s.close();
+		
+		s = openSession();
+		t = s.beginTransaction();
+		cust.setBillingAddress( null );
+		cust.setShippingAddress( null );
+		s.delete( cust );
+		((org.hibernate.classic.Session)s).delete("from BillingAddress");
+		((org.hibernate.classic.Session)s).delete("from ShippingAddress");
+		s.flush();
+		t.commit();
+		s.close();
+		
 	}
 	
 	public void testCreateQueryNull() {
@@ -83,6 +96,7 @@
 		cust = (Customer) results.get(0);
 		assertNull( cust.getShippingAddress() );
 		assertNull( cust.getBillingAddress() );
+		s.delete(cust);
 		t.commit();
 		s.close();
 		

Modified: trunk/Hibernate3/test/org/hibernate/test/typeparameters/TypeParameterTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/typeparameters/TypeParameterTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/typeparameters/TypeParameterTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -65,12 +65,13 @@
 		statement.setInt(1, id.intValue());
 		ResultSet resultSet = statement.executeQuery();
 
-		TestCase.assertTrue("A row should have been returned", resultSet.next());
-		TestCase.assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_ONE") == null);
-		TestCase.assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_TWO") == null);
-		TestCase.assertEquals("Non-Default value should not be changed", resultSet.getInt("VALUE_THREE"), 5);
-		TestCase.assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_FOUR") == null);
+		assertTrue("A row should have been returned", resultSet.next());
+		assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_ONE") == null);
+		assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_TWO") == null);
+		assertEquals("Non-Default value should not be changed", resultSet.getInt("VALUE_THREE"), 5);
+		assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_FOUR") == null);
 
+		deleteData();
 		t.commit();
 		s.close();
 	}
@@ -82,17 +83,18 @@
 		Transaction t = s.beginTransaction();
 
 		Widget obj = (Widget) s.createQuery("from Widget o where o.string = :string").setString("string", "all-normal").uniqueResult();
-		TestCase.assertEquals("Non-Default value incorrectly loaded", obj.getValueOne(), 7);
-		TestCase.assertEquals("Non-Default value incorrectly loaded", obj.getValueTwo(), 8);
-		TestCase.assertEquals("Non-Default value incorrectly loaded", obj.getValueThree(), 9);
-		TestCase.assertEquals("Non-Default value incorrectly loaded", obj.getValueFour(), 10);
+		assertEquals("Non-Default value incorrectly loaded", obj.getValueOne(), 7);
+		assertEquals("Non-Default value incorrectly loaded", obj.getValueTwo(), 8);
+		assertEquals("Non-Default value incorrectly loaded", obj.getValueThree(), 9);
+		assertEquals("Non-Default value incorrectly loaded", obj.getValueFour(), 10);
 
 		obj = (Widget) s.createQuery("from Widget o where o.string = :string").setString("string", "all-default").uniqueResult();
-		TestCase.assertEquals("Default value incorrectly loaded", obj.getValueOne(), 1);
-		TestCase.assertEquals("Default value incorrectly loaded", obj.getValueTwo(), 2);
-		TestCase.assertEquals("Default value incorrectly loaded", obj.getValueThree(), -1);
-		TestCase.assertEquals("Default value incorrectly loaded", obj.getValueFour(), -5);
+		assertEquals("Default value incorrectly loaded", obj.getValueOne(), 1);
+		assertEquals("Default value incorrectly loaded", obj.getValueTwo(), 2);
+		assertEquals("Default value incorrectly loaded", obj.getValueThree(), -1);
+		assertEquals("Default value incorrectly loaded", obj.getValueFour(), -5);
 
+		deleteData();
 		t.commit();
 		s.close();
 	}

Modified: trunk/Hibernate3/test/org/hibernate/test/unionsubclass/UnionSubclassTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/unionsubclass/UnionSubclassTest.java	2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/unionsubclass/UnionSubclassTest.java	2006-05-09 09:37:18 UTC (rev 9914)
@@ -351,6 +351,8 @@
 		x23y4 = (Alien) s.createCriteria(Alien.class).uniqueResult();
 		s.delete( x23y4.getHive() );
 		assertTrue( s.createQuery("from Being").list().isEmpty() );
+		
+		s.createQuery("delete from Location").executeUpdate();
 		t.commit();
 		s.close();
 	}

[Hibernate-commits] Hibernate Code SVN: r9913 - trunk/Hibernate3/src/org/hibernate/criterion

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-09 03:40:11 -0400 (Tue, 09 May 2006)
New Revision: 9913

Modified:
   trunk/Hibernate3/src/org/hibernate/criterion/CountProjection.java
Log:
Revert HHH-1724 Criteria/HQL alignment (missing type)


Modified: trunk/Hibernate3/src/org/hibernate/criterion/CountProjection.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/criterion/CountProjection.java	2006-05-08 22:41:00 UTC (rev 9912)
+++ trunk/Hibernate3/src/org/hibernate/criterion/CountProjection.java	2006-05-09 07:40:11 UTC (rev 9913)
@@ -28,7 +28,7 @@
 
 	public Type[] getTypes(Criteria criteria, CriteriaQuery criteriaQuery) 
 	throws HibernateException {
-		return new Type[] { Hibernate.LONG };
+		return new Type[] { Hibernate.INTEGER };
 	}
 
 	public String toSqlString(Criteria criteria, int position, CriteriaQuery criteriaQuery) 

[Hibernate-commits] Hibernate Code SVN: r9912 - in trunk/Hibernate3/test/org/hibernate/test: array hql idclass interceptor unidir

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-08 18:41:00 -0400 (Mon, 08 May 2006)
New Revision: 9912

Modified:
   trunk/Hibernate3/test/org/hibernate/test/array/ArrayTest.java
   trunk/Hibernate3/test/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java
   trunk/Hibernate3/test/org/hibernate/test/idclass/IdClassTest.java
   trunk/Hibernate3/test/org/hibernate/test/interceptor/InterceptorTest.java
   trunk/Hibernate3/test/org/hibernate/test/unidir/BackrefTest.java
Log:
test to verify legacy classicquerytranslator count(*)
+ misc data test cleanup.

Modified: trunk/Hibernate3/test/org/hibernate/test/array/ArrayTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/array/ArrayTest.java	2006-05-08 21:43:02 UTC (rev 9911)
+++ trunk/Hibernate3/test/org/hibernate/test/array/ArrayTest.java	2006-05-08 22:41:00 UTC (rev 9912)
@@ -32,6 +32,9 @@
 		assertNotNull( a.getBs() );
 		assertEquals( a.getBs().length, 1 );
 		assertNotNull( a.getBs()[0] );
+		
+		s.delete(a);
+		s.delete(a.getBs()[0]);
 		tx.commit();
 		s.close();
 	}

Modified: trunk/Hibernate3/test/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java	2006-05-08 21:43:02 UTC (rev 9911)
+++ trunk/Hibernate3/test/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java	2006-05-08 22:41:00 UTC (rev 9912)
@@ -3,11 +3,14 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Collections;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.hibernate.Hibernate;
+import org.hibernate.MappingException;
+import org.hibernate.QueryException;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.classic.Session;
 import org.hibernate.criterion.Projections;
@@ -15,8 +18,11 @@
 import org.hibernate.dialect.function.ClassicCountFunction;
 import org.hibernate.dialect.function.ClassicSumFunction;
 import org.hibernate.engine.SessionFactoryImplementor;
+import org.hibernate.hql.QueryTranslator;
+import org.hibernate.hql.QueryTranslatorFactory;
 import org.hibernate.hql.ast.QueryTranslatorImpl;
 import org.hibernate.hql.ast.tree.SelectClause;
+import org.hibernate.hql.classic.ClassicQueryTranslatorFactory;
 
 /**
  * Tests cases for ensuring alignment between HQL and Criteria behavior. 
@@ -97,6 +103,16 @@
 		translator = createNewQueryTranslator( "select sum(h.bigDecimalValue) from Human h" );
 		assertEquals( "incorrect return type count", 1, translator.getReturnTypes().length );
 		assertEquals( "incorrect return type", Hibernate.BIG_DECIMAL, translator.getReturnTypes()[0] );
+
+		// special case to test classicquery special case handling of count(*)
+		QueryTranslator oldQueryTranslator = null;
+		String hql = "select count(*) from Human h";
+		QueryTranslatorFactory classic = new ClassicQueryTranslatorFactory();
+		oldQueryTranslator = classic.createQueryTranslator( hql, hql, Collections.EMPTY_MAP, getSessionFactoryImplementor() );
+		oldQueryTranslator.compile( Collections.EMPTY_MAP, true);
+		assertEquals( "incorrect return type count", 1, oldQueryTranslator.getReturnTypes().length );
+		assertEquals( "incorrect return type", Hibernate.LONG, oldQueryTranslator.getReturnTypes()[0] );
+
 	}
 	
 	// HHH-1724 Align Criteria with HQL aggregation return types.
@@ -157,7 +173,7 @@
 		s.close();
 	}
 
-	public void testClassicTypes() {
+	public void testClassicHQLAggregationReturnTypes() {
 		Configuration classicCfg = new Configuration();
 		classicCfg.addSqlFunction( "count", new ClassicCountFunction());
 		classicCfg.addSqlFunction( "avg", new ClassicAvgFunction());
@@ -221,6 +237,16 @@
 		translator = createNewQueryTranslator( "select sum(h.bigDecimalValue) from Human h", factory );
 		assertEquals( "incorrect return type count", 1, translator.getReturnTypes().length );
 		assertEquals( "incorrect return type", Hibernate.BIG_DECIMAL, translator.getReturnTypes()[0] );
+		
+		// special case to test classicquery special case handling of count(*)
+		QueryTranslator oldQueryTranslator = null;
+		String hql = "select count(*) from Human h";
+		QueryTranslatorFactory classic = new ClassicQueryTranslatorFactory();
+		oldQueryTranslator = classic.createQueryTranslator( hql, hql, Collections.EMPTY_MAP, factory );
+		oldQueryTranslator.compile( Collections.EMPTY_MAP, true);
+		assertEquals( "incorrect return type count", 1, oldQueryTranslator.getReturnTypes().length );
+		assertEquals( "incorrect return type", Hibernate.INTEGER, oldQueryTranslator.getReturnTypes()[0] );
+
 	}
 	
 	public static Test suite() {

Modified: trunk/Hibernate3/test/org/hibernate/test/idclass/IdClassTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/idclass/IdClassTest.java	2006-05-08 21:43:02 UTC (rev 9911)
+++ trunk/Hibernate3/test/org/hibernate/test/idclass/IdClassTest.java	2006-05-08 22:41:00 UTC (rev 9912)
@@ -53,6 +53,9 @@
 		assertEquals( "Detroit", cust.getAddress() );
 		assertEquals( cust.getCustomerName(), custId.getCustomerName() );
 		assertEquals( cust.getOrgName(), custId.getOrgName() );
+		
+		s.createQuery( "delete from Customer" ).executeUpdate();
+		
 		t.commit();
 		s.close();
 	}

Modified: trunk/Hibernate3/test/org/hibernate/test/interceptor/InterceptorTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/interceptor/InterceptorTest.java	2006-05-08 21:43:02 UTC (rev 9911)
+++ trunk/Hibernate3/test/org/hibernate/test/interceptor/InterceptorTest.java	2006-05-08 22:41:00 UTC (rev 9912)
@@ -73,6 +73,7 @@
 		List logs = s.createCriteria(Log.class).list();
 		assertEquals( 2, logs.size() );
 		s.delete(u);
+		s.createQuery( "delete from Log" ).executeUpdate();
 		t.commit();
 		s.close();
 	}

Modified: trunk/Hibernate3/test/org/hibernate/test/unidir/BackrefTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/unidir/BackrefTest.java	2006-05-08 21:43:02 UTC (rev 9911)
+++ trunk/Hibernate3/test/org/hibernate/test/unidir/BackrefTest.java	2006-05-08 22:41:00 UTC (rev 9912)
@@ -64,6 +64,13 @@
 		s.merge(p3);
 		t.commit();
 		s.close();
+		
+		s = openSession();
+		t = s.beginTransaction();
+		s.createQuery( "delete from Child" ).executeUpdate();
+		s.createQuery( "delete from Parent" ).executeUpdate();
+		t.commit();
+		s.close();
 	}
 	
 	protected String[] getMappings() {

[Hibernate-commits] Hibernate Code SVN: r9911 - trunk/Hibernate3/src/org/hibernate/dialect

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-08 17:43:02 -0400 (Mon, 08 May 2006)
New Revision: 9911

Modified:
   trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java
Log:
more ejb3 cma.

Modified: trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java	2006-05-08 21:41:28 UTC (rev 9910)
+++ trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java	2006-05-08 21:43:02 UTC (rev 9911)
@@ -112,8 +112,11 @@
 					return Hibernate.DOUBLE;
 				} 
 				
-				// finally use the sqltype if == on Hibernate types did not find a match.				
-				if ( sqlType == Types.FLOAT || sqlType == Types.DOUBLE || sqlType == Types.NUMERIC || sqlType == Types.DECIMAL || sqlType == Types.REAL) {
+				// finally use the sqltype if == on Hibernate types did not find a match.
+				if ( sqlType == Types.NUMERIC ) {
+					return columnType; //because numeric can be anything  
+				} 
+				else if ( sqlType == Types.FLOAT || sqlType == Types.DOUBLE || sqlType == Types.DECIMAL || sqlType == Types.REAL) {
 					return Hibernate.DOUBLE;
 				} 
 				else if ( sqlType == Types.BIGINT || sqlType == Types.INTEGER || sqlType == Types.SMALLINT || sqlType == Types.TINYINT ) {

[Hibernate-commits] Hibernate Code SVN: r9910 - trunk/Hibernate3/src/org/hibernate/dialect

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-08 17:41:28 -0400 (Mon, 08 May 2006)
New Revision: 9910

Modified:
   trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java
Log:
more ejb3 cma.

Modified: trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java	2006-05-08 21:14:20 UTC (rev 9909)
+++ trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java	2006-05-08 21:41:28 UTC (rev 9910)
@@ -105,18 +105,18 @@
 				else if ( columnType == Hibernate.BIG_DECIMAL ) {
 					return Hibernate.BIG_DECIMAL;
 				}
+				else if ( columnType == Hibernate.LONG || columnType == Hibernate.SHORT || columnType == Hibernate.INTEGER) {
+					return Hibernate.LONG;
+				}
 				else if ( columnType == Hibernate.FLOAT || columnType == Hibernate.DOUBLE) {
 					return Hibernate.DOUBLE;
-				}
+				} 
 				
-				// finally use the sqltype if == on Hibernate types did not find a match.
-				if ( sqlType == Types.BIGINT) {
-					return Hibernate.BIG_INTEGER;
-				} 
-				else if ( sqlType == Types.FLOAT || sqlType == Types.DOUBLE || sqlType == Types.NUMERIC || sqlType == Types.DECIMAL || sqlType == Types.REAL) {
+				// finally use the sqltype if == on Hibernate types did not find a match.				
+				if ( sqlType == Types.FLOAT || sqlType == Types.DOUBLE || sqlType == Types.NUMERIC || sqlType == Types.DECIMAL || sqlType == Types.REAL) {
 					return Hibernate.DOUBLE;
 				} 
-				else if ( sqlType == Types.INTEGER || sqlType == Types.SMALLINT || sqlType == Types.TINYINT ) {
+				else if ( sqlType == Types.BIGINT || sqlType == Types.INTEGER || sqlType == Types.SMALLINT || sqlType == Types.TINYINT ) {
 					return Hibernate.LONG;
 				}
 				else {