[Instantobjects-cvscommit] Source/Core InstantConsts.pas,1.8,1.9 InstantPersistence.pas,1.28,1.29

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30279/Core

Modified Files:
	InstantConsts.pas InstantPersistence.pas 
Log Message:
removed the AttributeName field from external storage intermediate table mappings

Index: InstantConsts.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantConsts.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** InstantConsts.pas	23 Feb 2005 11:03:01 -0000	1.8
--- InstantConsts.pas	25 Feb 2005 14:48:26 -0000	1.9
***************
*** 59,63 ****
    InstantParentIdFieldName = 'ParentId';
    InstantParentClassFieldName = 'ParentClass';
-   InstantParentAttributeFieldName = 'ParentAttribute';
    InstantChildIdFieldName = 'ChildId';
    InstantSequenceNoFieldName = 'SequenceNo';
--- 59,62 ----

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** InstantPersistence.pas	25 Feb 2005 14:03:17 -0000	1.28
--- InstantPersistence.pas	25 Feb 2005 14:48:26 -0000	1.29
***************
*** 12632,12637 ****
    Columns := Columns + ', ' + EmbraceField(InstantParentIdFieldName) + ' ' +
      Broker.DataTypeToColumnType(Broker.Connector.IdDataType, Broker.Connector.IdSize);
-   Columns := Columns + ', ' + EmbraceField(InstantParentAttributeFieldName) + ' ' +
-     Broker.DataTypeToColumnType(dtString, InstantDefaultFieldSize);
    Columns := Columns + ', ' + EmbraceField(InstantChildClassFieldName) + ' ' +
      Broker.DataTypeToColumnType(dtString, InstantDefaultFieldSize);
--- 12632,12635 ----
***************
*** 12711,12715 ****
  begin
    WhereStr := BuildWhereStr([InstantParentClassFieldName,
!     InstantParentIdFieldName, InstantParentAttributeFieldName]);
    Result := Format('DELETE FROM %s WHERE %s',
      [EmbraceTable('%s'), WhereStr]);
--- 12709,12713 ----
  begin
    WhereStr := BuildWhereStr([InstantParentClassFieldName,
!     InstantParentIdFieldName]);
    Result := Format('DELETE FROM %s WHERE %s',
      [EmbraceTable('%s'), WhereStr]);
***************
*** 12743,12758 ****
    FieldStr, ParamStr: string;
  begin
!   FieldStr := Format('%s, %s, %s, %s, %s, %s, %s',
      [EmbraceField(InstantIdFieldName),
      EmbraceField(InstantParentClassFieldName),
      EmbraceField(InstantParentIdFieldName),
-     EmbraceField(InstantParentAttributeFieldName),
      EmbraceField(InstantChildClassFieldName),
      EmbraceField(InstantChildIdFieldName),
      EmbraceField(InstantSequenceNoFieldName)]);
!   ParamStr := Format(':%s, :%s, :%s, :%s, :%s, :%s, :%s',
      [InstantIdFieldName,
      InstantParentClassFieldName, InstantParentIdFieldName,
-     InstantParentAttributeFieldName,
      InstantChildClassFieldName, InstantChildIdFieldName,
      InstantSequenceNoFieldName]);
--- 12741,12754 ----
    FieldStr, ParamStr: string;
  begin
!   FieldStr := Format('%s, %s, %s, %s, %s, %s',
      [EmbraceField(InstantIdFieldName),
      EmbraceField(InstantParentClassFieldName),
      EmbraceField(InstantParentIdFieldName),
      EmbraceField(InstantChildClassFieldName),
      EmbraceField(InstantChildIdFieldName),
      EmbraceField(InstantSequenceNoFieldName)]);
!   ParamStr := Format(':%s, :%s, :%s, :%s, :%s, :%s',
      [InstantIdFieldName,
      InstantParentClassFieldName, InstantParentIdFieldName,
      InstantChildClassFieldName, InstantChildIdFieldName,
      InstantSequenceNoFieldName]);
