Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/Core
Modified Files:
InstantPersistence.pas
Log Message:
rolled back changes in rev.1.32 that break the UIB broker and probably others even in PrimerExternal - waiting for a proper fix to the external derived objects problem
Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** InstantPersistence.pas 7 Apr 2005 08:11:35 -0000 1.35
--- InstantPersistence.pas 8 Apr 2005 10:16:08 -0000 1.36
***************
*** 12713,12717 ****
WhereStr: string;
begin
! WhereStr := BuildWhereStr([InstantParentIdFieldName]);
Result := Format('DELETE FROM %s WHERE %s',
[EmbraceTable('%s'), WhereStr]);
--- 12713,12718 ----
WhereStr: string;
begin
! WhereStr := BuildWhereStr([InstantParentClassFieldName,
! InstantParentIdFieldName]);
Result := Format('DELETE FROM %s WHERE %s',
[EmbraceTable('%s'), WhereStr]);
***************
*** 12723,12727 ****
WhereStr: string;
begin
! WhereStr := BuildWhereStr([InstantIdFieldName]);
Result := Format('DELETE FROM %s WHERE %s',
[EmbraceTable(Map.Name), WhereStr]);
--- 12724,12728 ----
WhereStr: string;
begin
! WhereStr := BuildWhereStr([InstantClassFieldName, InstantIdFieldName]);
Result := Format('DELETE FROM %s WHERE %s',
[EmbraceTable(Map.Name), WhereStr]);
***************
*** 12781,12786 ****
begin
FieldStr := Format('%s, %s', [EmbraceField('%s'), EmbraceField('%s')]);
! WhereStr := Format('%s = :%s',
! [EmbraceField(InstantIdFieldName), InstantIdFieldName]);
Result := Format('SELECT %s FROM %s WHERE %s',
[FieldStr, EmbraceTable('%s'), WhereStr]);
--- 12782,12788 ----
begin
FieldStr := Format('%s, %s', [EmbraceField('%s'), EmbraceField('%s')]);
! WhereStr := Format('%s = :%s AND %s = :%s',
! [EmbraceField(InstantClassFieldName), InstantClassFieldName,
! EmbraceField(InstantIdFieldName), InstantIdFieldName]);
Result := Format('SELECT %s FROM %s WHERE %s',
[FieldStr, EmbraceTable('%s'), WhereStr]);
***************
*** 12794,12800 ****
FieldStr := Format('%s, %s, %s', [EmbraceField(InstantChildClassFieldName),
EmbraceField(InstantChildIdFieldName), EmbraceField(InstantSequenceNoFieldName)]);
! WhereStr := Format('%s = :%s AND %s = :%s',
[EmbraceField(InstantParentClassFieldName), InstantParentClassFieldName,
! EmbraceField(InstantParentIdFieldName), InstantParentIdFieldName]);
Result := Format('SELECT %s FROM %s WHERE %s ORDER BY %s',
[FieldStr, EmbraceTable('%s'), WhereStr, EmbraceField(InstantSequenceNoFieldName)]);
--- 12796,12803 ----
FieldStr := Format('%s, %s, %s', [EmbraceField(InstantChildClassFieldName),
EmbraceField(InstantChildIdFieldName), EmbraceField(InstantSequenceNoFieldName)]);
! WhereStr := Format('%s = :%s AND %s = :%s AND %s = :%s',
[EmbraceField(InstantParentClassFieldName), InstantParentClassFieldName,
! EmbraceField(InstantParentIdFieldName), InstantParentIdFieldName,
! EmbraceField(InstantChildClassFieldName), InstantChildClassFieldName]);
Result := Format('SELECT %s FROM %s WHERE %s ORDER BY %s',
[FieldStr, EmbraceTable('%s'), WhereStr, EmbraceField(InstantSequenceNoFieldName)]);
***************
*** 12807,12811 ****
begin
FieldStr := BuildFieldList(Map, [InstantUpdateCountFieldName]);
! WhereStr := BuildWhereStr([InstantIdFieldName]);
Result := Format('SELECT %s FROM %s WHERE %s',
[FieldStr, EmbraceTable(Map.Name), WhereStr]);
--- 12810,12814 ----
begin
FieldStr := BuildFieldList(Map, [InstantUpdateCountFieldName]);
! WhereStr := BuildWhereStr([InstantClassFieldName, InstantIdFieldName]);
Result := Format('SELECT %s FROM %s WHERE %s',
[FieldStr, EmbraceTable(Map.Name), WhereStr]);
***************
*** 12825,12829 ****
AssignmentStr := BuildAssignmentList(Map,
[InstantIdFieldName, InstantUpdateCountFieldName]);
! WhereStr := ' (1=1) ' + BuildPersistentIdCriteria;
Result := Format('UPDATE %s SET %s WHERE %s',
[EmbraceTable(Map.Name), AssignmentStr, WhereStr]);
--- 12828,12833 ----
AssignmentStr := BuildAssignmentList(Map,
[InstantIdFieldName, InstantUpdateCountFieldName]);
! WhereStr := BuildWhereStr([InstantClassFieldName]) +
! BuildPersistentIdCriteria;
Result := Format('UPDATE %s SET %s WHERE %s',
[EmbraceTable(Map.Name), AssignmentStr, WhereStr]);
|
