Merge pull request #48 from zspitzer/h73-baseline-tests

zspitzer · web-flow · commit df01627b07b3 · 2026-04-27T17:19:44.000+02:00
Add baseline tests for read-only collections and unique-result multi-row paths
diff --git a/tests/session/readOnlyEntity.cfc b/tests/session/readOnlyEntity.cfc
@@ -0,0 +1,37 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
+
+	function run( testResults, testBox ) {
+
+		describe( "Read-only entity behaviour [H2] — locks down 5.6 baseline for 7.3 migration", function() {
+
+			it( "session.setReadOnly() and session.isReadOnly() round-trip", function() {
+				var result = _InternalRequest( template: "#uri()#/isReadOnlyFlag.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+			it( "scalar mutation on read-only entity does not persist", function() {
+				var result = _InternalRequest( template: "#uri()#/setReadOnlyScalar.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+			// xit until Hibernate 7.3 — 5.6 silently lets read-only collections mutate
+			// (the asymmetry 7.3 fixes: scalars honour read-only, collections don't)
+			xit( "collection add on read-only entity does not persist", function() {
+				var result = _InternalRequest( template: "#uri()#/setReadOnlyCollectionAdd.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+			xit( "collection remove on read-only entity does not persist", function() {
+				var result = _InternalRequest( template: "#uri()#/setReadOnlyCollectionRemove.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+		});
+
+	}
+
+	private string function uri() {
+		return getDirectoryFromPath( contractPath( getCurrentTemplatePath() ) ) & "readOnlyEntity";
+	}
+
+}
diff --git a/tests/session/readOnlyEntity/Application.cfc b/tests/session/readOnlyEntity/Application.cfc
@@ -0,0 +1,17 @@
+component {
+	this.name = "test-readOnlyEntity-#hash( getCurrentTemplatePath() )#";
+	this.datasource = server.getDatasource( "h2", server._getTempDir( "orm-readOnlyEntity" ) );
+	this.ormEnabled = true;
+	this.ormSettings = {
+		dbcreate: "dropcreate",
+		cfclocation: [ getDirectoryFromPath( getCurrentTemplatePath() ) ]
+	};
+
+	function onRequestStart() {
+		queryExecute( "DELETE FROM RO_Child" );
+		queryExecute( "DELETE FROM RO_Parent" );
+		queryExecute( "INSERT INTO RO_Parent ( id, name ) VALUES ( 'p1', 'parent-one' )" );
+		queryExecute( "INSERT INTO RO_Child ( id, name, parentId ) VALUES ( 'c1', 'child-one', 'p1' )" );
+		queryExecute( "INSERT INTO RO_Child ( id, name, parentId ) VALUES ( 'c2', 'child-two', 'p1' )" );
+	}
+}
diff --git a/tests/session/readOnlyEntity/ROChild.cfc b/tests/session/readOnlyEntity/ROChild.cfc
@@ -0,0 +1,10 @@
+component persistent="true" table="RO_Child" accessors="true" {
+
+	property name="id"   fieldtype="id" ormtype="string";
+	property name="name" ormtype="string";
+	property name="parent"
+		fieldtype="many-to-one"
+		cfc="ROParent"
+		fkcolumn="parentId";
+
+}
diff --git a/tests/session/readOnlyEntity/ROParent.cfc b/tests/session/readOnlyEntity/ROParent.cfc
@@ -0,0 +1,12 @@
+component persistent="true" table="RO_Parent" accessors="true" {
+
+	property name="id"   fieldtype="id" ormtype="string";
+	property name="name" ormtype="string";
+	property name="children"
+		fieldtype="one-to-many"
+		cfc="ROChild"
+		fkcolumn="parentId"
+		type="array"
+		cascade="all";
+
+}
diff --git a/tests/session/readOnlyEntity/isReadOnlyFlag.cfm b/tests/session/readOnlyEntity/isReadOnlyFlag.cfm
@@ -0,0 +1,20 @@
+<cfscript>
+// Verify session.setReadOnly() / session.isReadOnly() round-trip.
+
+parent = entityLoadByPK( "ROParent", "p1" );
+// `session` is a CFML scope name, can't be used as a variable
+hibSession = ormGetSession();
+
+if ( hibSession.isReadOnly( parent ) )
+	throw( message="Entity unexpectedly read-only at load" );
+
+hibSession.setReadOnly( parent, true );
+if ( !hibSession.isReadOnly( parent ) )
+	throw( message="setReadOnly( entity, true ) did not flip isReadOnly()" );
+
+hibSession.setReadOnly( parent, false );
+if ( hibSession.isReadOnly( parent ) )
+	throw( message="setReadOnly( entity, false ) did not flip isReadOnly()" );
+
+echo( "ok" );
+</cfscript>
diff --git a/tests/session/readOnlyEntity/setReadOnlyCollectionAdd.cfm b/tests/session/readOnlyEntity/setReadOnlyCollectionAdd.cfm
@@ -0,0 +1,27 @@
+<cfscript>
+// 7.3 change: collections owned by a read-only entity become read-only.
+// arrayAppend then flush should not produce a 3rd DB row regardless of
+// whether the platform throws or silently ignores the mutation.
+
+parent = entityLoadByPK( "ROParent", "p1" );
+initialCount = arrayLen( parent.getChildren() );
+ormGetSession().setReadOnly( parent, true );
+
+newChild = entityNew( "ROChild", { id: "c-new", name: "should-not-persist" } );
+newChild.setParent( parent );
+
+try {
+	arrayAppend( parent.getChildren(), newChild );
+	ormFlush();
+} catch ( any e ) {
+	// 7.3 throws on read-only collection mutation — acceptable
+}
+
+ormClearSession();
+reloaded = entityLoadByPK( "ROParent", "p1" );
+finalCount = arrayLen( reloaded.getChildren() );
+if ( finalCount != initialCount )
+	throw( message="Read-only collection add persisted, initial [#initialCount#] now [#finalCount#]" );
+
+echo( "ok" );
+</cfscript>
diff --git a/tests/session/readOnlyEntity/setReadOnlyCollectionRemove.cfm b/tests/session/readOnlyEntity/setReadOnlyCollectionRemove.cfm
@@ -0,0 +1,22 @@
+<cfscript>
+// 7.3 change: removing from a collection on a read-only entity must not persist.
+
+parent = entityLoadByPK( "ROParent", "p1" );
+initialCount = arrayLen( parent.getChildren() );
+ormGetSession().setReadOnly( parent, true );
+
+try {
+	arrayDeleteAt( parent.getChildren(), 1 );
+	ormFlush();
+} catch ( any e ) {
+	// 7.3 may throw — acceptable, persistence outcome is what we lock down
+}
+
+ormClearSession();
+reloaded = entityLoadByPK( "ROParent", "p1" );
+finalCount = arrayLen( reloaded.getChildren() );
+if ( finalCount != initialCount )
+	throw( message="Read-only collection remove persisted, initial [#initialCount#] now [#finalCount#]" );
+
+echo( "ok" );
+</cfscript>
diff --git a/tests/session/readOnlyEntity/setReadOnlyScalar.cfm b/tests/session/readOnlyEntity/setReadOnlyScalar.cfm
@@ -0,0 +1,22 @@
+<cfscript>
+// session.setReadOnly( entity, true ) — scalar mutations must not persist.
+// Whether Hibernate throws or silently ignores is platform-defined; the
+// contract we assert is "read-only entity changes never reach the DB".
+
+parent = entityLoadByPK( "ROParent", "p1" );
+ormGetSession().setReadOnly( parent, true );
+
+try {
+	parent.setName( "mutated" );
+	ormFlush();
+} catch ( any e ) {
+	// 7.3 may start throwing — acceptable, the persist outcome is what matters
+}
+
+ormClearSession();
+reloaded = entityLoadByPK( "ROParent", "p1" );
+if ( reloaded.getName() != "parent-one" )
+	throw( message="Read-only scalar mutation persisted, expected [parent-one] got [#reloaded.getName()#]" );
+
+echo( "ok" );
+</cfscript>
diff --git a/tests/session/uniqueResultMulti.cfc b/tests/session/uniqueResultMulti.cfc
@@ -0,0 +1,30 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
+
+	function run( testResults, testBox ) {
+
+		describe( "ormExecuteQuery unique=true with multiple rows [H2] — locks down 5.6 baseline for 7.3 dedup change", function() {
+
+			it( "throws when no filter and >1 row", function() {
+				var result = _InternalRequest( template: "#uri()#/executeQueryUniqueMulti.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+			it( "throws when WHERE matches multiple rows", function() {
+				var result = _InternalRequest( template: "#uri()#/executeQueryParamUniqueMulti.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+			it( "returns single entity when WHERE matches exactly one row", function() {
+				var result = _InternalRequest( template: "#uri()#/executeQuerySingleMatch.cfm" );
+				expect( trim( result.filecontent ) ).toBe( "ok" );
+			});
+
+		});
+
+	}
+
+	private string function uri() {
+		return getDirectoryFromPath( contractPath( getCurrentTemplatePath() ) ) & "uniqueResultMulti";
+	}
+
+}
diff --git a/tests/session/uniqueResultMulti/Application.cfc b/tests/session/uniqueResultMulti/Application.cfc
@@ -0,0 +1,17 @@
+component {
+	this.name = "test-uniqueResultMulti-#hash( getCurrentTemplatePath() )#";
+	this.datasource = server.getDatasource( "h2", server._getTempDir( "orm-uniqueResultMulti" ) );
+	this.ormEnabled = true;
+	this.ormSettings = {
+		dbcreate: "dropcreate",
+		cfclocation: [ getDirectoryFromPath( getCurrentTemplatePath() ) ]
+	};
+
+	function onRequestStart() {
+		queryExecute( "DELETE FROM MultiEntity" );
+		queryExecute( "INSERT INTO MultiEntity ( id, name, status ) VALUES ( 1, 'alpha',   'active' )" );
+		queryExecute( "INSERT INTO MultiEntity ( id, name, status ) VALUES ( 2, 'bravo',   'active' )" );
+		queryExecute( "INSERT INTO MultiEntity ( id, name, status ) VALUES ( 3, 'charlie', 'active' )" );
+		queryExecute( "INSERT INTO MultiEntity ( id, name, status ) VALUES ( 4, 'delta',   'inactive' )" );
+	}
+}
diff --git a/tests/session/uniqueResultMulti/MultiEntity.cfc b/tests/session/uniqueResultMulti/MultiEntity.cfc
@@ -0,0 +1,7 @@
+component persistent="true" table="MultiEntity" accessors="true" {
+
+	property name="id"     fieldtype="id" ormtype="integer" generator="assigned";
+	property name="name"   ormtype="string";
+	property name="status" ormtype="string";
+
+}
diff --git a/tests/session/uniqueResultMulti/executeQueryParamUniqueMulti.cfm b/tests/session/uniqueResultMulti/executeQueryParamUniqueMulti.cfm
@@ -0,0 +1,16 @@
+<cfscript>
+// ormExecuteQuery( ..., params, unique=true ) — WHERE clause matches 3 rows, must throw.
+
+try {
+	result = ormExecuteQuery(
+		"FROM MultiEntity WHERE status = :status",
+		{ status: "active" },
+		true
+	);
+	throw( message="executeQueryParamUniqueMulti: expected throw with 3 active rows, got result of type [#( isNull( result ) ? "null" : getMetadata( result ).getName() )#]" );
+} catch ( any e ) {
+	if ( e.message contains "executeQueryParamUniqueMulti:" ) rethrow;
+	// expected
+}
+echo( "ok" );
+</cfscript>
diff --git a/tests/session/uniqueResultMulti/executeQuerySingleMatch.cfm b/tests/session/uniqueResultMulti/executeQuerySingleMatch.cfm
@@ -0,0 +1,19 @@
+<cfscript>
+// Control: filter narrows to exactly one row — unique=true returns the entity.
+// Confirms our test fixture setup, and that single-row + unique=true still works.
+
+result = ormExecuteQuery(
+	"FROM MultiEntity WHERE status = :status",
+	{ status: "inactive" },
+	true
+);
+
+if ( isNull( result ) )
+	throw( message="executeQuerySingleMatch: expected entity, got null" );
+if ( !isObject( result ) )
+	throw( message="executeQuerySingleMatch: expected object, got [#getMetadata( result ).getName()#]" );
+if ( result.getName() != "delta" )
+	throw( message="executeQuerySingleMatch: expected delta, got [#result.getName()#]" );
+
+echo( "ok" );
+</cfscript>
diff --git a/tests/session/uniqueResultMulti/executeQueryUniqueMulti.cfm b/tests/session/uniqueResultMulti/executeQueryUniqueMulti.cfm
@@ -0,0 +1,13 @@
+<cfscript>
+// ormExecuteQuery( ..., unique=true ) with >1 row must throw.
+// Hibernate 6/7.2 had inconsistent dedup behaviour; 7.3 always throws.
+
+try {
+	result = ormExecuteQuery( "FROM MultiEntity", {}, true );
+	throw( message="executeQueryUniqueMulti: expected throw with 4 rows, got result of type [#( isNull( result ) ? "null" : getMetadata( result ).getName() )#]" );
+} catch ( any e ) {
+	if ( e.message contains "executeQueryUniqueMulti:" ) rethrow;
+	// expected — non-unique result must throw
+}
+echo( "ok" );
+</cfscript>