***************
*** 12795,12802 ****
    FieldStr := Format('%s, %s, %s', [EmbraceField(InstantChildClassFieldName),
      EmbraceField(InstantChildIdFieldName), EmbraceField(InstantSequenceNoFieldName)]);
!   WhereStr := Format('%s = :%s AND %s = :%s AND %s = :%s AND %s = :%s',
      [EmbraceField(InstantParentClassFieldName), InstantParentClassFieldName,
      EmbraceField(InstantParentIdFieldName), InstantParentIdFieldName,
-     EmbraceField(InstantParentAttributeFieldName), InstantParentAttributeFieldName,
      EmbraceField(InstantChildClassFieldName), InstantChildClassFieldName]);
    Result := Format('SELECT %s FROM %s WHERE %s ORDER BY %s',
--- 12791,12797 ----
    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',
***************
*** 13442,13446 ****
              AddIdParam(SelectParams, InstantParentIdFieldName, AObject.Id);
              AddStringParam(SelectParams, InstantParentClassFieldName, AObject.ClassName);
-             AddStringParam(SelectParams, InstantParentAttributeFieldName, AttributeMetadata.Name);
              AddStringParam(SelectParams, InstantChildClassFieldName, AttributeMetadata.ObjectClassName);
              DataSet := Broker.AcquireDataSet(SelectStatement, SelectParams);
--- 13437,13440 ----
***************
*** 13476,13484 ****
                [AttributeMetadata.ExternalStorageName,
                InstantParentClassFieldName,
!               InstantParentIdFieldName,
!               InstantParentAttributeFieldName]);
              AddStringParam(DeleteParams, InstantParentClassFieldName, AObject.ClassName);
              AddIdParam(DeleteParams, InstantParentIdFieldName, AObject.Id);
-             AddStringParam(DeleteParams, InstantParentAttributeFieldName, AttributeMetadata.Name);
              Broker.Execute(DeleteStatement, DeleteParams);
            finally
--- 13470,13476 ----
                [AttributeMetadata.ExternalStorageName,
                InstantParentClassFieldName,
!               InstantParentIdFieldName]);
              AddStringParam(DeleteParams, InstantParentClassFieldName, AObject.ClassName);
              AddIdParam(DeleteParams, InstantParentIdFieldName, AObject.Id);
              Broker.Execute(DeleteStatement, DeleteParams);
            finally
***************
*** 13509,13517 ****
              DeleteStatement := Format(DeleteExternalSQL,
                [AttributeMetadata.ExternalStorageName,
!               InstantParentClassFieldName,
!               InstantParentAttributeFieldName]);
              AddStringParam(DeleteParams, InstantParentClassFieldName, AObject.ClassName);
              AddIdParam(DeleteParams, InstantParentIdFieldName, AObject.Id);
-             AddStringParam(DeleteParams, InstantParentAttributeFieldName, AttributeMetadata.Name);
              Broker.Execute(DeleteStatement, DeleteParams);
            finally
--- 13501,13507 ----
              DeleteStatement := Format(DeleteExternalSQL,
                [AttributeMetadata.ExternalStorageName,
!               InstantParentClassFieldName]);
              AddStringParam(DeleteParams, InstantParentClassFieldName, AObject.ClassName);
              AddIdParam(DeleteParams, InstantParentIdFieldName, AObject.Id);
              Broker.Execute(DeleteStatement, DeleteParams);
            finally
***************
*** 13719,13723 ****
                AddIdParam(SelectParams, InstantParentIdFieldName, AObject.Id);
                AddStringParam(SelectParams, InstantParentClassFieldName, AObject.ClassName);
-               AddStringParam(SelectParams, InstantParentAttributeFieldName, AttributeMetadata.Name);
                AddStringParam(SelectParams, InstantChildClassFieldName, AttributeMetadata.ObjectClassName);
                DataSet := Broker.AcquireDataSet(SelectStatement, SelectParams);
