Add H5 probes for persister int overload, transient entity, date-string coercion

Author: zspitzer

tests/mapping/dateStringCoercion.cfc

@@ -0,0 +1,25 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
+
+	function run( testResults, testBox ) {
+
+		describe( "string-to-date parameter coercion in finders + HQL", function() {
+
+			it( "entityLoad filter struct accepts a date string", function() {
+				var result = _InternalRequest( template: "#uri()#/entityLoadStringDate.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+			it( "ormExecuteQuery accepts a String for a Date param", function() {
+				var result = _InternalRequest( template: "#uri()#/hqlStringDate.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+		});
+
+	}
+
+	private string function uri() {
+		return getDirectoryFromPath( contractPath( getCurrentTemplatePath() ) ) & "dateStringCoercion";
+	}
+
+}

tests/mapping/dateStringCoercion/Application.cfc

@@ -0,0 +1,9 @@
+component {
+	this.name = "test-dateStringCoercion-#hash( getCurrentTemplatePath() )#";
+	this.datasource = server.getDatasource( "h2", server._getTempDir( "orm-dateStringCoercion" ) );
+	this.ormEnabled = true;
+	this.ormSettings = {
+		dbcreate: "dropcreate",
+		cfclocation: [ getDirectoryFromPath( getCurrentTemplatePath() ) ]
+	};
+}

tests/mapping/dateStringCoercion/User.cfc

@@ -0,0 +1,7 @@
+component persistent="true" table="user_login" accessors="true" {
+
+	property name="id"        fieldtype="id" ormtype="string";
+	property name="userName"  ormtype="string" length="50";
+	property name="lastLogin" ormtype="date";
+
+}

tests/mapping/dateStringCoercion/entityLoadStringDate.cfm

@@ -0,0 +1,30 @@
+<cfscript>
+// Probe: entityLoad("User", { lastLogin: "01/01/2009" }) — filter-struct path.
+// On H5 the extension/Hibernate JdbcDateJavaType.wrap silently coerced the
+// String to java.sql.Date via Lucee's autocast. On H7 JdbcDateJavaType.wrap
+// rejects String outright with "Could not convert 'java.lang.String' to
+// 'java.sql.Date' ... argument [...] is not assignable to java.util.Date".
+//
+// Test corpus pre-this binds dates as createDate()/now() Java types only —
+// real-world apps (cborm dynamic finders, ColdBox controllers) routinely
+// pass user-typed CFML date strings.
+seed = entityNew( "User" );
+seed.setId( createUUID() );
+seed.setUserName( "Alice" );
+seed.setLastLogin( createDate( 2009, 1, 1 ) );
+entitySave( seed );
+ormFlush();
+ormClearSession();
+
+// Filter-struct form — Hibernate builds a Criteria-equivalent and binds
+// lastLogin as a parameter. The String "01/01/2009" must coerce to a date.
+result = entityLoad( "User", { lastLogin: "01/01/2009" } );
+if ( !isArray( result ) )
+	throw( message="entityLoad: expected array, got [#serializeJSON( result )#]" );
+if ( arrayLen( result ) != 1 )
+	throw( message="entityLoad: expected 1 match for date string '01/01/2009', got [#arrayLen( result )#]" );
+if ( result[ 1 ].getUserName() != "Alice" )
+	throw( message="entityLoad: expected user [Alice], got [#result[ 1 ].getUserName()#]" );
+
+echo( "ok" );
+</cfscript>

tests/mapping/dateStringCoercion/hqlStringDate.cfm

@@ -0,0 +1,28 @@
+<cfscript>
+// Probe: HQL named-parameter binding accepts a String for a Date column.
+// On H5 the parameter coercion path went through Hibernate's JavaTypeRegistry
+// which let strings pass via Lucee's autocoercion. On H7 strict typing in
+// JdbcDateJavaType.wrap throws on String input — fix path likely in the
+// extension's HQL parameter binding (where Lucee hands the param struct off
+// to Hibernate) wherever String→Date coercion previously happened implicitly.
+seed = entityNew( "User" );
+seed.setId( createUUID() );
+seed.setUserName( "Bob" );
+seed.setLastLogin( createDate( 2012, 1, 1 ) );
+entitySave( seed );
+ormFlush();
+ormClearSession();
+
+result = ormExecuteQuery(
+	"FROM User WHERE lastLogin = :p",
+	{ p: "01/01/2012" }
+);
+if ( !isArray( result ) )
+	throw( message="ormExecuteQuery: expected array, got [#serializeJSON( result )#]" );
+if ( arrayLen( result ) != 1 )
+	throw( message="ormExecuteQuery: expected 1 match for HQL date string '01/01/2012', got [#arrayLen( result )#]" );
+if ( result[ 1 ].getUserName() != "Bob" )
+	throw( message="ormExecuteQuery: expected user [Bob], got [#result[ 1 ].getUserName()#]" );
+
+echo( "ok" );
+</cfscript>

tests/session/apiSmoke.cfc

@@ -79,6 +79,16 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
 				expect( trim( result.filecontent ) ).toBe( "ok" );
 			});
 
+			it( "EntityPersister.getSubclassPropertyName(int) resolves index to property name", function() {
+				var result = _InternalRequest( template: "#uri()#/persisterPropertyByIndex.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+			it( "session.getEntityName( transient ) throws TransientObjectException", function() {
+				var result = _InternalRequest( template: "#uri()#/transientEntityName.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
 		});
 
 	}

tests/session/apiSmoke/persisterPropertyByIndex.cfm

@@ -0,0 +1,37 @@
+<cfscript>
+// Locks down the H5.6 EntityPersister int-index property name lookup that
+// real-world CFML code (cborm BaseORMService.getDirtyPropertyNames,
+// basecfc, ColdMVC) depends on. The cborm flow is:
+//
+//   var modified = persister.findModified( dbState, currentState, entity, session ); // int[]
+//   return arrayMap( modified, function( i ){ return persister.getSubclassPropertyName( i ); } );
+//
+// On 5.6 getSubclassPropertyName(int) is a real method on
+// SingleTableEntityPersister. On 7.0+ that int overload is gone — only the
+// String overload survives. Same test must pass on both branches once the
+// extension-side persister shim re-exposes the int form.
+sf = ORMGetSessionFactory();
+md = sf.getClassMetadata( "SmokeEntity" );
+if ( isNull( md ) )
+	throw( message="getClassMetadata: returned null for SmokeEntity" );
+
+// getPropertyNames returns the entity's own (non-id) properties.
+propNames = md.getPropertyNames();
+if ( !isArray( propNames ) || arrayLen( propNames ) == 0 )
+	throw( message="getPropertyNames: expected non-empty array, got [#serializeJSON( propNames )#]" );
+
+// Walk every index Hibernate exposes via getSubclassPropertyName(int).
+// For a flat entity (no inheritance) the subclass property table mirrors
+// getPropertyNames(). The probe asserts both: (a) the int overload exists
+// and dispatches; (b) every index resolves to a non-empty String.
+for ( i = 0; i < arrayLen( propNames ); i++ ) {
+	name = md.getSubclassPropertyName( javaCast( "int", i ) );
+	if ( isNull( name ) || !isSimpleValue( name ) || len( name ) == 0 )
+		throw( message="getSubclassPropertyName(#i#): expected non-empty String, got [#serializeJSON( name )#]" );
+	// CFML 1-indexed vs Java 0-indexed — propNames[ i+1 ] is the same slot.
+	if ( name != propNames[ i + 1 ] )
+		throw( message="getSubclassPropertyName(#i#): expected [#propNames[ i + 1 ]#], got [#name#]" );
+}
+
+echo( "ok" );
+</cfscript>

tests/session/apiSmoke/transientEntityName.cfm

@@ -0,0 +1,47 @@
+<cfscript>
+// Locks down the H5.6 contract that session.getEntityName( transient ) throws
+// org.hibernate.TransientObjectException — NOT IllegalArgumentException.
+// ColdBox's ObjectPopulator.getTargetName depends on this exact exception
+// type to short-circuit transient detection:
+//
+//   try {
+//     return ormGetSession().getEntityName( arguments.target );
+//   } catch ( org.hibernate.TransientObjectException e ) {
+//     // fall through to getMetadata( target ).name
+//   }
+//
+// (cborm test-harness/coldbox/system/core/dynamic/ObjectPopulator.cfc#L655)
+//
+// On H5 the throw site is EntityIdentifierMapping.java#L116 — message format
+// "object references an unsaved transient instance of '<entity>'". TYPE:
+// org.hibernate.TransientObjectException.
+//
+// On H7 the same call throws java.lang.IllegalArgumentException ("Given
+// entity is not associated with the persistence context") from
+// SessionImpl.getEntityEntry → SessionImpl.getEntityName(Object) at
+// SessionImpl.java#L1798. The typed catch above no longer matches, the
+// exception propagates, and ColdBox surfaces it as "Error populating bean".
+//
+// Same test must pass on both branches once the extension-side compat session
+// wrapper catches IAE from getEntityName and rethrows as
+// TransientObjectException to preserve the H5 cborm/ColdBox/basecfc contract.
+e = entityNew( "SmokeEntity" );
+e.setId( createUUID() );
+e.setName( "Transient" );
+
+ormSess = ormGetSession();
+threwTransient = false;
+otherErr = "";
+try {
+	ormSess.getEntityName( e );
+} catch ( org.hibernate.TransientObjectException toe ) {
+	threwTransient = true;
+} catch ( any other ) {
+	otherErr = "type=[#other.type#] message=[#other.message#]";
+}
+
+if ( !threwTransient )
+	throw( message="getEntityName(transient): expected org.hibernate.TransientObjectException, got [#otherErr#]" );
+
+echo( "ok" );
+</cfscript>