fix(refresh): hydrate projected rows with aliased primary keys

Author: elpete

models/BaseEntity.cfc

@@ -1527,7 +1527,12 @@ component accessors="true" {
 		if ( !isStruct( freshData ) || structKeyExists( freshData, "isQuickEntity" ) ) {
 			return freshData;
 		}
-		var entity = newEntity().hydrate( freshData );
+		// Snapshot rows use database column names, while hydrate() requires aliased keys.
+		// Use the same database-row hydration path as QuickBuilder.loadEntity().
+		var entity = newEntity()
+			.assignAttributesData( freshData )
+			.assignOriginalAttributes( freshData )
+			.markLoaded();
 		return hasRefreshQuery ? entity.set_refreshQuery( variables._refreshQuery ) : entity;
 	}
 

tests/resources/app/models/AliasedPrimaryKeyUser.cfc

@@ -0,0 +1,17 @@
+component
+	extends  ="quick.models.BaseEntity"
+	table    ="users"
+	key      ="userID"
+	accessors="true"
+{
+
+	property name="userID" column="id";
+	property name="username";
+	property name="firstName" column="first_name";
+	property name="lastName"  column="last_name";
+
+	function scopeWithFullName( qb ) {
+		qb.appendVirtualAttribute( "fullName" ).selectRaw( "CONCAT(first_name, ' ', last_name) AS fullName" );
+	}
+
+}

tests/specs/integration/BaseEntity/RefreshSnapshotSpec.cfc

@@ -2,6 +2,20 @@ component extends="tests.resources.ModuleIntegrationSpec" {
 
 	function run() {
 		describe( "Result-set refresh snapshots", function() {
+			it( "retrieves fresh projected entities with aliased primary keys", function() {
+				var user = getInstance( "AliasedPrimaryKeyUser" ).withFullName().findOrFail( 1 );
+				queryExecute( "UPDATE `users` SET `first_name` = ? WHERE `id` = ?", [ "Aliased", 1 ] );
+
+				var fresh = user.fresh();
+				expect( fresh.getUserID() ).toBe( 1 );
+				expect( fresh.getFullName() ).toBe( "Aliased Peterson" );
+				expect( fresh.isLoaded() ).toBeTrue();
+				expect( fresh.isDirty() ).toBeFalse();
+				expect( fresh.get_refreshQuery() ).toBeSameInstanceAs( user.get_refreshQuery() );
+				expect( fresh.fresh().getUserID() ).toBe( 1 );
+				expect( user.getFirstName() ).toBe( "Eric" );
+			} );
+
 			it( "shares an isolated projection snapshot across get results", function() {
 				assertSharedSnapshot( "get" );
 			} );