--- 13709,13712 ----
***************
*** 13752,13760 ****
                DeleteStatement := Format(DeleteExternalSQL,
                  [AttributeMetadata.ExternalStorageName,
!                 InstantParentClassFieldName,
!                 InstantParentAttributeFieldName]);
                AddStringParam(DeleteParams, InstantParentClassFieldName, AObject.ClassName);
                AddIdParam(DeleteParams, InstantParentIdFieldName, AObject.Id);
-               AddStringParam(DeleteParams, InstantParentAttributeFieldName, AttributeMetadata.Name);
                Broker.Execute(DeleteStatement, DeleteParams);
              finally
--- 13741,13747 ----
                DeleteStatement := Format(DeleteExternalSQL,
                  [AttributeMetadata.ExternalStorageName,
!                 InstantParentClassFieldName]);
                AddStringParam(DeleteParams, InstantParentClassFieldName, AObject.ClassName);
                AddIdParam(DeleteParams, InstantParentIdFieldName, AObject.Id);
                Broker.Execute(DeleteStatement, DeleteParams);
              finally
***************
*** 13778,13782 ****
                  AddStringParam(InsertParams, InstantParentClassFieldName, AObject.ClassName);
                  AddIdParam(InsertParams, InstantParentIdFieldName, AObject.Id);
-                 AddStringParam(InsertParams, InstantParentAttributeFieldName, AttributeMetadata.Name);
                  AddStringParam(InsertParams, InstantChildClassFieldName,
                    PartsAttribute.Items[ii].ClassName);
--- 13765,13768 ----
***************
*** 13820,13828 ****
                  [AttributeMetadata.ExternalStorageName,
                  InstantParentClassFieldName,
!                 InstantParentIdFieldName,
!                 InstantParentAttributeFieldName]);
                AddStringParam(DeleteParams, InstantParentClassFieldName, AObject.ClassName);
                AddIdParam(DeleteParams, InstantParentIdFieldName, AObject.Id);
-               AddStringParam(DeleteParams, InstantParentAttributeFieldName, AttributeMetadata.Name);
                Broker.Execute(DeleteStatement, DeleteParams);
              finally
--- 13806,13812 ----
                  [AttributeMetadata.ExternalStorageName,
                  InstantParentClassFieldName,
!                 InstantParentIdFieldName]);
                AddStringParam(DeleteParams, InstantParentClassFieldName, AObject.ClassName);
                AddIdParam(DeleteParams, InstantParentIdFieldName, AObject.Id);
                Broker.Execute(DeleteStatement, DeleteParams);
              finally
***************
*** 13843,13847 ****
                  AddStringParam(InsertParams, InstantParentClassFieldName, AObject.ClassName);
                  AddIdParam(InsertParams, InstantParentIdFieldName, AObject.Id);
-                 AddStringParam(InsertParams, InstantParentAttributeFieldName, AttributeMetadata.Name);
                  AddStringParam(InsertParams, InstantChildClassFieldName,
                    ReferencesAttribute.Items[ii].ClassName);
--- 13827,13830 ----
***************
*** 13980,13984 ****
            AddIdParam(Params, InstantParentIdFieldName, AObjectId);
            AddStringParam(Params, InstantParentClassFieldName, AObject.ClassName);
-           AddStringParam(Params, InstantParentAttributeFieldName, Attribute.Name);
            AddStringParam(Params, InstantChildClassFieldName, AttributeMetadata.ObjectClassName);
            DataSet := Broker.AcquireDataSet(Statement, Params);
--- 13963,13966 ----
***************
*** 14048,14052 ****
            AddIdParam(Params, InstantParentIdFieldName, AObjectId);
            AddStringParam(Params, InstantParentClassFieldName, AObject.ClassName);
-           AddStringParam(Params, InstantParentAttributeFieldName, Attribute.Name);
            AddStringParam(Params, InstantChildClassFieldName, AttributeMetadata.ObjectClassName);
            DataSet := Broker.AcquireDataSet(Statement, Params);
--- 14030,14033 ----