Menu
▾
▴
instantobjects-cvscommit
|
From: <jcm...@us...> - 2006-02-15 15:19:53
|
Revision: 607 Author: jcmoraisjr Date: 2006-02-15 07:18:23 -0800 (Wed, 15 Feb 2006) ViewCVS: http://svn.sourceforge.net/instantobjects?rev=607&view=rev Log Message: ----------- Release Tools - resource file and scripts used to replicate it. Added Paths: ----------- trunk/ReleaseTools/ trunk/ReleaseTools/InstantReplicateResource.bat trunk/ReleaseTools/InstantReplicateResource.sh trunk/ReleaseTools/InstantSyncBatchFile.sh trunk/ReleaseTools/InstantVersion.res Removed Paths: ------------- trunk/Source/InstantReplicateResource.sh Added: trunk/ReleaseTools/InstantReplicateResource.bat =================================================================== --- trunk/ReleaseTools/InstantReplicateResource.bat (rev 0) +++ trunk/ReleaseTools/InstantReplicateResource.bat 2006-02-15 15:18:23 UTC (rev 607) @@ -0,0 +1,121 @@ +@echo off +echo. +echo This script will replicate InstantVersion.res, +echo creating or overwriting all projects' resource files. +echo. +echo Press Enter to continue, Ctrl+C to cancel. +pause > nul +copy "InstantVersion.res" "..\Source\Brokers\DBISAM\D6\DclDBISAM.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBISAM\D6\IODBISAM.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBISAM\D7\DclDBISAM.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBISAM\D7\IODBISAM.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\FlashFiler\D5\DclIOff_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\FlashFiler\D5\ioff_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D5\DclIOUIB_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D5\IOUIB_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D6\IOUIB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D6\DclIOUIB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D2005\IOUIB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D2005\DclIOUIB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D7\IOUIB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D7\DclIOUIB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D2006\IOUIB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\UIB\D2006\DclIOUIB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D5\DclIOXML_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D5\Ioxml_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D6\IOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D6\DclIOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D2005\IOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D2005\DclIOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D7\IOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D7\DclIOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D2006\IOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\D2006\DclIOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\k3\IOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\XML\k3\DclIOXML.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D5\DclIOIBX_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D5\Ioibx_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D6\IOIBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D6\DclIOIBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D2005\IOIBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D2005\DclIOIBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D7\IOIBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D7\DclIOIBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D2006\IOIBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\IBX\D2006\DclIOIBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D5\DclIOADO_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D5\IOADO_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D6\IOADO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D6\DclIOADO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D2005\IOADO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D2005\DclIOADO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D7\IOADO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D7\DclIOADO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D2006\IOADO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADO\D2006\DclIOADO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D5\DclIOZeosDBO_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D5\IOZeosDBO_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D6\IOZeosDBO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D6\DclIOZeosDBO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D2005\IOZeosDBO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D2005\DclIOZeosDBO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D7\IOZeosDBO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D7\DclIOZeosDBO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D2006\IOZeosDBO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D2006\DclIOZeosDBO.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADS\D5\DclIOADS_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\ADS\D5\ioads_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D2005\DclIONexusDB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D2005\IONexusDB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D2006\DclIONexusDB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D2006\IONexusDB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D5\DclIONexusDB_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D5\IONexusDB_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D6\DclIONexusDB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D6\IONexusDB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D7\DclIONexusDB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\NexusDb\D7\IONexusDB.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D5\DclIOBDE_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D5\Iobde_D5.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D6\IOBDE.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D6\DclIOBDE.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D2005\IOBDE.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D2005\DclIOBDE.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D7\IOBDE.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D7\DclIOBDE.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D2006\IOBDE.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\BDE\D2006\DclIOBDE.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\D6\IODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\D6\DclIODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\D2005\IODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\D2005\DclIODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\D7\IODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\D7\DclIODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\D2006\IODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\D2006\DclIODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\K3\IODBX.res" > nul +copy "InstantVersion.res" "..\Source\Brokers\DBX\K3\DclIODBX.res" > nul +copy "InstantVersion.res" "..\Source\Core\D2005\IOCore.res" > nul +copy "InstantVersion.res" "..\Source\Core\D2006\IOCore.res" > nul +copy "InstantVersion.res" "..\Source\Core\K3\IOCore.res" > nul +copy "InstantVersion.res" "..\Source\Core\D5\IOCore_D5.res" > nul +copy "InstantVersion.res" "..\Source\Core\D6\IOCore.res" > nul +copy "InstantVersion.res" "..\Source\Core\D7\IOCore.res" > nul +copy "InstantVersion.res" "..\Source\Design\D2005\DclIOCore.res" > nul +copy "InstantVersion.res" "..\Source\Design\D2006\DclIOCore.res" > nul +copy "InstantVersion.res" "..\Source\Design\K3\DclIOCore.res" > nul +copy "InstantVersion.res" "..\Source\Design\D5\DclIOCore_D5.res" > nul +copy "InstantVersion.res" "..\Source\Design\D6\DclIOCore.res" > nul +copy "InstantVersion.res" "..\Source\Design\D7\DclIOCore.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D5\IOMSSqlCatalog_D5.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D6\IOMSSqlCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D2005\IOMSSqlCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D7\IOMSSqlCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D2006\IOMSSqlCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\MSSql\K3\IOMSSqlCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D5\IOIBFbCatalog_D5.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D6\IOIBFbCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D2005\IOIBFbCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D7\IOIBFbCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D2006\IOIBFbCatalog.res" > nul +copy "InstantVersion.res" "..\Source\Catalogs\IBFb\K3\IOIBFbCatalog.res" > nul Added: trunk/ReleaseTools/InstantReplicateResource.sh =================================================================== --- trunk/ReleaseTools/InstantReplicateResource.sh (rev 0) +++ trunk/ReleaseTools/InstantReplicateResource.sh 2006-02-15 15:18:23 UTC (rev 607) @@ -0,0 +1,18 @@ +#!/bin/sh +[ $# -gt 0 ] && + InstantVersionResFile=$1 || + InstantVersionResFile="InstantVersion.res" +[ -f ${InstantVersionResFile} ] || + { echo "Resource file ${InstantVersionResFile} was not found."; exit 1; } +echo +echo "This script will replicate ${InstantVersionResFile}," +echo "creating or overwriting all projects' resource files." +echo +echo "Press Enter to continue, Ctrl+C to cancel." +read + +find . -iname "*.dpk" -type f | while read DpkFile +do + cp -f "${InstantVersionResFile}" "${DpkFile/.dpk/.res}" +done +echo "Done." Property changes on: trunk/ReleaseTools/InstantReplicateResource.sh ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + LF Added: trunk/ReleaseTools/InstantSyncBatchFile.sh =================================================================== --- trunk/ReleaseTools/InstantSyncBatchFile.sh (rev 0) +++ trunk/ReleaseTools/InstantSyncBatchFile.sh 2006-02-15 15:18:23 UTC (rev 607) @@ -0,0 +1,23 @@ +#!/bin/sh +InstantVersionResFile="InstantVersion.res" +InstantScriptFile="InstantReplicateResource.bat" + +echo +echo "This script will (re)create ${InstantScriptFile}." +echo "Press Enter to continue, Ctrl+C to cancel." +read + +echo -n -e \ +"@echo off\r\n"\ +"echo.\r\n"\ +"echo This script will replicate ${InstantVersionResFile},\r\n"\ +"echo creating or overwriting all projects' resource files.\r\n"\ +"echo.\r\n"\ +"echo Press Enter to continue, Ctrl+C to cancel.\r\n"\ +"pause > nul\r\n" > ${InstantScriptFile} + +find .. -name "*.dpk" -type f | sed 's/\//\\\\/g' | while read DpkFile +do + echo -e copy \"${InstantVersionResFile}\" \"${DpkFile/.dpk/.res}\"" > nul\r" +done >> ${InstantScriptFile} +echo "Done." Property changes on: trunk/ReleaseTools/InstantSyncBatchFile.sh ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + LF Added: trunk/ReleaseTools/InstantVersion.res =================================================================== (Binary files differ) Property changes on: trunk/ReleaseTools/InstantVersion.res ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/Source/InstantReplicateResource.sh =================================================================== (Binary files differ) |
|
From: <sr...@us...> - 2006-02-15 22:58:21
|
Revision: 608 Author: srmitch Date: 2006-02-15 14:58:06 -0800 (Wed, 15 Feb 2006) ViewCVS: http://svn.sourceforge.net/instantobjects?rev=608&view=rev Log Message: ----------- Changes: 1. Updated InstantNexusDBCatalog to allow for the skipping of unsupported data types with warning during database evolve. 2. A couple of minor editorial changes to Readme1st.txt. Modified Paths: -------------- trunk/Readme1st.txt trunk/Source/Brokers/NexusDb/InstantNexusDBCatalog.pas Modified: trunk/Readme1st.txt =================================================================== --- trunk/Readme1st.txt 2006-02-15 15:18:23 UTC (rev 607) +++ trunk/Readme1st.txt 2006-02-15 22:58:06 UTC (rev 608) @@ -48,13 +48,13 @@ A database for storing the business objects can be automatically generated from the defined model via the Database Builder. InstantObjects supports databases available -via BDE, ADO, InterBase Express, dbExpress, DBISAM, FlashFiler, NexusDb, UIB and +via BDE, ADO, InterBase Express, dbExpress, DBISAM, FlashFiler, NexusDB, UIB and Advantage Database Server, plus a native, file-based XML storage. OBJECT PERSISTENCE One of the major issues when developing object-oriented applications is object -persistence. InstantObjects adresses this issue by providing a powerful persistence +persistence. InstantObjects addresses this issue by providing a powerful persistence mechanism that allows using the most common databases as storage. Storing and retrieving objects is a simple matter of invoking methods of the common ancestor class, TInstantObject. Mapping of objects to and from tables is done automatically @@ -107,7 +107,7 @@ ------------------------- The InstantObjects Guide IOHelp.hlp in the <installdir>\Help folder contains more -informations about InstantObjects. +information about InstantObjects. The section "User Guide" explains how to build applications with InstantObjects. The section "Reference Guide" contains a detailed explanation of every class Modified: trunk/Source/Brokers/NexusDb/InstantNexusDBCatalog.pas =================================================================== --- trunk/Source/Brokers/NexusDb/InstantNexusDBCatalog.pas 2006-02-15 15:18:23 UTC (rev 607) +++ trunk/Source/Brokers/NexusDb/InstantNexusDBCatalog.pas 2006-02-15 22:58:06 UTC (rev 608) @@ -49,8 +49,8 @@ procedure AddFieldMetadatas(TableMetadata: TInstantTableMetadata); procedure AddIndexMetadatas(TableMetadata: TInstantTableMetadata); procedure AddTableMetadatas(TableMetadatas: TInstantTableMetadatas); - function ColumnTypeToDataType(const ColumnType: string; const NexusType, - FieldScale: Integer): TInstantDataType; + function ColumnTypeToDataType(const ColumnType: string; out DataType: + TInstantDataType): Boolean; function GetSelectFieldsSQL(const ATableName: string): string; function GetSelectIndexesSQL(const ATableName: string): string; function GetSelectIndexFieldsSQL(const AIndexName: string): string; @@ -63,7 +63,7 @@ implementation uses - SysUtils, Classes, DB; + SysUtils, Classes, DB, InstantConsts; { TInstantNexusDBCatalog } @@ -86,7 +86,7 @@ try while not IndexFields.Eof do begin - IndexFieldList.Add(Trim(IndexFields.FieldByName('SEGMENT_FIELD').AsString)); + IndexFieldList.Add(IndexFields.FieldByName('SEGMENT_FIELD').AsString); IndexFields.Next; end; finally @@ -110,7 +110,7 @@ while not Indexes.Eof do begin IndexMetadata := TableMetadata.IndexMetadatas.Add; - IndexMetadata.Name := Trim(Indexes.FieldByName('INDEX_NAME').AsString); + IndexMetadata.Name := Indexes.FieldByName('INDEX_NAME').AsString; // Ignore automatically generated 'Sequential Access Index' if SameText('Sequential Access Index', IndexMetadata.Name) then @@ -148,6 +148,8 @@ var Fields: TDataSet; FieldMetadata: TInstantFieldMetadata; + FieldDataType: String; + FieldMetaDataType: TInstantDataType; begin Fields := Broker.AcquireDataSet(GetSelectFieldsSQL(TableMetadata.Name)); try @@ -156,26 +158,29 @@ while not Fields.Eof do begin FieldMetadata := TableMetadata.FieldMetadatas.Add; - FieldMetadata.Name := Trim(Fields.FieldByName('FIELD_NAME').AsString); - FieldMetadata.DataType := ColumnTypeToDataType( + FieldMetadata.Name := Fields.FieldByName('FIELD_NAME').AsString; {$IFDEF NX1} - Trim(Fields.FieldByName('FIELD_TYPE').AsString), + FieldDataType := Fields.FieldByName('FIELD_TYPE').AsString; {$ELSE} - Trim(Fields.FieldByName('FIELD_TYPE_NEXUS').AsString), + FieldDataType := Fields.FieldByName('FIELD_TYPE_NEXUS').AsString; {$ENDIF} - 0,// No need for 'FIELD_SUB_TYPE' here - Fields.FieldByName('FIELD_DECIMALS').AsInteger); - FieldMetadata.Options := []; - if Fields.FieldByName('FIELD_REQUIRED').AsBoolean then - FieldMetadata.Options := FieldMetadata.Options + [foRequired]; - if TableMetadata.IndexMetadatas.IsFieldIndexed(FieldMetadata) then - FieldMetadata.Options := FieldMetadata.Options + [foIndexed]; - { TODO : support ExternalTableName? } - if FieldMetadata.DataType = dtString then - FieldMetadata.Size := Fields.FieldByName('FIELD_UNITS').AsInteger + if ColumnTypeToDataType(FieldDataType, FieldMetaDataType) then + begin + FieldMetadata.DataType := FieldMetaDataType; + FieldMetadata.Options := []; + if Fields.FieldByName('FIELD_REQUIRED').AsBoolean then + FieldMetadata.Options := FieldMetadata.Options + [foRequired]; + if TableMetadata.IndexMetadatas.IsFieldIndexed(FieldMetadata) then + FieldMetadata.Options := FieldMetadata.Options + [foIndexed]; + if FieldMetadata.DataType = dtString then + FieldMetadata.Size := Fields.FieldByName('FIELD_UNITS').AsInteger + else + FieldMetadata.Size := Fields.FieldByName('FIELD_LENGTH').AsInteger; + Fields.Next; + end else - FieldMetadata.Size := Fields.FieldByName('FIELD_LENGTH').AsInteger; - Fields.Next; + DoWarning(Format(SUnsupportedColumnSkipped, + [TableMetadata.Name, FieldMetadata.Name, FieldDataType])); end; finally Fields.Close; @@ -198,7 +203,7 @@ while not Tables.Eof do begin TableMetadata := TableMetadatas.Add; - TableMetadata.Name := Trim(Tables.FieldByName('TABLE_NAME').AsString); + TableMetadata.Name := Tables.FieldByName('TABLE_NAME').AsString; // Call AddIndexMetadatas first, so that AddFieldMetadatas can see what // indexes are defined to correctly set the foIndexed option. AddIndexMetadatas(TableMetadata); @@ -213,63 +218,63 @@ end; end; -function TInstantNexusDBCatalog.ColumnTypeToDataType(const ColumnType: string; const - NexusType, FieldScale: Integer): TInstantDataType; +function TInstantNexusDBCatalog.ColumnTypeToDataType(const ColumnType: string; + out DataType: TInstantDataType): Boolean; begin - { TODO : How to use FieldScale? } + Result := True; {$IFDEF NX1} if SameText(ColumnType, 'ShortString') or SameText(ColumnType, 'NullString') then - Result := dtString + DataType := dtString else if SameText(ColumnType, 'Int8') or SameText(ColumnType, 'Int16') or SameText(ColumnType, 'Int32') then //or SameText(ColumnType, 'nxtAutoInc') then // is unsigned 32 bit - Result := dtInteger + DataType := dtInteger else if SameText(ColumnType, 'Single') or SameText(ColumnType, 'Double') or SameText(ColumnType, 'Extended') then - Result := dtFloat + DataType := dtFloat else if SameText(ColumnType, 'Currency') then - Result := dtCurrency + DataType := dtCurrency else if SameText(ColumnType, 'Boolean') then - Result := dtBoolean + DataType := dtBoolean else if SameText(ColumnType, 'DateTime') or SameText(ColumnType, 'Date') or SameText(ColumnType, 'Time')then - Result := dtDateTime + DataType := dtDateTime else if SameText(ColumnType, 'BLOB') then - Result := dtBlob + DataType := dtBlob else if SameText(ColumnType, 'BLOB Memo') then - Result := dtMemo + DataType := dtMemo {$ELSE} if SameText(ColumnType, 'nxtNullString') or SameText(ColumnType, 'nxtShortString') then - Result := dtString + DataType := dtString else if SameText(ColumnType, 'nxtInt8') or SameText(ColumnType, 'nxtInt16') or SameText(ColumnType, 'nxtInt32') then //or SameText(ColumnType, 'nxtAutoInc') then // is unsigned 32 bit - Result := dtInteger + DataType := dtInteger else if SameText(ColumnType, 'nxtSingle') or SameText(ColumnType, 'nxtDouble') or SameText(ColumnType, 'nxtExtended') then - Result := dtFloat + DataType := dtFloat else if SameText(ColumnType, 'nxtCurrency') then - Result := dtCurrency + DataType := dtCurrency else if SameText(ColumnType, 'nxtBoolean') then - Result := dtBoolean + DataType := dtBoolean else if SameText(ColumnType, 'nxtDateTime') or SameText(ColumnType, 'nxtDate') or SameText(ColumnType, 'nxtTime')then - Result := dtDateTime + DataType := dtDateTime else if SameText(ColumnType, 'nxtBlob') then - Result := dtBlob + DataType := dtBlob else if SameText(ColumnType, 'nxtBlobMemo') then - Result := dtMemo + DataType := dtMemo {$ENDIF} else - raise Exception.CreateFmt('ColumnType %s not supported.', [ColumnType]); + Result := False; end; function TInstantNexusDBCatalog.GetSelectFieldsSQL( |
|
From: <na...@us...> - 2006-06-08 02:58:11
|
Revision: 683 Author: nandod Date: 2006-06-07 08:34:26 -0700 (Wed, 07 Jun 2006) ViewCVS: http://svn.sourceforge.net/instantobjects?rev=683&view=rev Log Message: ----------- * docs and res files updated for 2.0 RC 1. Modified Paths: -------------- trunk/Docs/Changes.txt trunk/Docs/Install.txt trunk/Readme1st.txt trunk/ReleaseTools/InstantVersion.res trunk/Source/Brokers/ADO/D2005/DclIOADO.res trunk/Source/Brokers/ADO/D2005/IOADO.res trunk/Source/Brokers/ADO/D2006/DclIOADO.res trunk/Source/Brokers/ADO/D2006/IOADO.res trunk/Source/Brokers/ADO/D5/DclIOADO_D5.res trunk/Source/Brokers/ADO/D5/IOADO_D5.res trunk/Source/Brokers/ADO/D6/DclIOADO.res trunk/Source/Brokers/ADO/D6/IOADO.res trunk/Source/Brokers/ADO/D7/DclIOADO.res trunk/Source/Brokers/ADO/D7/IOADO.res trunk/Source/Brokers/ADS/D5/DclIOADS_D5.res trunk/Source/Brokers/ADS/D5/ioads_D5.res trunk/Source/Brokers/BDE/D2005/DclIOBDE.res trunk/Source/Brokers/BDE/D2005/IOBDE.res trunk/Source/Brokers/BDE/D2006/DclIOBDE.res trunk/Source/Brokers/BDE/D2006/IOBDE.res trunk/Source/Brokers/BDE/D5/DclIOBDE_D5.res trunk/Source/Brokers/BDE/D5/Iobde_D5.res trunk/Source/Brokers/BDE/D6/DclIOBDE.res trunk/Source/Brokers/BDE/D6/IOBDE.res trunk/Source/Brokers/BDE/D7/DclIOBDE.res trunk/Source/Brokers/BDE/D7/IOBDE.res trunk/Source/Brokers/DBISAM/D6/DclDBISAM.res trunk/Source/Brokers/DBISAM/D6/IODBISAM.res trunk/Source/Brokers/DBISAM/D7/DclDBISAM.res trunk/Source/Brokers/DBISAM/D7/IODBISAM.res trunk/Source/Brokers/DBX/D2005/DclIODBX.res trunk/Source/Brokers/DBX/D2005/IODBX.res trunk/Source/Brokers/DBX/D2006/DclIODBX.res trunk/Source/Brokers/DBX/D2006/IODBX.res trunk/Source/Brokers/DBX/D6/DclIODBX.res trunk/Source/Brokers/DBX/D6/IODBX.res trunk/Source/Brokers/DBX/D7/DclIODBX.res trunk/Source/Brokers/DBX/D7/IODBX.res trunk/Source/Brokers/DBX/K3/DclIODBX.res trunk/Source/Brokers/DBX/K3/IODBX.res trunk/Source/Brokers/FlashFiler/D5/DclIOff_D5.res trunk/Source/Brokers/FlashFiler/D5/ioff_D5.res trunk/Source/Brokers/IBX/D2005/DclIOIBX.res trunk/Source/Brokers/IBX/D2005/IOIBX.res trunk/Source/Brokers/IBX/D2006/DclIOIBX.res trunk/Source/Brokers/IBX/D2006/IOIBX.res trunk/Source/Brokers/IBX/D5/DclIOIBX_D5.res trunk/Source/Brokers/IBX/D5/Ioibx_D5.res trunk/Source/Brokers/IBX/D6/DclIOIBX.res trunk/Source/Brokers/IBX/D6/IOIBX.res trunk/Source/Brokers/IBX/D7/DclIOIBX.res trunk/Source/Brokers/IBX/D7/IOIBX.res trunk/Source/Brokers/NexusDb/D2005/DclIONexusDB.res trunk/Source/Brokers/NexusDb/D2005/IONexusDB.res trunk/Source/Brokers/NexusDb/D2006/DclIONexusDB.res trunk/Source/Brokers/NexusDb/D2006/IONexusDB.res trunk/Source/Brokers/NexusDb/D5/DclIONexusDB_D5.res trunk/Source/Brokers/NexusDb/D5/IONexusDB_D5.res trunk/Source/Brokers/NexusDb/D6/DclIONexusDB.res trunk/Source/Brokers/NexusDb/D6/IONexusDB.res trunk/Source/Brokers/NexusDb/D7/DclIONexusDB.res trunk/Source/Brokers/NexusDb/D7/IONexusDB.res trunk/Source/Brokers/UIB/D2005/DclIOUIB.res trunk/Source/Brokers/UIB/D2005/IOUIB.res trunk/Source/Brokers/UIB/D2006/DclIOUIB.res trunk/Source/Brokers/UIB/D2006/IOUIB.res trunk/Source/Brokers/UIB/D5/DclIOUIB_D5.res trunk/Source/Brokers/UIB/D5/IOUIB_D5.res trunk/Source/Brokers/UIB/D6/DclIOUIB.res trunk/Source/Brokers/UIB/D6/IOUIB.res trunk/Source/Brokers/UIB/D7/DclIOUIB.res trunk/Source/Brokers/UIB/D7/IOUIB.res trunk/Source/Brokers/XML/D2005/DclIOXML.res trunk/Source/Brokers/XML/D2005/IOXML.res trunk/Source/Brokers/XML/D2006/DclIOXML.res trunk/Source/Brokers/XML/D2006/IOXML.res trunk/Source/Brokers/XML/D5/DclIOXML_D5.res trunk/Source/Brokers/XML/D5/Ioxml_D5.res trunk/Source/Brokers/XML/D6/DclIOXML.res trunk/Source/Brokers/XML/D6/IOXML.res trunk/Source/Brokers/XML/D7/DclIOXML.res trunk/Source/Brokers/XML/D7/IOXML.res trunk/Source/Brokers/XML/k3/DclIOXML.res trunk/Source/Brokers/XML/k3/IOXML.res trunk/Source/Brokers/ZeosDBO/D2005/DclIOZeosDBO.res trunk/Source/Brokers/ZeosDBO/D2005/IOZeosDBO.res trunk/Source/Brokers/ZeosDBO/D2006/DclIOZeosDBO.res trunk/Source/Brokers/ZeosDBO/D2006/IOZeosDBO.res trunk/Source/Brokers/ZeosDBO/D5/DclIOZeosDBO_D5.res trunk/Source/Brokers/ZeosDBO/D5/IOZeosDBO_D5.res trunk/Source/Brokers/ZeosDBO/D6/DclIOZeosDBO.res trunk/Source/Brokers/ZeosDBO/D6/IOZeosDBO.res trunk/Source/Brokers/ZeosDBO/D7/DclIOZeosDBO.res trunk/Source/Brokers/ZeosDBO/D7/IOZeosDBO.res trunk/Source/Catalogs/IBFb/D2005/IOIBFbCatalog.res trunk/Source/Catalogs/IBFb/D2006/IOIBFbCatalog.res trunk/Source/Catalogs/IBFb/D5/IOIBFbCatalog_D5.res trunk/Source/Catalogs/IBFb/D6/IOIBFbCatalog.res trunk/Source/Catalogs/IBFb/D7/IOIBFbCatalog.res trunk/Source/Catalogs/IBFb/K3/IOIBFbCatalog.res trunk/Source/Catalogs/MSSql/D2005/IOMSSqlCatalog.res trunk/Source/Catalogs/MSSql/D2006/IOMSSqlCatalog.res trunk/Source/Catalogs/MSSql/D5/IOMSSqlCatalog_D5.res trunk/Source/Catalogs/MSSql/D6/IOMSSqlCatalog.res trunk/Source/Catalogs/MSSql/D7/IOMSSqlCatalog.res trunk/Source/Catalogs/MSSql/K3/IOMSSqlCatalog.res trunk/Source/Core/D2005/IOCore.res trunk/Source/Core/D2006/IOCore.res trunk/Source/Core/D5/IOCore_D5.res trunk/Source/Core/D6/IOCore.res trunk/Source/Core/D7/IOCore.res trunk/Source/Core/K3/IOCore.res trunk/Source/Design/D2005/DclIOCore.res trunk/Source/Design/D2006/DclIOCore.res trunk/Source/Design/D5/DclIOCore_D5.res trunk/Source/Design/D6/DclIOCore.res trunk/Source/Design/D7/DclIOCore.res trunk/Source/Design/K3/DclIOCore.res Modified: trunk/Docs/Changes.txt =================================================================== --- trunk/Docs/Changes.txt 2006-05-31 06:45:28 UTC (rev 682) +++ trunk/Docs/Changes.txt 2006-06-07 15:34:26 UTC (rev 683) @@ -1,7 +1,7 @@ VERSION HISTORY --------------- -Version 2.0 RC 1 (1.9.1.4) (2006-05-31) +Version 2.0 RC 1 (1.9.2.1) (2006-05-07) - Help file has been improved. Modified: trunk/Docs/Install.txt =================================================================== --- trunk/Docs/Install.txt 2006-05-31 06:45:28 UTC (rev 682) +++ trunk/Docs/Install.txt 2006-06-07 15:34:26 UTC (rev 683) @@ -1,10 +1,8 @@ ------------------------------------------------------------------ - InstantObjects 2.0 Beta 1 (1.9.1.1) for Delphi, Kylix, FPC + InstantObjects 2.0 for Delphi, Kylix, FPC - Mozilla Public License 1.1 Edition - November 2005 release - + Mozilla Public License 1.1 Based on Seleqt InstantObjects. Portions created by Seleqt are Copyright (c) 2001-2003 Seleqt. Other portions and changes are Copyright (c) the authors. Modified: trunk/Readme1st.txt =================================================================== --- trunk/Readme1st.txt 2006-05-31 06:45:28 UTC (rev 682) +++ trunk/Readme1st.txt 2006-06-07 15:34:26 UTC (rev 683) @@ -1,10 +1,8 @@ ------------------------------------------------------------------ - InstantObjects 2.0 Beta 2 (1.9.2.1) for Delphi, Kylix, FPC + InstantObjects 2.0 for Delphi, Kylix, FPC Mozilla Public License 1.1 Edition - January 2006 release - Based on Seleqt InstantObjects. Portions created by Seleqt are Copyright (c) 2001-2003 Seleqt. Other portions and changes are Copyright (c) the authors. Modified: trunk/ReleaseTools/InstantVersion.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D2005/DclIOADO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D2005/IOADO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D2006/DclIOADO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D2006/IOADO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D5/DclIOADO_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D5/IOADO_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D6/DclIOADO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D6/IOADO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D7/DclIOADO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADO/D7/IOADO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADS/D5/DclIOADS_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ADS/D5/ioads_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D2005/DclIOBDE.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D2005/IOBDE.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D2006/DclIOBDE.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D2006/IOBDE.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D5/DclIOBDE_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D5/Iobde_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D6/DclIOBDE.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D6/IOBDE.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D7/DclIOBDE.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/BDE/D7/IOBDE.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBISAM/D6/DclDBISAM.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBISAM/D6/IODBISAM.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBISAM/D7/DclDBISAM.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBISAM/D7/IODBISAM.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D2005/DclIODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D2005/IODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D2006/DclIODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D2006/IODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D6/DclIODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D6/IODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D7/DclIODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/D7/IODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/K3/DclIODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/DBX/K3/IODBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/FlashFiler/D5/DclIOff_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/FlashFiler/D5/ioff_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D2005/DclIOIBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D2005/IOIBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D2006/DclIOIBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D2006/IOIBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D5/DclIOIBX_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D5/Ioibx_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D6/DclIOIBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D6/IOIBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D7/DclIOIBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/IBX/D7/IOIBX.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D2005/DclIONexusDB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D2005/IONexusDB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D2006/DclIONexusDB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D2006/IONexusDB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D5/DclIONexusDB_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D5/IONexusDB_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D6/DclIONexusDB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D6/IONexusDB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D7/DclIONexusDB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/NexusDb/D7/IONexusDB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D2005/DclIOUIB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D2005/IOUIB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D2006/DclIOUIB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D2006/IOUIB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D5/DclIOUIB_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D5/IOUIB_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D6/DclIOUIB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D6/IOUIB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D7/DclIOUIB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/UIB/D7/IOUIB.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D2005/DclIOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D2005/IOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D2006/DclIOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D2006/IOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D5/DclIOXML_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D5/Ioxml_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D6/DclIOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D6/IOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D7/DclIOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/D7/IOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/k3/DclIOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/XML/k3/IOXML.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D2005/DclIOZeosDBO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D2005/IOZeosDBO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D2006/DclIOZeosDBO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D2006/IOZeosDBO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D5/DclIOZeosDBO_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D5/IOZeosDBO_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D6/DclIOZeosDBO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D6/IOZeosDBO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D7/DclIOZeosDBO.res =================================================================== (Binary files differ) Modified: trunk/Source/Brokers/ZeosDBO/D7/IOZeosDBO.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/IBFb/D2005/IOIBFbCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/IBFb/D2006/IOIBFbCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/IBFb/D5/IOIBFbCatalog_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/IBFb/D6/IOIBFbCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/IBFb/D7/IOIBFbCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/IBFb/K3/IOIBFbCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/MSSql/D2005/IOMSSqlCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/MSSql/D2006/IOMSSqlCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/MSSql/D5/IOMSSqlCatalog_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/MSSql/D6/IOMSSqlCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/MSSql/D7/IOMSSqlCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Catalogs/MSSql/K3/IOMSSqlCatalog.res =================================================================== (Binary files differ) Modified: trunk/Source/Core/D2005/IOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Core/D2006/IOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Core/D5/IOCore_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Core/D6/IOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Core/D7/IOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Core/K3/IOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Design/D2005/DclIOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Design/D2006/DclIOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Design/D5/DclIOCore_D5.res =================================================================== (Binary files differ) Modified: trunk/Source/Design/D6/DclIOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Design/D7/DclIOCore.res =================================================================== (Binary files differ) Modified: trunk/Source/Design/K3/DclIOCore.res =================================================================== (Binary files differ) |
|
From: <na...@us...> - 2006-09-22 09:20:52
|
Revision: 707
http://svn.sourceforge.net/instantobjects/revision/?rev=707&view=rev
Author: nandod
Date: 2006-09-22 02:17:32 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
* ubmock and fpcunit integrated into the source tree.
* Tests moved outside of Source.
* svn:ignore set on several folders.
Added Paths:
-----------
trunk/Source/Catalogs/MSSql/D2006/__history/
trunk/Tests/
trunk/Tests/InstantMock.pas
trunk/Tests/MinimalModel.pas
trunk/Tests/Picture.bmp
trunk/Tests/TestBlobText.txt
trunk/Tests/TestBlobTextOut.txt
trunk/Tests/TestIO.bdsproj
trunk/Tests/TestIO.cfg
trunk/Tests/TestIO.dof
trunk/Tests/TestIO.dpr
trunk/Tests/TestIO.lpi
trunk/Tests/TestIO.mdr
trunk/Tests/TestIO.mdrt
trunk/Tests/TestIO.mdx
trunk/Tests/TestIO.mdxt
trunk/Tests/TestIO.res
trunk/Tests/TestInstantAttribute.pas
trunk/Tests/TestInstantAttributeMap.pas
trunk/Tests/TestInstantAttributeMetadata.pas
trunk/Tests/TestInstantBlob.pas
trunk/Tests/TestInstantBoolean.pas
trunk/Tests/TestInstantCache.pas
trunk/Tests/TestInstantCircularReferences.pas
trunk/Tests/TestInstantClassMetadata.pas
trunk/Tests/TestInstantClasses.pas
trunk/Tests/TestInstantComplex.pas
trunk/Tests/TestInstantCurrency.pas
trunk/Tests/TestInstantDateTime.pas
trunk/Tests/TestInstantFieldMetadata.pas
trunk/Tests/TestInstantFloat.pas
trunk/Tests/TestInstantIndexMetadata.pas
trunk/Tests/TestInstantInteger.pas
trunk/Tests/TestInstantMetadata.pas
trunk/Tests/TestInstantNumeric.pas
trunk/Tests/TestInstantObject.pas
trunk/Tests/TestInstantObjectReference.pas
trunk/Tests/TestInstantObjectState.pas
trunk/Tests/TestInstantObjectStore.pas
trunk/Tests/TestInstantPart.pas
trunk/Tests/TestInstantParts.pas
trunk/Tests/TestInstantReference.pas
trunk/Tests/TestInstantReferences.pas
trunk/Tests/TestInstantRtti.pas
trunk/Tests/TestInstantScheme.pas
trunk/Tests/TestInstantString.pas
trunk/Tests/TestInstantTableMetadata.pas
trunk/Tests/TestMinimalModel.pas
trunk/Tests/TestMockBroker.pas
trunk/Tests/TestMockConnector.pas
trunk/Tests/TestModel.pas
trunk/Tests/ubmock/
trunk/Tests/ubmock/README.txt
trunk/Tests/ubmock/src/
trunk/Tests/ubmock/src/COPYING.FPC
trunk/Tests/ubmock/src/COPYING.TXT
trunk/Tests/ubmock/src/GuiTestRunner.dfm
trunk/Tests/ubmock/src/GuiTestRunner.pas
trunk/Tests/ubmock/src/License_Notes.txt
trunk/Tests/ubmock/src/NotRefCountIObject.pas
trunk/Tests/ubmock/src/UbMockObject.pas
trunk/Tests/ubmock/src/fpcunit.pas
trunk/Tests/ubmock/src/fpcunitgui.res
trunk/Tests/ubmock/src/testdecorator.pas
trunk/Tests/ubmock/src/testregistry.pas
trunk/Tests/ubmock/src/testreport.pas
trunk/Tests/ubmock/src/testutils.pas
trunk/Tests/ubmock/tests/
trunk/Tests/ubmock/tests/ConsoleTest.dpr
trunk/Tests/ubmock/tests/GuiTests.dof
trunk/Tests/ubmock/tests/GuiTests.dpr
trunk/Tests/ubmock/tests/GuiTests.dsk
trunk/Tests/ubmock/tests/GuiTests.res
trunk/Tests/ubmock/tests/TestIMock.pas
trunk/Tests/ubmock/tests/TestMock.pas
trunk/Tests/ubmock/tests/TestMocks.dof
trunk/Tests/ubmock/tests/TestMocks.dpr
trunk/Tests/ubmock/tests/TestMocks.dsk
trunk/Tests/ubmock/tests/TestMocks.res
trunk/Tests/ubmock/tests/TestNotRefContInterface.pas
trunk/Tests/ubmock/tests/asserttest.pas
trunk/Tests/ubmock/tests/fpcunittests.pas
trunk/Tests/ubmock/tests/suitetest.pas
Removed Paths:
-------------
trunk/Source/Tests/
Property Changed:
----------------
trunk/Source/Brokers/ADO/D2006/
trunk/Source/Brokers/BDE/D2006/
trunk/Source/Brokers/DBX/D2006/
trunk/Source/Brokers/IBX/
trunk/Source/Brokers/IBX/D2006/
trunk/Source/Brokers/XML/
trunk/Source/Brokers/XML/D2006/
trunk/Source/Catalogs/IBFb/
trunk/Source/Catalogs/IBFb/D2006/
trunk/Source/Catalogs/MSSql/
trunk/Source/Catalogs/MSSql/D2006/
trunk/Source/Core/D2006/
trunk/Source/Design/D2006/
trunk/Source/PackageGroups/D2006/
Property changes on: trunk/Source/Brokers/ADO/D2006
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
__history
*.local
*.cfg
*.identcache
Property changes on: trunk/Source/Brokers/BDE/D2006
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
__history
*.local
*.cfg
Property changes on: trunk/Source/Brokers/DBX/D2006
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
__history
*.local
*.cfg
Property changes on: trunk/Source/Brokers/IBX
___________________________________________________________________
Name: svn:ignore
+ *.dcu
Property changes on: trunk/Source/Brokers/IBX/D2006
___________________________________________________________________
Name: svn:ignore
+ __history
*.dcu
*.local
*.cfg
Property changes on: trunk/Source/Brokers/XML
___________________________________________________________________
Name: svn:ignore
+ *.dcu
Property changes on: trunk/Source/Brokers/XML/D2006
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
__history
*.local
*.cfg
Property changes on: trunk/Source/Catalogs/IBFb
___________________________________________________________________
Name: svn:ignore
+ *.dcu
Property changes on: trunk/Source/Catalogs/IBFb/D2006
___________________________________________________________________
Name: svn:ignore
+ __history
*.local
*.dcu
*.identcache
Property changes on: trunk/Source/Catalogs/MSSql
___________________________________________________________________
Name: svn:ignore
+ *.dcu
Property changes on: trunk/Source/Catalogs/MSSql/D2006
___________________________________________________________________
Name: svn:ignore
+ *.local
*.dcu
Property changes on: trunk/Source/Core/D2006
___________________________________________________________________
Name: svn:ignore
+ __history
*.local
*.dcu
*.identcache
Property changes on: trunk/Source/Design/D2006
___________________________________________________________________
Name: svn:ignore
+ *.local
*.cfg
*.dcu
Property changes on: trunk/Source/PackageGroups/D2006
___________________________________________________________________
Name: svn:ignore
+ __history
*.local
Property changes on: trunk/Tests
___________________________________________________________________
Name: svn:ignore
+ __history
*.dcu
*.local
*.exe
Copied: trunk/Tests/InstantMock.pas (from rev 706, trunk/Source/Tests/InstantMock.pas)
===================================================================
--- trunk/Tests/InstantMock.pas (rev 0)
+++ trunk/Tests/InstantMock.pas 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1,582 @@
+(*
+ * InstantObjects Test Suite
+ * InstantMock
+ *)
+
+(* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is: InstantObjects Test Suite/InstantMock
+ *
+ * The Initial Developer of the Original Code is: Uberto Barbini
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Steven Mitchell
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+unit InstantMock;
+
+interface
+
+uses
+ SysUtils, Classes, DB, InstantPersistence, InstantBrokers, InstantMetadata,
+ InstantTypes, UbMockObject;
+
+type
+ TInstantBrokerClass = class of TInstantBroker;
+
+ TInstantMockConnector = class(TInstantConnector)
+ private
+ FMock: TUbMockObject;
+ FBrokerClass: TInstantBrokerClass;
+ procedure SetBrokerClass(const Value: TInstantBrokerClass);
+ protected
+ procedure SetMock(const Value: TUbMockObject);
+ function CreateBroker: TInstantBroker; override;
+ procedure InternalConnect; override;
+ function InternalCreateScheme(Model: TInstantModel): TInstantScheme; override;
+ procedure InternalDisconnect; override;
+ procedure InternalStartTransaction; override;
+ procedure InternalCommitTransaction; override;
+ procedure InternalRollbackTransaction; override;
+ public
+ property MockManager: TUbMockObject read FMock write SetMock;
+ property BrokerClass: TInstantBrokerClass read FBrokerClass write SetBrokerClass;
+ class function ConnectionDefClass: TInstantConnectionDefClass; override;
+ constructor Create(AOwner: TComponent); override;
+ destructor Destroy; override;
+ end;
+
+ TInstantMockConnectionDef = class(TInstantConnectionDef)
+ class function ConnectionTypeName: String; override;
+ class function ConnectorClass: TInstantConnectorClass; override;
+ function Edit: Boolean; override;
+ end;
+
+ TInstantMockBroker = class(TInstantBroker)
+ private
+ FMock: TUbMockObject;
+ procedure SetMock(const Value: TUbMockObject);
+ protected
+ function InternalDisposeObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean; override;
+ function InternalRetrieveObject(AObject: TInstantObject;
+ const AObjectId: string;
+ ConflictAction: TInstantConflictAction): Boolean; override;
+ function InternalStoreObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean; override;
+ public
+ property MockManager: TUbMockObject read FMock write SetMock;
+ constructor Create(AConnector: TInstantConnector); override;
+ destructor Destroy; override;
+ end;
+
+ TInstantMockCRBroker = class(TInstantCustomRelationalBroker)
+ private
+ FMock: TUbMockObject;
+ procedure SetMock(const Value: TUbMockObject);
+ protected
+ function EnsureResolver(Map: TInstantAttributeMap): TInstantCustomResolver; override;
+ function InternalDisposeObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean; override;
+ function InternalRetrieveObject(AObject: TInstantObject;
+ const AObjectId: String;
+ ConflictAction: TInstantConflictAction): Boolean; override;
+ function InternalStoreObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean; override;
+ public
+ property MockManager: TUbMockObject read FMock write SetMock;
+ constructor Create(AConnector: TInstantConnector); override;
+ destructor Destroy; override;
+ end;
+
+ TInstantMockRelationalConnector = class(TInstantRelationalConnector)
+ private
+ FBrokerClass: TInstantBrokerClass;
+ FMock: TUbMockObject;
+ procedure SetBrokerClass(const Value: TInstantBrokerClass);
+ protected
+ function CreateBroker: TInstantBroker; override;
+ procedure InternalCommitTransaction; override;
+ procedure InternalConnect; override;
+ function InternalCreateScheme(Model: TInstantModel): TInstantScheme; override;
+ procedure InternalDisconnect; override;
+ procedure InternalRollbackTransaction; override;
+ procedure InternalStartTransaction; override;
+ procedure SetMock(const Value: TUbMockObject);
+ public
+ constructor Create(AOwner: TComponent); override;
+ destructor Destroy; override;
+ class function ConnectionDefClass: TInstantConnectionDefClass; override;
+ property BrokerClass: TInstantBrokerClass read FBrokerClass write
+ SetBrokerClass;
+ property MockManager: TUbMockObject read FMock write SetMock;
+ end;
+
+ TInstantMockSQLBroker = class(TInstantSQLBroker)
+ private
+ FMock: TUbMockObject;
+ procedure SetMock(const Value: TUbMockObject);
+ protected
+ procedure AssignDataSetParams(DataSet : TDataSet; AParams: TParams); override;
+ function CreateDataSet(const AStatement: string; AParams: TParams = nil):
+ TDataSet; override;
+ function CreateResolver(Map: TInstantAttributeMap): TInstantSQLResolver;
+ override;
+ function EnsureResolver(Map: TInstantAttributeMap): TInstantCustomResolver;
+ override;
+ function InternalDisposeObject(AObject: TInstantObject; ConflictAction:
+ TInstantConflictAction): Boolean; override;
+ function InternalRetrieveObject(AObject: TInstantObject; const AObjectId:
+ String; ConflictAction: TInstantConflictAction): Boolean; override;
+ function InternalStoreObject(AObject: TInstantObject; ConflictAction:
+ TInstantConflictAction): Boolean; override;
+ public
+ constructor Create(AConnector: TInstantConnector); override;
+ destructor Destroy; override;
+ function DataTypeToColumnType(DataType: TInstantDataType; Size: Integer):
+ string; override;
+ property MockManager: TUbMockObject read FMock write SetMock;
+ end;
+
+ TInstantMockDataset = class(TDataSet)
+ private
+ FMock: TUbMockObject;
+ procedure SetMock(const Value: TUbMockObject);
+ protected
+ function GetRecord(Buffer: PChar; GetMode: TGetMode; DoCheck: Boolean):
+ TGetResult; override;
+ procedure InternalClose; override;
+ procedure InternalHandleException; override;
+ procedure InternalInitFieldDefs; override;
+ procedure InternalOpen; override;
+ function IsCursorOpen: Boolean; override;
+ public
+ constructor Create(AOwner: TComponent); override;
+ destructor Destroy; override;
+ property MockManager: TUbMockObject read FMock write SetMock;
+ end;
+
+implementation
+
+function CaToStr(ConflictAction: TInstantConflictAction): string;
+begin
+ if ConflictAction = caIgnore then
+ Result := 'caIgnore'
+ else if ConflictAction = caFail then
+ Result := 'caFail'
+ else
+ Result := '???';
+end;
+
+{ TMockIConnector }
+
+class function TInstantMockConnector.ConnectionDefClass: TInstantConnectionDefClass;
+begin
+ result := TInstantMockConnectionDef;
+end;
+
+constructor TInstantMockConnector.Create(AOwner: TComponent);
+begin
+ inherited;
+ FMock := TUbMockObject.Create;
+end;
+
+function TInstantMockConnector.CreateBroker: TInstantBroker;
+begin
+ if not Assigned(FBrokerClass) then
+ raise Exception.Create('Undefined BrokerClass');
+ FMock.AddExpectation('CreateBroker ' + FBrokerClass.ClassName);
+ Result := FBrokerClass.Create(Self);
+end;
+
+{ TInstantMockConnectionDef }
+
+class function TInstantMockConnectionDef.ConnectionTypeName: String;
+begin
+ result := 'Mock';
+end;
+
+class function TInstantMockConnectionDef.ConnectorClass: TInstantConnectorClass;
+begin
+ result := TInstantMockConnector;
+end;
+
+function TInstantMockConnectionDef.Edit: Boolean;
+begin
+ result := True; //boh??
+end;
+
+{ TInstantMockBroker }
+
+destructor TInstantMockConnector.Destroy;
+begin
+ FMock.Free;
+ inherited;
+end;
+
+procedure TInstantMockConnector.InternalCommitTransaction;
+begin
+ inherited;
+ FMock.AddExpectation('InternalCommitTransaction');
+end;
+
+procedure TInstantMockConnector.InternalConnect;
+begin
+ FMock.AddExpectation('InternalConnect');
+end;
+
+function TInstantMockConnector.InternalCreateScheme(
+ Model: TInstantModel): TInstantScheme;
+begin
+ FMock.AddExpectation('InternalCreateScheme');
+ Result := TInstantScheme.Create;
+ Result.Catalog := TInstantModelCatalog.Create(Result, Model);
+end;
+
+procedure TInstantMockConnector.InternalDisconnect;
+begin
+ FMock.AddExpectation('InternalDisconnect');
+end;
+
+procedure TInstantMockBroker.SetMock(const Value: TUbMockObject);
+begin
+ FMock := Value;
+end;
+
+constructor TInstantMockBroker.Create(AConnector: TInstantConnector);
+begin
+ inherited;
+ FMock := TUbMockObject.Create;
+end;
+
+destructor TInstantMockBroker.Destroy;
+begin
+ FMock.Free;
+ inherited;
+end;
+
+{ TInstantMockBroker }
+
+function TInstantMockBroker.InternalDisposeObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ FMock.AddExpectation('InternalDisposeObject ' + AObject.Id);
+end;
+
+function TInstantMockBroker.InternalRetrieveObject(AObject: TInstantObject;
+ const AObjectId: string;
+ ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ FMock.AddExpectation('InternalRetrieveObject ' + AObjectId);
+end;
+
+function TInstantMockBroker.InternalStoreObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ FMock.AddExpectation('InternalStoreObject ' + AObject.Id);
+end;
+
+procedure TInstantMockConnector.InternalRollbackTransaction;
+begin
+ inherited;
+ FMock.AddExpectation('InternalRollbackTransaction');
+end;
+
+procedure TInstantMockConnector.InternalStartTransaction;
+begin
+ inherited;
+ FMock.AddExpectation('InternalStartTransaction');
+end;
+
+procedure TInstantMockConnector.SetBrokerClass(
+ const Value: TInstantBrokerClass);
+begin
+ FBrokerClass := Value;
+end;
+
+procedure TInstantMockConnector.SetMock(const Value: TUbMockObject);
+begin
+ FMock := Value;
+end;
+
+{ TInstantMockCRBroker }
+
+constructor TInstantMockCRBroker.Create(AConnector: TInstantConnector);
+begin
+ inherited;
+ FMock := TUbMockObject.Create;
+end;
+
+destructor TInstantMockCRBroker.Destroy;
+begin
+ FMock.Free;
+ inherited;
+end;
+
+function TInstantMockCRBroker.EnsureResolver(
+ Map: TInstantAttributeMap): TInstantCustomResolver;
+begin
+ MockManager.AddExpectation('EnsureResolver');
+ Result := nil;
+end;
+
+function TInstantMockCRBroker.InternalDisposeObject(
+ AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ MockManager.AddExpectation('InternalDisposeObject ' + CaToStr(ConflictAction) + ' ' + AObject.Id);
+end;
+
+function TInstantMockCRBroker.InternalRetrieveObject(
+ AObject: TInstantObject; const AObjectId: String;
+ ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ MockManager.AddExpectation('InternalRetrieveObject ' + CaToStr(ConflictAction) + ' ' + AObjectId);
+end;
+
+function TInstantMockCRBroker.InternalStoreObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ MockManager.AddExpectation('InternalStoreObject ' + CaToStr(ConflictAction) + ' ' + AObject.Id);
+end;
+
+procedure TInstantMockCRBroker.SetMock(const Value: TUbMockObject);
+begin
+ FMock := Value;
+end;
+
+constructor TInstantMockRelationalConnector.Create(AOwner: TComponent);
+begin
+ inherited;
+ FMock := TUbMockObject.Create;
+end;
+
+{ TInstantMockBroker }
+
+destructor TInstantMockRelationalConnector.Destroy;
+begin
+ FMock.Free;
+ inherited;
+end;
+
+{ TMockIConnector }
+
+class function TInstantMockRelationalConnector.ConnectionDefClass:
+ TInstantConnectionDefClass;
+begin
+ result := TInstantMockConnectionDef;
+end;
+
+function TInstantMockRelationalConnector.CreateBroker: TInstantBroker;
+begin
+ if not Assigned(FBrokerClass) then
+ raise Exception.Create('Undefined BrokerClass');
+ FMock.AddExpectation('CreateBroker ' + FBrokerClass.ClassName);
+ Result := FBrokerClass.Create(Self);
+end;
+
+procedure TInstantMockRelationalConnector.InternalCommitTransaction;
+begin
+ inherited;
+ FMock.AddExpectation('InternalCommitTransaction');
+end;
+
+procedure TInstantMockRelationalConnector.InternalConnect;
+begin
+ FMock.AddExpectation('InternalConnect');
+end;
+
+function TInstantMockRelationalConnector.InternalCreateScheme(Model:
+ TInstantModel): TInstantScheme;
+begin
+ FMock.AddExpectation('InternalCreateScheme');
+ Result := TInstantScheme.Create;
+ Result.Catalog := TInstantModelCatalog.Create(Result, Model);
+end;
+
+procedure TInstantMockRelationalConnector.InternalDisconnect;
+begin
+ FMock.AddExpectation('InternalDisconnect');
+end;
+
+procedure TInstantMockRelationalConnector.InternalRollbackTransaction;
+begin
+ inherited;
+ FMock.AddExpectation('InternalRollbackTransaction');
+end;
+
+procedure TInstantMockRelationalConnector.InternalStartTransaction;
+begin
+ inherited;
+ FMock.AddExpectation('InternalStartTransaction');
+end;
+
+procedure TInstantMockRelationalConnector.SetBrokerClass(const Value:
+ TInstantBrokerClass);
+begin
+ FBrokerClass := Value;
+end;
+
+procedure TInstantMockRelationalConnector.SetMock(const Value: TUbMockObject);
+begin
+ FMock := Value;
+end;
+
+{ TInstantMockCRBroker }
+
+constructor TInstantMockSQLBroker.Create(AConnector: TInstantConnector);
+begin
+ inherited;
+ FMock := TUbMockObject.Create;
+end;
+
+destructor TInstantMockSQLBroker.Destroy;
+begin
+ FMock.Free;
+ inherited;
+end;
+
+procedure TInstantMockSQLBroker.AssignDataSetParams(DataSet : TDataSet;
+ AParams: TParams);
+begin
+ MockManager.AddExpectation('AssignDataSetParams');
+end;
+
+function TInstantMockSQLBroker.CreateDataSet(const AStatement: string; AParams:
+ TParams = nil): TDataSet;
+begin
+ MockManager.AddExpectation('CreateDataSet');
+// Result := nil;
+ Result := TInstantMockDataset.Create(nil);
+end;
+
+function TInstantMockSQLBroker.CreateResolver(Map: TInstantAttributeMap):
+ TInstantSQLResolver;
+begin
+ MockManager.AddExpectation('CreateResolver');
+ Result := nil;
+end;
+
+function TInstantMockSQLBroker.DataTypeToColumnType(DataType: TInstantDataType;
+ Size: Integer): string;
+begin
+ MockManager.AddExpectation('DataTypeToColumnType');
+ Result := '';
+end;
+
+function TInstantMockSQLBroker.EnsureResolver(Map: TInstantAttributeMap):
+ TInstantCustomResolver;
+begin
+ MockManager.AddExpectation('EnsureResolver');
+ Result := nil;
+end;
+
+function TInstantMockSQLBroker.InternalDisposeObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ MockManager.AddExpectation('InternalDisposeObject ' + CaToStr(ConflictAction) + ' ' + AObject.Id);
+end;
+
+function TInstantMockSQLBroker.InternalRetrieveObject(AObject: TInstantObject;
+ const AObjectId: String; ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ MockManager.AddExpectation('InternalRetrieveObject ' + CaToStr(ConflictAction) + ' ' + AObjectId);
+end;
+
+function TInstantMockSQLBroker.InternalStoreObject(AObject: TInstantObject;
+ ConflictAction: TInstantConflictAction): Boolean;
+begin
+ Result := True;
+ MockManager.AddExpectation('InternalStoreObject ' + CaToStr(ConflictAction) + ' ' + AObject.Id);
+end;
+
+procedure TInstantMockSQLBroker.SetMock(const Value: TUbMockObject);
+begin
+ FMock := Value;
+end;
+
+{ TInstantMockCRBroker }
+
+constructor TInstantMockDataset.Create(AOwner: TComponent);
+begin
+ inherited;
+ FMock := TUbMockObject.Create;
+end;
+
+destructor TInstantMockDataset.Destroy;
+begin
+ FMock.Free;
+ inherited;
+end;
+
+function TInstantMockDataset.GetRecord(Buffer: PChar; GetMode: TGetMode;
+ DoCheck: Boolean): TGetResult;
+begin
+ MockManager.AddExpectation('GetRecord');
+ Result := grError;
+end;
+
+procedure TInstantMockDataset.InternalClose;
+begin
+ MockManager.AddExpectation('InternalClose');
+end;
+
+procedure TInstantMockDataset.InternalHandleException;
+begin
+ raise Exception.Create('Exception raised in InternalHandleException');
+end;
+
+procedure TInstantMockDataset.InternalInitFieldDefs;
+begin
+ raise Exception.Create('Exception raised in InternalInitFieldDefs');
+ MockManager.AddExpectation('InternalInitFieldDefs');
+end;
+
+procedure TInstantMockDataset.InternalOpen;
+begin
+ MockManager.AddExpectation('InternalOpen');
+end;
+
+function TInstantMockDataset.IsCursorOpen: Boolean;
+begin
+ MockManager.AddExpectation('IsCursorOpen');
+ Result := False;
+end;
+
+procedure TInstantMockDataset.SetMock(const Value: TUbMockObject);
+begin
+ FMock := Value;
+end;
+
+initialization
+ RegisterClass(TInstantMockConnectionDef);
+ TInstantMockConnector.RegisterClass;
+
+finalization
+ TInstantMockConnector.UnregisterClass;
+
+end.
+
Copied: trunk/Tests/MinimalModel.pas (from rev 706, trunk/Source/Tests/MinimalModel.pas)
===================================================================
--- trunk/Tests/MinimalModel.pas (rev 0)
+++ trunk/Tests/MinimalModel.pas 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1,113 @@
+(*
+ * InstantObjects Test Suite
+ * MinimalModel
+ *)
+
+(* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is: InstantObjects Test Suite/MinimalModel
+ *
+ * The Initial Developer of the Original Code is: Uberto Barbini
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Steven Mitchell
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+unit MinimalModel;
+
+interface
+
+uses
+ InstantPersistence;
+
+type
+ TSimpleClass = class(TInstantObject)
+ {IOMETADATA stored 'SIMPLE';
+ StringProperty: String(20) stored 'STRING'; }
+ _StringProperty: TInstantString;
+ private
+ function GetStringProperty: string;
+ procedure SetStringProperty(const Value: string);
+ published
+ property StringProperty: string read GetStringProperty write SetStringProperty;
+ end;
+
+procedure CreateMinimalModel;
+
+implementation
+
+uses InstantMetadata, InstantTypes;
+
+procedure CreateMinimalModel;
+var
+ InstantClassMetadata : TInstantClassMetadata;
+ InstantAttributeMetadata : TInstantAttributeMetadata;
+begin
+(*
+<TInstantClassMetadatas>
+ <TInstantClassMetadata>
+ <Name>TSimpleClass</Name>
+ <Persistence>peStored</Persistence>
+ <StorageName>SIMPLE</StorageName>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>StringProperty</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>10</Size>
+ <StorageName>STRING</StorageName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+</TInstantClassMetadatas>
+*)
+ // An empty InstantModel.ClassMetadatas should already be available
+ InstantClassMetadata := InstantModel.ClassMetadatas.Add;
+ InstantClassMetadata.Name := 'TSimpleClass';
+ InstantClassMetadata.Persistence := peStored;
+ InstantClassMetadata.StorageName := 'SIMPLE';
+ InstantAttributeMetadata := InstantClassMetadata.AttributeMetadatas.Add;
+ InstantAttributeMetadata.Name := 'StringProperty';
+ InstantAttributeMetadata.AttributeType := atString;
+ InstantAttributeMetadata.IsIndexed := FALSE;
+ InstantAttributeMetadata.IsRequired := FALSE;
+ InstantAttributeMetadata.Size := 10;
+ InstantAttributeMetadata.StorageName := 'STRING';
+end;
+
+{ TSimpleClass }
+
+function TSimpleClass.GetStringProperty: string;
+begin
+ Result := _StringProperty.Value;
+end;
+
+procedure TSimpleClass.SetStringProperty(const Value: string);
+begin
+ _StringProperty.Value := Value;
+end;
+
+initialization
+ InstantRegisterClasses([
+ TSimpleClass
+ ]);
+
+end.
Copied: trunk/Tests/Picture.bmp (from rev 706, trunk/Source/Tests/Picture.bmp)
===================================================================
(Binary files differ)
Copied: trunk/Tests/TestBlobText.txt (from rev 706, trunk/Source/Tests/TestBlobText.txt)
===================================================================
--- trunk/Tests/TestBlobText.txt (rev 0)
+++ trunk/Tests/TestBlobText.txt 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1 @@
+The following notes document the structure of the InstantObjects tree as stored in CVS, explaining what each folder is for.
Added: trunk/Tests/TestBlobTextOut.txt
===================================================================
--- trunk/Tests/TestBlobTextOut.txt (rev 0)
+++ trunk/Tests/TestBlobTextOut.txt 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1 @@
+The following notes document the structure of the InstantObjects tree as stored in CVS, explaining what each folder is for.
Added: trunk/Tests/TestIO.bdsproj
===================================================================
--- trunk/Tests/TestIO.bdsproj (rev 0)
+++ trunk/Tests/TestIO.bdsproj 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BorlandProject>
+ <PersonalityInfo>
+ <Option>
+ <Option Name="Personality">Delphi.Personality</Option>
+ <Option Name="ProjectType">VCLApplication</Option>
+ <Option Name="Version">1.0</Option>
+ <Option Name="GUID">{D24F7242-7354-4FC2-9558-648DB0B6C6D4}</Option>
+ </Option>
+ </PersonalityInfo>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">TestIO.dpr</Source>
+ </Source>
+ <FileVersion>
+ <FileVersion Name="Version">7.0</FileVersion>
+ </FileVersion>
+ <Compiler>
+ <Compiler Name="A">8</Compiler>
+ <Compiler Name="B">0</Compiler>
+ <Compiler Name="C">1</Compiler>
+ <Compiler Name="D">1</Compiler>
+ <Compiler Name="E">0</Compiler>
+ <Compiler Name="F">0</Compiler>
+ <Compiler Name="G">1</Compiler>
+ <Compiler Name="H">1</Compiler>
+ <Compiler Name="I">1</Compiler>
+ <Compiler Name="J">0</Compiler>
+ <Compiler Name="K">0</Compiler>
+ <Compiler Name="L">1</Compiler>
+ <Compiler Name="M">0</Compiler>
+ <Compiler Name="N">1</Compiler>
+ <Compiler Name="O">0</Compiler>
+ <Compiler Name="P">1</Compiler>
+ <Compiler Name="Q">0</Compiler>
+ <Compiler Name="R">0</Compiler>
+ <Compiler Name="S">0</Compiler>
+ <Compiler Name="T">1</Compiler>
+ <Compiler Name="U">0</Compiler>
+ <Compiler Name="V">1</Compiler>
+ <Compiler Name="W">1</Compiler>
+ <Compiler Name="X">1</Compiler>
+ <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Z">1</Compiler>
+ <Compiler Name="ShowHints">True</Compiler>
+ <Compiler Name="ShowWarnings">True</Compiler>
+ <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+ <Compiler Name="NamespacePrefix"></Compiler>
+ <Compiler Name="GenerateDocumentation">False</Compiler>
+ <Compiler Name="DefaultNamespace"></Compiler>
+ <Compiler Name="SymbolDeprecated">True</Compiler>
+ <Compiler Name="SymbolLibrary">True</Compiler>
+ <Compiler Name="SymbolPlatform">True</Compiler>
+ <Compiler Name="SymbolExperimental">True</Compiler>
+ <Compiler Name="UnitLibrary">True</Compiler>
+ <Compiler Name="UnitPlatform">True</Compiler>
+ <Compiler Name="UnitDeprecated">True</Compiler>
+ <Compiler Name="UnitExperimental">True</Compiler>
+ <Compiler Name="HResultCompat">True</Compiler>
+ <Compiler Name="HidingMember">True</Compiler>
+ <Compiler Name="HiddenVirtual">True</Compiler>
+ <Compiler Name="Garbage">True</Compiler>
+ <Compiler Name="BoundsError">True</Compiler>
+ <Compiler Name="ZeroNilCompat">True</Compiler>
+ <Compiler Name="StringConstTruncated">True</Compiler>
+ <Compiler Name="ForLoopVarVarPar">True</Compiler>
+ <Compiler Name="TypedConstVarPar">True</Compiler>
+ <Compiler Name="AsgToTypedConst">True</Compiler>
+ <Compiler Name="CaseLabelRange">True</Compiler>
+ <Compiler Name="ForVariable">True</Compiler>
+ <Compiler Name="ConstructingAbstract">True</Compiler>
+ <Compiler Name="ComparisonFalse">True</Compiler>
+ <Compiler Name="ComparisonTrue">True</Compiler>
+ <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+ <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+ <Compiler Name="UnsupportedConstruct">True</Compiler>
+ <Compiler Name="FileOpen">True</Compiler>
+ <Compiler Name="FileOpenUnitSrc">True</Compiler>
+ <Compiler Name="BadGlobalSymbol">True</Compiler>
+ <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+ <Compiler Name="InvalidDirective">True</Compiler>
+ <Compiler Name="PackageNoLink">True</Compiler>
+ <Compiler Name="PackageThreadVar">True</Compiler>
+ <Compiler Name="ImplicitImport">True</Compiler>
+ <Compiler Name="HPPEMITIgnored">True</Compiler>
+ <Compiler Name="NoRetVal">True</Compiler>
+ <Compiler Name="UseBeforeDef">True</Compiler>
+ <Compiler Name="ForLoopVarUndef">True</Compiler>
+ <Compiler Name="UnitNameMismatch">True</Compiler>
+ <Compiler Name="NoCFGFileFound">True</Compiler>
+ <Compiler Name="ImplicitVariants">True</Compiler>
+ <Compiler Name="UnicodeToLocale">True</Compiler>
+ <Compiler Name="LocaleToUnicode">True</Compiler>
+ <Compiler Name="ImagebaseMultiple">True</Compiler>
+ <Compiler Name="SuspiciousTypecast">True</Compiler>
+ <Compiler Name="PrivatePropAccessor">True</Compiler>
+ <Compiler Name="UnsafeType">False</Compiler>
+ <Compiler Name="UnsafeCode">False</Compiler>
+ <Compiler Name="UnsafeCast">False</Compiler>
+ <Compiler Name="OptionTruncated">True</Compiler>
+ <Compiler Name="WideCharReduced">True</Compiler>
+ <Compiler Name="DuplicatesIgnored">True</Compiler>
+ <Compiler Name="UnitInitSeq">True</Compiler>
+ <Compiler Name="LocalPInvoke">True</Compiler>
+ <Compiler Name="MessageDirective">True</Compiler>
+ <Compiler Name="CodePage"></Compiler>
+ </Compiler>
+ <Linker>
+ <Linker Name="MapFile">0</Linker>
+ <Linker Name="OutputObjs">0</Linker>
+ <Linker Name="GenerateHpps">False</Linker>
+ <Linker Name="ConsoleApp">1</Linker>
+ <Linker Name="DebugInfo">False</Linker>
+ <Linker Name="RemoteSymbols">False</Linker>
+ <Linker Name="GenerateDRC">False</Linker>
+ <Linker Name="MinStackSize">16384</Linker>
+ <Linker Name="MaxStackSize">1048576</Linker>
+ <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ExeDescription"></Linker>
+ </Linker>
+ <Directories>
+ <Directories Name="OutputDir"></Directories>
+ <Directories Name="UnitOutputDir"></Directories>
+ <Directories Name="PackageDLLOutputDir"></Directories>
+ <Directories Name="PackageDCPOutputDir"></Directories>
+ <Directories Name="SearchPath">..\Source\Core;.\ubmock\src</Directories>
+ <Directories Name="Packages">vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;adortl;vclactnband;vclshlctrls;CS30Logging70;Rz30Ctls70;Rz30DBCtls70;ip4000v7;Rave60VCL;Rave60CLX;madBasic_;madDisAsm_;CLXIB;ibxpress;VCLIB;IOCore;IOIBX</Directories>
+ <Directories Name="Conditionals"></Directories>
+ <Directories Name="DebugSourceDirs">..\Source\Core</Directories>
+ <Directories Name="UsePackages">False</Directories>
+ </Directories>
+ <Parameters>
+ <Parameters Name="RunParams"></Parameters>
+ <Parameters Name="HostApplication"></Parameters>
+ <Parameters Name="Launcher"></Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="DebugCWD"></Parameters>
+ <Parameters Name="Debug Symbols Search Path"></Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Language>
+ <Language Name="ActiveLang"></Language>
+ <Language Name="ProjectLang">$00000000</Language>
+ <Language Name="RootDir">C:\Program Files\Borland\Delphi7\Bin\</Language>
+ </Language>
+ <VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+ <VersionInfo Name="MajorVer">1</VersionInfo>
+ <VersionInfo Name="MinorVer">0</VersionInfo>
+ <VersionInfo Name="Release">0</VersionInfo>
+ <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Debug">False</VersionInfo>
+ <VersionInfo Name="PreRelease">False</VersionInfo>
+ <VersionInfo Name="Special">False</VersionInfo>
+ <VersionInfo Name="Private">False</VersionInfo>
+ <VersionInfo Name="DLL">False</VersionInfo>
+ <VersionInfo Name="Locale">3081</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+ </VersionInfoKeys>
+ </Delphi.Personality>
+</BorlandProject>
Copied: trunk/Tests/TestIO.cfg (from rev 706, trunk/Source/Tests/TestIO.cfg)
===================================================================
--- trunk/Tests/TestIO.cfg (rev 0)
+++ trunk/Tests/TestIO.cfg 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1,42 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O-
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T+
+-$U-
+-$V+
+-$W+
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"C:\Documents and Settings\nandod\Documenti\Borland Studio Projects\Bpl"
+-LN"C:\Documents and Settings\nandod\Documenti\Borland Studio Projects\Bpl"
+-U"..\Source\Core;.\ubmock\src"
+-O"..\Source\Core;.\ubmock\src"
+-I"..\Source\Core;.\ubmock\src"
+-R"..\Source\Core;.\ubmock\src"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
Copied: trunk/Tests/TestIO.dof (from rev 706, trunk/Source/Tests/TestIO.dof)
===================================================================
--- trunk/Tests/TestIO.dof (rev 0)
+++ trunk/Tests/TestIO.dof 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1,142 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=0
+P=1
+Q=0
+R=0
+S=0
+T=1
+U=0
+V=1
+W=1
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=..\core
+Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;adortl;vclactnband;vclshlctrls;CS30Logging70;Rz30Ctls70;Rz30DBCtls70;ip4000v7;Rave60VCL;Rave60CLX;madBasic_;madDisAsm_;CLXIB;ibxpress;VCLIB;IOCore;IOIBX
+Conditionals=
+DebugSourceDirs=..\core
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=C:\Program Files\Borland\Delphi7\Bin\
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=3081
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=D:\Professional\Produzione\Progetti\Delphi 7\InstantObjects\Source\Core\;D:\Professional\Produzione\Progetti\Delphi 7\EhLib\Common
+[HistoryLists\hlUnitAliases]
+Count=1
+Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
Copied: trunk/Tests/TestIO.dpr (from rev 706, trunk/Source/Tests/TestIO.dpr)
===================================================================
--- trunk/Tests/TestIO.dpr (rev 0)
+++ trunk/Tests/TestIO.dpr 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1,67 @@
+program TestIO;
+
+{$I '..\InstantDefines.inc'}
+
+{$IFDEF FPC}
+{$mode objfpc}{$H+}
+{$ENDIF}
+
+uses
+ FastMM4,
+{$IFDEF FPC}
+ Interfaces,
+{$ENDIF}
+ Forms,
+ guitestrunner,
+ fpcunit,
+ testregistry,
+ testutils,
+ testreport,
+ InstantPersistence,
+ InstantMock in 'InstantMock.pas',
+ TestMockConnector in 'TestMockConnector.pas',
+ TestMockBroker in 'TestMockBroker.pas',
+ TestModel in 'TestModel.pas',
+ TestInstantMetadata in 'TestInstantMetadata.pas',
+ TestInstantFieldMetadata in 'TestInstantFieldMetadata.pas',
+ TestInstantClassMetadata in 'TestInstantClassMetadata.pas',
+ TestInstantAttributeMetadata in 'TestInstantAttributeMetadata.pas',
+ TestInstantIndexMetadata in 'TestInstantIndexMetadata.pas',
+ TestInstantTableMetadata in 'TestInstantTableMetadata.pas',
+ TestInstantScheme in 'TestInstantScheme.pas',
+ TestInstantClasses in 'TestInstantClasses.pas',
+ TestInstantRtti in 'TestInstantRtti.pas',
+ TestMinimalModel in 'TestMinimalModel.pas',
+ TestInstantAttributeMap in 'TestInstantAttributeMap.pas',
+ TestInstantAttribute in 'TestInstantAttribute.pas',
+ TestInstantNumeric in 'TestInstantNumeric.pas',
+ TestInstantInteger in 'TestInstantInteger.pas',
+ TestInstantString in 'TestInstantString.pas',
+ TestInstantDateTime in 'TestInstantDateTime.pas',
+ TestInstantBoolean in 'TestInstantBoolean.pas',
+ TestInstantFloat in 'TestInstantFloat.pas',
+ TestInstantCurrency in 'TestInstantCurrency.pas',
+ TestInstantBlob in 'TestInstantBlob.pas',
+ TestInstantComplex in 'TestInstantComplex.pas',
+ TestInstantPart in 'TestInstantPart.pas',
+ TestInstantReference in 'TestInstantReference.pas',
+ TestInstantObject in 'TestInstantObject.pas',
+ TestInstantObjectState in 'TestInstantObjectState.pas',
+ TestInstantCache in 'TestInstantCache.pas',
+ TestInstantObjectStore in 'TestInstantObjectStore.pas',
+ TestInstantParts in 'TestInstantParts.pas',
+ TestInstantReferences in 'TestInstantReferences.pas',
+ TestInstantCircularReferences in 'TestInstantCircularReferences.pas',
+ TestInstantObjectReference in 'TestInstantObjectReference.pas';
+
+{$R *.res}
+{$R *.mdr} {TestModel}
+
+begin
+ Application.Initialize;
+ InstantModel.ClassMetadatas.Clear;
+// Application.CreateForm(TGUITestRunner, TestRunner);
+ Application.CreateForm(TGUITestRunner, TestRunner);
+ Application.Run;
+end.
+
Copied: trunk/Tests/TestIO.lpi (from rev 706, trunk/Source/Tests/TestIO.lpi)
===================================================================
--- trunk/Tests/TestIO.lpi (rev 0)
+++ trunk/Tests/TestIO.lpi 2006-09-22 09:17:32 UTC (rev 707)
@@ -0,0 +1,1078 @@
+<?xml version="1.0"?>
+<CONFIG>
+ <ProjectOptions>
+ <PathDelim Value="\"/>
+ <Version Value="5"/>
+ <General>
+ <MainUnit Value="0"/>
+ <ActiveEditorIndexAtStart Value="0"/>
+ <IconPath Value="./"/>
+ <TargetFileExt Value=".exe"/>
+ <Title Value="TestIO"/>
+ </General>
+ <JumpHistory Count="25" HistoryIndex="24">
+ <Position1>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14313" Column="1" TopLine="14291"/>
+ </Position1>
+ <Position2>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14314" Column="1" TopLine="14292"/>
+ </Position2>
+ <Position3>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14315" Column="1" TopLine="14293"/>
+ </Position3>
+ <Position4>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14311" Column="1" TopLine="14289"/>
+ </Position4>
+ <Position5>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14313" Column="1" TopLine="14291"/>
+ </Position5>
+ <Position6>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14314" Column="1" TopLine="14292"/>
+ </Position6>
+ <Position7>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14315" Column="1" TopLine="14293"/>
+ </Position7>
+ <Position8>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14311" Column="1" TopLine="14289"/>
+ </Position8>
+ <Position9>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14313" Column="1" TopLine="14291"/>
+ </Position9>
+ <Position10>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14314" Column="1" TopLine="14292"/>
+ </Position10>
+ <Position11>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14315" Column="1" TopLine="14293"/>
+ </Position11>
+ <Position12>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14321" Column="1" TopLine="14299"/>
+ </Position12>
+ <Position13>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14382" Column="1" TopLine="14360"/>
+ </Position13>
+ <Position14>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14387" Column="1" TopLine="14365"/>
+ </Position14>
+ <Position15>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14382" Column="1" TopLine="14360"/>
+ </Position15>
+ <Position16>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14378" Column="1" TopLine="14356"/>
+ </Position16>
+ <Position17>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14389" Column="1" TopLine="14367"/>
+ </Position17>
+ <Position18>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14378" Column="1" TopLine="14356"/>
+ </Position18>
+ <Position19>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="14389" Column="1" TopLine="14367"/>
+ </Position19>
+ <Position20>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\source\brokers\uib\InstantUIB.pas"/>
+ <Caret Line="538" Column="1" TopLine="516"/>
+ </Position20>
+ <Position21>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPersistence.pas"/>
+ <Caret Line="10063" Column="1" TopLine="10041"/>
+ </Position21>
+ <Position22>
+ <Filename Value="D:\lazarus\fpcsrc\fcl\fpcunit\fpcunit.pp"/>
+ <Caret Line="359" Column="37" TopLine="335"/>
+ </Position22>
+ <Position23>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPresentation.pas"/>
+ <Caret Line="269" Column="1" TopLine="267"/>
+ </Position23>
+ <Position24>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPresentation.pas"/>
+ <Caret Line="289" Column="31" TopLine="267"/>
+ </Position24>
+ <Position25>
+ <Filename Value="D:\SELEQT\InstantObjects1.7\Source\core\InstantPresentation.pas"/>
+ <Caret Line="363" Column="44" TopLine="341"/>
+ </Position25>
+ </JumpHistory>
+ <Units Count="127">
+ <Unit0>
+ <CursorPos X="1" Y="31"/>
+ <EditorIndex Value="0"/>
+ <Filename Value="TestIO.dpr"/>
+ <IsPartOfProject Value="True"/>
+ <Loaded Value="True"/>
+ <TopLine Value="1"/>
+ <UnitName Value="TestIO"/>
+ <UsageCount Value="153"/>
+ </Unit0>
+ <Unit1>
+ <CursorPos X="1" Y="1"/>
+ <Filename Value="TestMockConnector.pas"/>
+ <TopLine Value="7"/>
+ <UnitName Value="TestMockConnector"/>
+ <UsageCount Value="15"/>
+ </Unit1>
+ <Unit2>
+ <CursorPos X="1" Y="102"/>
+ <Filename Value="E:\z\IO_cvs\Source\Core\InstantClasses.pas"/>
+ <TopLine Value="101"/>
+ <UnitName Value="InstantClasses"/>
+ <UsageCount Value="2"/>
+ </Unit2>
+ <Unit3>
+ <CursorPos X="10" Y="35"/>
+ <Filename Value="E:\lazarus\fpcsrc\fcl\classes\win32\classes.pp"/>
+ <TopLine Value="1"/>
+ <UsageCount Value="10"/>
+ </Unit3>
+ <Unit4>
+ <CursorPos X="34" Y="54"/>
+ <Filename Value="e:\lazarus\fpcsrc\fcl\classes\classes.inc"/>
+ <TopLine Value="30"/>
+ <UsageCount Value="10"/>
+ </Unit4>
+ <Unit5>
+ <CursorPos X="3" Y="315"/>
+ <Filename Value="e:\lazarus\fpcsrc\fcl\classes\classesh.inc"/>
+ <TopLine Value="303"/>
+ <UsageCount Value="10"/>
+ </Unit5>
+ <Unit6>
+ <CursorPos X="79" Y="36"/>
+ <Filename Value="E:\z\IO_cvs\Source\Core\InstantRtti.pas"/>
+ <TopLine Value="33"/>
+ <UnitName Value="InstantRtti"/>
+ <UsageCount Value="10"/>
+ </Unit6>
+ <Unit7>
+ <CursorPos X="38" Y="938"/>
+ <Filename Value="E:\z\svifpc\io\source\core\InstantPersistence.pas"/>
+ <TopLine Value="935"/>
+ <UnitName Value="InstantPersistence"/>
+ <UsageCount Value="11"/>
+ </Unit7>
+ <Unit8>
+ <CursorPos X="53" Y="12"/>
+ <Filename Value="InstantMock.pas"/>
+ <TopLine Value="10"/>
+ <UnitName Value="InstantMock"/>
+ <UsageCount Value="9"/>
+ </Unit8>
+ <Unit9>
+ <CursorPos X="1" Y="161"/>
+ <Filename Value="TestInstantRtti.pas"/>
+ <TopLine Value="135"/>
+ <UnitName Value="TestInstantRtti"/>
+ <UsageCount Value="59"/>
+ </Unit9>
+ <Unit10>
+ <CursorPos X="68" Y="118"/>
+ <Filename Value="E:\z\svifpc\io\source\core\InstantRtti.pas"/>
+ <TopLine Value="115"/>
+ <UnitName Value="InstantRtti"/>
+ <UsageCount Value="41"/>
+ </Unit10>
+ <Unit11>
+ <CursorPos X="34" Y="8"/>
+ <Filename Value="E:\z\svifpc\io\source\core\InstantDefines.inc"/>
+ <TopLine Value="1"/>
+ <UsageCount Value="10"/>
+ </Unit11>
+ <Unit12>
+ <CursorPos X="18" Y="83"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\inc\variants.pp"/>
+ <TopLine Value="67"/>
+ <UnitName Value="variants"/>
+ <UsageCount Value="9"/>
+ </Unit12>
+ <Unit13>
+ <CursorPos X="1" Y="1"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\win32\sysutils.pp"/>
+ <TopLine Value="46"/>
+ <UnitName Value="sysutils"/>
+ <UsageCount Value="9"/>
+ </Unit13>
+ <Unit14>
+ <CursorPos X="58" Y="105"/>
+ <Filename Value="E:\z\sviFpc\IO\Source\Core\InstantConsts.pas"/>
+ <TopLine Value="100"/>
+ <UnitName Value="InstantConsts"/>
+ <UsageCount Value="10"/>
+ </Unit14>
+ <Unit15>
+ <CursorPos X="29" Y="345"/>
+ <Filename Value="TestInstantClasses.pas"/>
+ <TopLine Value="293"/>
+ <UnitName Value="TestInstantClasses"/>
+ <UsageCount Value="42"/>
+ </Unit15>
+ <Unit16>
+ <CursorPos X="17" Y="1585"/>
+ <Filename Value="E:\z\svifpc\io\source\core\InstantCode.pas"/>
+ <TopLine Value="1574"/>
+ <UnitName Value="InstantCode"/>
+ <UsageCount Value="10"/>
+ </Unit16>
+ <Unit17>
+ <CursorPos X="1" Y="1"/>
+ <Filename Value="E:\z\svifpc\io\source\core\InstantClasses.pas"/>
+ <TopLine Value="1"/>
+ <UnitName Value="InstantClasses"/>
+ <UsageCount Value="40"/>
+ </Unit17>
+ <Unit18>
+ <CursorPos X="40" Y="80"/>
+ <Filename Value="E:\cvs_local\fpc\fcl\fpcunit\fpcunit.pp"/>
+ <TopLine Value="79"/>
+ <UnitName Value="fpcunit"/>
+ <UsageCount Value="8"/>
+ </Unit18>
+ <Unit19>
+ <CursorPos X="35" Y="32"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\typinfo.pp"/>
+ <TopLine Value="30"/>
+ <UnitName Value="typinfo"/>
+ <UsageCount Value="21"/>
+ </Unit19>
+ <Unit20>
+ <CursorPos X="28" Y="376"/>
+ <Filename Value="E:\cvs_local\fpc\fcl\inc\rttiutils.pp"/>
+ <TopLine Value="371"/>
+ <UnitName Value="rttiutils"/>
+ <UsageCount Value="9"/>
+ </Unit20>
+ <Unit21>
+ <CursorPos X="5" Y="236"/>
+ <Filename Value="E:\z\svifpc\io\source\core\InstantFpcUtils.pas"/>
+ <TopLine Value="228"/>
+ <UnitName Value="InstantFpcUtils"/>
+ <UsageCount Value="29"/>
+ </Unit21>
+ <Unit22>
+ <CursorPos X="11" Y="1739"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\classes\classesh.inc"/>
+ <TopLine Value="1728"/>
+ <UsageCount Value="21"/>
+ </Unit22>
+ <Unit23>
+ <CursorPos X="1" Y="840"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\classes\writer.inc"/>
+ <TopLine Value="805"/>
+ <UsageCount Value="8"/>
+ </Unit23>
+ <Unit24>
+ <CursorPos X="3" Y="928"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\classes\reader.inc"/>
+ <TopLine Value="926"/>
+ <UsageCount Value="22"/>
+ </Unit24>
+ <Unit25>
+ <CursorPos X="81" Y="68"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\sysutils\sysutilh.inc"/>
+ <TopLine Value="67"/>
+ <UsageCount Value="2"/>
+ </Unit25>
+ <Unit26>
+ <CursorPos X="1" Y="1"/>
+ <Filename Value="TestMinimalModel.pas"/>
+ <TopLine Value="1"/>
+ <UnitName Value="TestMinimalModel"/>
+ <UsageCount Value="52"/>
+ </Unit26>
+ <Unit27>
+ <CursorPos X="54" Y="16"/>
+ <Filename Value="E:\cvs_local\fpc\tests\test\trtti1.pp"/>
+ <TopLine Value="5"/>
+ <UnitName Value="trtti1"/>
+ <UsageCount Value="6"/>
+ </Unit27>
+ <Unit28>
+ <CursorPos X="56" Y="4"/>
+ <Filename Value="TestMockBroker.pas"/>
+ <TopLine Value="2"/>
+ <UnitName Value="TestMockBroker"/>
+ <UsageCount Value="23"/>
+ </Unit28>
+ <Unit29>
+ <CursorPos X="9" Y="50"/>
+ <Filename Value="MinimalModel.pas"/>
+ <TopLine Value="46"/>
+ <UnitName Value="MinimalModel"/>
+ <UsageCount Value="50"/>
+ </Unit29>
+ <Unit30>
+ <CursorPos X="60" Y="538"/>
+ <Filename Value="Model.pas"/>
+ <TopLine Value="536"/>
+ <UnitName Value="Model"/>
+ <UsageCount Value="20"/>
+ </Unit30>
+ <Unit31>
+ <CursorPos X="17" Y="7"/>
+ <Filename Value="TestInstantPersistence.pas"/>
+ <TopLine Value="2"/>
+ <UnitName Value="TestInstantPersistence"/>
+ <UsageCount Value="49"/>
+ </Unit31>
+ <Unit32>
+ <CursorPos X="57" Y="1"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\rtlconsts.pp"/>
+ <TopLine Value="1"/>
+ <UnitName Value="RtlConsts"/>
+ <UsageCount Value="9"/>
+ </Unit32>
+ <Unit33>
+ <CursorPos X="1" Y="1"/>
+ <Filename Value="TestIO.mdx"/>
+ <SyntaxHighlighter Value="None"/>
+ <TopLine Value="1"/>
+ <UsageCount Value="5"/>
+ </Unit33>
+ <Unit34>
+ <CursorPos X="7" Y="905"/>
+ <Filename Value="E:\cvs_local\fpc\fcl\classes\classes.inc"/>
+ <TopLine Value="661"/>
+ <UsageCount Value="9"/>
+ </Unit34>
+ <Unit35>
+ <CursorPos X="38" Y="594"/>
+ <Filename Value="E:\cvs_local\fpc\fcl\classes\reader.inc"/>
+ <TopLine Value="591"/>
+ <UsageCount Value="1"/>
+ </Unit35>
+ <Unit36>
+ <CursorPos X="81" Y="352"/>
+ <Filename Value="E:\cvs_local\lazarus\components\fpcunit\GuiTestRunner.pas"/>
+ <ComponentName Value="GUITestRunner"/>
+ <ResourceFilename Value="E:\cvs_local\lazarus\components\fpcunit\guitestrunner.lrs"/>
+ <TopLine Value="346"/>
+ <UnitName Value="GuiTestRunner"/>
+ <UsageCount Value="7"/>
+ </Unit36>
+ <Unit37>
+ <CursorPos X="1" Y="41"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\classes\constsg.inc"/>
+ <TopLine Value="30"/>
+ <UsageCount Value="2"/>
+ </Unit37>
+ <Unit38>
+ <CursorPos X="1" Y="40"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\classes\constss.inc"/>
+ <TopLine Value="29"/>
+ <UsageCount Value="2"/>
+ </Unit38>
+ <Unit39>
+ <CursorPos X="2" Y="40"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\classes\util.inc"/>
+ <TopLine Value="40"/>
+ <UsageCount Value="11"/>
+ </Unit39>
+ <Unit40>
+ <CursorPos X="11" Y="172"/>
+ <Filename Value="E:\cvs_local\fpc\rtl\objpas\strutils.pp"/>
+ <TopLine Value="161"/>
+ <UnitName Value="strutils"/>
+ <UsageCount Value="8"/>
+ </Unit40>
+ <Unit41>
+ <CursorPos X="3" Y="1230"/>
+ <Filename Value="E:\cvs_local\lazarus\components\rtticontrols\rttigrids.pas"/>
+ <TopLine Value="1219"/>
+ <UnitName Value="RTTIGrids"/>
+ <UsageCount Value="8"/>
+ </Unit41>
+ <Unit42>
+ <CursorPos X="6" Y="2"/>
+ <Filename Value="E:\cvs_local\fpc\fcl\inc\streamex.pp"/>
+ <TopLine Value="1"/>
+ <UnitName Value="streamex"/>
+ <UsageCount Value="7"/>
+ </Unit42>
+ <Unit43>
+ <CursorPos X="75" Y="18"/>
+ <Filename Value="E:\cvs_local\fpc\fcl\Makefile.fpc"/>
+ <SyntaxHighlighter Value="None"/>
+ <TopLine Value="9"/>
+ <UsageCount Value="7"/>
+ </Unit43>
+ <Unit44>
+ <CursorPos X="6" Y="16"/>
+ <Filename Value="E:\cvs_local\fpc\fcl\inc\streamio.pp"/>
+ <TopLine Value="5"/>
+ <UnitName Value="StreamIO"/>
+ <UsageCount Value="7"/>
+ </Unit44>
+ <Unit45>
+ <CursorPos X="63" Y="100"/>
+ <Filename Value="E:\z\svifpc\io\source\core\InstantUtils.pas"/>
+ <TopLine Value="85"/>
+ <UnitName Value="InstantUtils"/>
+ <UsageCount Value="7"/>
+ </Unit45>
+ <Unit46>
+ <CursorPos X="16" Y="20"/>
+ <Filename Value="D:\fpc_uberto\lazarus\lcl\Graphics.pp"/>
+ <TopLine Value="17"/>
+ <UnitName Value="...
[truncated message content] |
|
From: <na...@us...> - 2006-11-14 16:16:50
|
Revision: 712
http://svn.sourceforge.net/instantobjects/revision/?rev=712&view=rev
Author: nandod
Date: 2006-11-14 08:16:43 -0800 (Tue, 14 Nov 2006)
Log Message:
-----------
* XML broker: now only creates one file for each object, in the concrete class' folder.
* XML broker: removed support for versioning and utf-8 "BOT" encoding.
* svn:ignore set on a bunch of folders.
Modified Paths:
--------------
trunk/Source/Brokers/XML/InstantXML.pas
trunk/Source/Brokers/XML/InstantXMLConnectionDefEdit.dfm
trunk/Source/Brokers/XML/InstantXMLConnectionDefEdit.pas
Property Changed:
----------------
trunk/Demos/Intro/
trunk/Demos/PrimerCross/
trunk/Demos/PrimerCross/Model/
trunk/Source/Brokers/BDE/D2006/
trunk/Source/Brokers/DBX/D2006/
trunk/Source/Brokers/IBX/D2006/
trunk/Source/Brokers/XML/
trunk/Source/Brokers/XML/D2006/
trunk/Source/Catalogs/MSSql/D2006/
trunk/Source/Core/
trunk/Source/Design/
trunk/Source/Design/D2006/
trunk/Tests/
trunk/Tests/ubmock/src/
Property changes on: trunk/Demos/Intro
___________________________________________________________________
Name: svn:ignore
- *.dcu
*.~*
*.ddp
*.exe
+ *.dcu
*.~*
*.ddp
*.exe
__history
*.identcache
*.local
Property changes on: trunk/Demos/PrimerCross
___________________________________________________________________
Name: svn:ignore
- *.dcu
*.~*
*.ddp
*.exe
+ *.dcu
*.~*
*.ddp
*.exe
__history
*.identcache
*.local
Property changes on: trunk/Demos/PrimerCross/Model
___________________________________________________________________
Name: svn:ignore
+ *.dcu
Property changes on: trunk/Source/Brokers/BDE/D2006
___________________________________________________________________
Name: svn:ignore
- *.dcu
__history
*.local
*.cfg
+ *.dcu
__history
*.local
*.cfg
*.identcache
Property changes on: trunk/Source/Brokers/DBX/D2006
___________________________________________________________________
Name: svn:ignore
- *.dcu
__history
*.local
*.cfg
+ *.dcu
__history
*.local
*.cfg
*.identcache
Property changes on: trunk/Source/Brokers/IBX/D2006
___________________________________________________________________
Name: svn:ignore
- __history
*.dcu
*.local
*.cfg
+ __history
*.dcu
*.local
*.cfg
*.identcache
Property changes on: trunk/Source/Brokers/XML
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
__history
*.~pas
Property changes on: trunk/Source/Brokers/XML/D2006
___________________________________________________________________
Name: svn:ignore
- *.dcu
__history
*.local
*.cfg
+ *.dcu
__history
*.local
*.cfg
*.identcache
Modified: trunk/Source/Brokers/XML/InstantXML.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXML.pas 2006-11-02 03:51:57 UTC (rev 711)
+++ trunk/Source/Brokers/XML/InstantXML.pas 2006-11-14 16:16:43 UTC (rev 712)
@@ -51,61 +51,47 @@
XML_EXT = 'xml';
DOT_XML_EXT = '.' + XML_EXT;
XML_WILDCARD = '*' + DOT_XML_EXT;
-{$IFNDEF LINUX}
-{$IFDEF D5}PathDelim = '\';
-{$ENDIF}
-{$ENDIF}
+ {$IFNDEF D6+}
+ PathDelim = '\';
+ {$ENDIF}
type
- TXMLFileFormat = (xffUtf8, xffUtf8BOT, xffIso);
+ TXMLFileFormat = (xffUtf8, xffIso);
- { TXMLFilesAccessor }
TXMLFilesAccessor = class(TCustomConnection)
private
- FConnected: boolean;
+ FConnected: Boolean;
FRootFolder: string;
- FUseVersioning: Boolean;
FXMLFileFormat: TXMLFileFormat;
- procedure MkStorageDir(const StorageName: string);
+ procedure CreateStorageDir(const AStorageName: string);
function GetRootFolder: string;
- procedure SetRootFolder(const Value: string);
- function SaveToFileXML_UTF8(AObject: TInstantObject; const FileName:
- string): boolean;
+ procedure SetRootFolder(const AValue: string);
+ function SaveToFileXML_UTF8(AObject: TInstantObject;
+ const AFileName: string): Boolean;
function LoadFromFileXML_UTF8(AObject: TInstantObject; const FileName:
string): boolean;
function PlainObjectFileName(const StorageName, ClassName, Id: string):
string;
- function NewObjectFileName(const StorageName, ClassName, Id: string):
- string;
- function DeleteObjectFileName(const StorageName, ClassName, Id: string):
- string;
- function VersionFromFilename(const longfilename: string): Integer;
+ function ObjectUpdateCountFromFileName(const AFileName: string): Integer;
protected
procedure DoConnect; override;
procedure DoDisconnect; override;
function GetConnected: Boolean; override;
public
constructor Create(AOwner: TComponent); override;
- function LastObjectFileName(const StorageName, ClassName, Id: string):
- string;
function ReadInstantObject(AObject: TInstantObject; const StorageName,
- AObjectId: string;
- out Version: integer): boolean;
- function WriteInstantObject(AObject: TInstantObject; const StorageName:
- string;
- out Version: integer): boolean;
- function DeleteInstantObject(AObject: TInstantObject; const StorageName:
- string): boolean;
- function Locate(const StorageName, AObjectClassName, AObjectId: string):
- Boolean;
- function CheckConflict(AObject: TInstantObject; const StorageName,
- AObjectId: string): Boolean;
- procedure LoadFileList(FFileListAccessor: TStringList; const StorageName:
- string);
+ AObjectId: string; out AObjectUpdateCount: Integer): Boolean;
+ function WriteInstantObject(AObject: TInstantObject;
+ const AStorageName: string; out AObjectUpdateCount: Integer): Boolean;
+ function DeleteInstantObject(AObject: TInstantObject;
+ const AStorageName: string): Boolean;
+ function Locate(const AStorageName, AObjectClassName, AObjectId: string): Boolean;
+ function CheckConflict(AObject: TInstantObject;
+ const AStorageName, AObjectId: string): Boolean;
+ procedure LoadFileList(const AFileList: TStringList;
+ const AStorageNames: TStrings);
published
property RootFolder: string read GetRootFolder write SetRootFolder;
- property UseVersioning: Boolean read FUseVersioning write FUseVersioning
- default False;
property XMLFileFormat: TXMLFileFormat read FXMLFileFormat write
FXMLFileFormat default xffUtf8;
end;
@@ -113,7 +99,6 @@
TInstantXMLConnectionDef = class(TInstantConnectionBasedConnectionDef)
private
FRootFolder: string;
- FUseVersioning: Boolean;
FXMLFileFormat: TXMLFileFormat;
protected
function CreateConnection(AOwner: TComponent): TCustomConnection; override;
@@ -123,8 +108,6 @@
class function ConnectorClass: TInstantConnectorClass; override;
published
property RootFolder: string read FRootFolder write FRootFolder;
- property UseVersioning: Boolean read FUseVersioning write FUseVersioning
- default False;
property XMLFileFormat: TXMLFileFormat read FXMLFileFormat write
FXMLFileFormat default xffUtf8;
end;
@@ -203,10 +186,9 @@
function Locate(AObject: TObject; const AObjectId: string): Boolean;
virtual;
function ReadInstantObject(AObject: TInstantObject; const AObjectId: string;
- out Version: integer): boolean;
- function WriteInstantObject(AObject: TInstantObject; const AObjectId:
- string;
- out Version: integer): boolean;
+ out AObjectUpdateCount: Integer): Boolean;
+ function WriteInstantObject(AObject: TInstantObject;
+ const AObjectId: string; out AObjectUpdateCount: Integer): Boolean;
public
constructor Create(ABroker: TInstantCustomRelationalBroker;
const AStorageName: string);
@@ -225,13 +207,19 @@
FObjectReferenceList: TObjectList;
FStatement: string;
FParamsObject: TParams;
+ FStorageNames: TStringList;
+ FObjectClassNames: TStringList;
procedure DestroyObjectReferenceList;
function GetObjectReferenceCount: Integer;
function GetObjectReferenceList: TObjectList;
function GetObjectReferences(Index: Integer): TInstantObjectReference;
- procedure InitObjectReferences(FileListAccessor: TStringList);
+ // Creates an object reference for each item in AFileList that represents
+ // an object of a class included in FObjectClassNames.
+ procedure InitObjectReferences(const AFileList: TStrings);
function GetParamsObject: TParams;
function GetConnector: TInstantXMLConnector;
+ procedure SetStorageNames(const Value: TStringList);
+ procedure SetObjectClassNames(const Value: TStringList);
protected
class function TranslatorClass: TInstantRelationalTranslatorClass; override;
function GetActive: Boolean; override;
@@ -256,13 +244,16 @@
GetObjectReferences;
property ParamsObject: TParams read GetParamsObject;
public
- StorageName: string;
+ procedure AfterConstruction; override;
+ // List of folders from which files should be loaded in InternalOpen.
+ property StorageNames: TStringList read FStorageNames write SetStorageNames;
+ // Used to filter by class name the files loaded during InternalOpen.
+ property ObjectClassNames: TStringList read FObjectClassNames write SetObjectClassNames;
destructor Destroy; override;
property Connector: TInstantXMLConnector read GetConnector;
end;
- // Base class for all steps that work by executing one or more commands
- // (that is, a script) each.
+ // Base class for all XML database build commands.
TInstantDBBuildXMLCommand = class(TInstantDBBuildCommand)
private
function GetConnector: TInstantXMLConnector;
@@ -306,7 +297,7 @@
SysUtils, InstantConsts, InstantClasses, TypInfo, InstantXMLCatalog,
InstantXMLConnectionDefEdit,
{$IFDEF MSWINDOWS}
-{$IFDEF D5}
+{$IFNDEF D6+}
FileCtrl,
{$ENDIF}
Windows, Controls;
@@ -321,10 +312,9 @@
function GetFileClassName(const FileName: string): string; forward;
function GetFileId(const FileName: string): string; forward;
-function GetFileVersion(const FileName: string): Integer; forward;
+function GetObjectUpdateCount(const FileName: string): Integer; forward;
-{$IFDEF D5}
-
+{$IFNDEF D6+}
function IncludeTrailingPathDelimiter(const S: string): string;
begin
Result := IncludeTrailingBackSlash(S);
@@ -337,7 +327,6 @@
R: Integer;
PathWithWildCards: string;
begin
- FileList.Clear;
PathWithWildCards := IncludeTrailingPathDelimiter(Path) + XML_WILDCARD;
//Find the first file
R := SysUtils.FindFirst(PathWithWildCards, faAnyFile, SearchRec);
@@ -352,69 +341,6 @@
end;
end;
-// fill filelist with unique names of files, using the last version
-// number or skipping the deleted files (version = 0)
-// code badly needs to be optimized - marcoc
-
-procedure GlobalLoadFileListLastVersion(const Path: string; FileList:
- TStringList);
-var
- i, currentVersion, activeVersionPos, newVersion: Integer;
- currentid, shortFileName: string;
-begin
- // first load all of them
- GlobalLoadFileList(Path, FileList);
-
- // now remove version duplicates and deleted documents
- FileList.Sorted := True;
- currentid := '';
- currentVersion := -1;
- activeVersionPos := -1;
- for i := FileList.Count - 1 downto 0 do
- begin
- shortFileName := extractFilename(filelist[i]);
- if currentid = GetFileId(shortFileName) then
- begin
- newVersion := GetFileVersion(shortFileName);
- // if the file is marked as deleted
- if newVersion = 0 then
- begin
- CurrentVersion := NewVersion;
- fileList.Delete(i);
- activeVersionPos := 0;
- if activeVersionPos <> -1 then
- fileList.Delete(activeVersionPos);
- end
- // if it is already marked as deleted, skip it
- else if currentVersion = 0 then
- begin
- fileList.Delete(i);
- end
- // if the file is "newer"
- else if currentVersion < newVersion then
- begin
- // delete the other version, as this is newer
- CurrentVersion := GetFileVersion(shortFileName);
- if activeVersionPos <> -1 then
- fileList.Delete(activeVersionPos);
- activeVersionPos := i;
- end
- else
- // delete this version, which is older
- fileList.Delete(i);
- end
- else // we have moved to a new objectid, reset all
- begin
- currentid := GetFileId(shortFileName);
- currentVersion := GetFileVersion(shortFileName);
- activeVersionPos := i;
- // if the first file of this instance is marked as deleted...
- if CurrentVersion = 0 then
- fileList.Delete(i);
- end;
- end;
-end;
-
function RightPos(const ASubString, AString: string): Integer;
var
I: Integer;
@@ -450,7 +376,7 @@
Delete(Result, RightPos('.', Result), MaxInt);
end;
-function GetFileVersion(const FileName: string): Integer;
+function GetObjectUpdateCount(const FileName: string): Integer;
var
S: string;
P: Integer;
@@ -481,7 +407,6 @@
begin
Result := TXMLFilesAccessor.Create(AOwner);
TXMLFilesAccessor(Result).RootFolder := RootFolder;
- TXMLFilesAccessor(Result).UseVersioning := UseVersioning;
TXMLFilesAccessor(Result).FXMLFileFormat := XMLFileFormat;
end;
@@ -568,7 +493,7 @@
ConflictAction: TInstantConflictAction; Info: PInstantOperationInfo);
var
AInfo: TInstantOperationInfo;
- Version: Integer;
+ LObjectUpdateCount: Integer;
begin
if not Assigned(Info) then
begin
@@ -577,13 +502,13 @@
end;
//Read object from file
Info.Success := Locate(AObject, AObjectId) and
- ReadInstantObject(AObject, AObjectId, Version);
+ ReadInstantObject(AObject, AObjectId, LObjectUpdateCount);
Info.Conflict := not Info.Success;
if Info.Success then
begin
if Map.IsRootMap then
begin
- Broker.SetObjectUpdateCount(AObject, Version);
+ Broker.SetObjectUpdateCount(AObject, LObjectUpdateCount);
end;
end
else
@@ -625,7 +550,7 @@
Broker.SetObjectUpdateCount(AObject, version);
end
else
- Info.Success := False;
+ Info.Success := True;
except
on E: Exception do
begin
@@ -651,12 +576,11 @@
FStorageName, AObject.ClassName, AObjectId);
end;
-function TInstantXMLResolver.ReadInstantObject(AObject: TInstantObject; const
- AObjectId: string;
- out Version: integer): boolean;
+function TInstantXMLResolver.ReadInstantObject(AObject: TInstantObject;
+ const AObjectId: string; out AObjectUpdateCount: Integer): Boolean;
begin
Result := Broker.Connector.Connection.ReadInstantObject(AObject, FStorageName,
- AObjectId, Version);
+ AObjectId, AObjectUpdateCount);
end;
procedure TInstantXMLResolver.ResetAttributes(AObject: TInstantObject;
@@ -665,12 +589,17 @@
end;
-function TInstantXMLResolver.WriteInstantObject(AObject: TInstantObject; const
- AObjectId: string;
- out Version: integer): boolean;
+function TInstantXMLResolver.WriteInstantObject(AObject: TInstantObject;
+ const AObjectId: string; out AObjectUpdateCount: Integer): Boolean;
begin
- Result := Broker.Connector.Connection.WriteInstantObject(AObject,
- FStorageName, Version);
+ if AObject.Metadata.TableName = FStorageName then
+ Result := Broker.Connector.Connection.WriteInstantObject(AObject,
+ FStorageName, AObjectUpdateCount)
+ else
+ begin
+ Result := True;
+ AObjectUpdateCount := 1;
+ end;
end;
{ TInstantXMLConnector }
@@ -710,24 +639,12 @@
end;
procedure TInstantXMLConnector.InternalBuildDatabase(Scheme: TInstantScheme);
-var
- i: integer;
- StorageName: string;
begin
CheckConnection;
- //build RootFolder if not exists
if not DirectoryExists(Connection.RootFolder) and
- not ForceDirectories(Connection.RootFolder) then
+ not ForceDirectories(Connection.RootFolder) then
raise EInOutError.CreateFmt(SCannotCreateDirectory,
[Connection.RootFolder]);
-
- //build SubFolder for each "storage name"
- for i := 0 to Scheme.TableMetadataCount - 1 do
- begin
- StorageName := Scheme.TableMetadatas[i].Name;
- if not DirectoryExists(Connection.RootFolder + StorageName) then
- MkDir(Connection.RootFolder + StorageName);
- end;
end;
procedure TInstantXMLConnector.InternalCommitTransaction;
@@ -840,10 +757,23 @@
{ TInstantXMLQuery }
+procedure TInstantXMLQuery.AfterConstruction;
+begin
+ inherited;
+ FStorageNames := TStringList.Create;
+ FStorageNames.Sorted := True;
+ FStorageNames.Duplicates := dupIgnore;
+ FObjectClassNames := TStringList.Create;
+ FObjectClassNames.Sorted := True;
+ FObjectClassNames.Duplicates := dupIgnore;
+end;
+
destructor TInstantXMLQuery.Destroy;
begin
DestroyObjectReferenceList;
FParamsObject.Free;
+ FreeAndNil(FStorageNames);
+ FreeAndNil(FObjectClassNames);
inherited;
end;
@@ -897,31 +827,35 @@
Result := FStatement;
end;
-procedure TInstantXMLQuery.InitObjectReferences(FileListAccessor: TStringList);
+procedure TInstantXMLQuery.InitObjectReferences(const AFileList: TStrings);
var
- i: integer;
+ I: Integer;
- function CreateObjectReference(const FileName: string):
- TInstantObjectReference;
+ procedure AddObjectReference(const AFileName: string);
var
- ClassName, ObjectId: string;
+ vClassName, vObjectId: string;
+ vObjectReference: TInstantObjectReference;
+ vIndex: Integer;
begin
- ClassName := GetFileClassName(FileName);
- ObjectId := GetFileId(FileName);
- Result := TInstantObjectReference.Create(nil, True);
- try
- Result.ReferenceObject(ClassName, ObjectId);
- except
- Result.Free;
- raise
+ vClassName := GetFileClassName(AFileName);
+ if FObjectClassNames.Find(vClassName, vIndex) then
+ begin
+ vObjectId := GetFileId(AFileName);
+ vObjectReference := TInstantObjectReference.Create(nil, True);
+ try
+ vObjectReference.ReferenceObject(vClassName, vObjectId);
+ ObjectReferenceList.Add(vObjectReference);
+ except
+ ObjectReferenceList.Remove(vObjectReference);
+ vObjectReference.Free;
+ raise;
+ end;
end;
end;
begin
- for i := 0 to FileListAccessor.Count - 1 do
- begin
- ObjectReferenceList.Add(CreateObjectReference(FileListAccessor.Strings[i]));
- end;
+ for I := 0 to AFileList.Count - 1 do
+ AddObjectReference(AFileList[I]);
end;
function TInstantXMLQuery.InternalAddObject(AObject: TObject): Integer;
@@ -978,16 +912,16 @@
procedure TInstantXMLQuery.InternalOpen;
var
- FFileListAccessor: TStringList;
+ vFileList: TStringList;
begin
inherited;
- FFileListAccessor := TStringList.Create;
+ vFileList := TStringList.Create;
try
Connector.Connection.Open;
- Connector.Connection.LoadFileList(FFileListAccessor, StorageName);
- InitObjectReferences(FFileListAccessor);
+ Connector.Connection.LoadFileList(vFileList, FStorageNames);
+ InitObjectReferences(vFileList);
finally
- FFileListAccessor.Free;
+ vFileList.Free;
end;
end;
@@ -1034,6 +968,11 @@
Result := ObjectReferences[Index].HasInstance;
end;
+procedure TInstantXMLQuery.SetObjectClassNames(const Value: TStringList);
+begin
+ FObjectClassNames.Assign(Value);
+end;
+
procedure TInstantXMLQuery.SetParams(Value: TParams);
begin
inherited;
@@ -1046,6 +985,11 @@
FStatement := Value;
end;
+procedure TInstantXMLQuery.SetStorageNames(const Value: TStringList);
+begin
+ FStorageNames.Assign(Value);
+end;
+
class function TInstantXMLQuery.TranslatorClass:
TInstantRelationalTranslatorClass;
begin
@@ -1059,16 +1003,16 @@
Result := IncludeTrailingPathDelimiter(FRootFolder);
end;
-procedure TXMLFilesAccessor.SetRootFolder(const Value: string);
+procedure TXMLFilesAccessor.SetRootFolder(const AValue: string);
begin
- if FRootFolder <> Value then
+ if FRootFolder <> AValue then
begin
- FRootFolder := Value;
+ FRootFolder := AValue;
end;
end;
function TXMLFilesAccessor.SaveToFileXML_UTF8(AObject: TInstantObject;
- const FileName: string): boolean;
+ const AFileName: string): Boolean;
var
strstream: TStringStream;
fileStream: TFileStream;
@@ -1077,8 +1021,8 @@
strstream := TStringStream.Create('');
try
InstantWriteObject(strStream, sfXML, AObject);
-{$IFNDEF VER130}
- if FXMLFileFormat in [xffUtf8, xffUtf8Bot] then
+{$IFDEF D6+}
+ if FXMLFileFormat = xffUtf8 then
DataStr := AnsiToUtf8(XML_UTF8_HEADER + strStream.DataString)
else
DataStr := XML_ISO_HEADER + strStream.DataString;
@@ -1088,7 +1032,7 @@
finally
strStream.Free;
end;
- fileStream := TFileStream.Create(FileName, fmCreate);
+ fileStream := TFileStream.Create(AFileName, fmCreate);
try
Result := fileStream.Write(DataStr[1], Length(DataStr)) <> 0;
finally
@@ -1116,8 +1060,6 @@
begin
fileStream := TFileStream.Create(FileName, fmOpenRead);
try
- // if FXMLFileFormat = xffUtf8Bot then
- // check/skip BOT
SetLength(strUtf8, fileStream.Size);
Result := fileStream.Read(strUtf8[1], fileStream.Size) <> 0;
// skip XML HEADER (until the parser is "dumb")
@@ -1126,8 +1068,8 @@
fileStream.Free;
end;
-{$IFNDEF VER130}
- if FXMLFileFormat in [xffUtf8, xffUtf8Bot] then
+{$IFDEF D6+}
+ if FXMLFileFormat = xffUtf8 then
strUtf8 := Utf8ToAnsi(strUtf8);
{$ENDIF}
@@ -1139,223 +1081,86 @@
end;
end;
-function TXMLFilesAccessor.ReadInstantObject(AObject: TInstantObject; const
- StorageName, AObjectId: string;
- out Version: integer): boolean;
+function TXMLFilesAccessor.ReadInstantObject(AObject: TInstantObject;
+ const StorageName, AObjectId: string; out AObjectUpdateCount: Integer): Boolean;
var
- filename: string;
+ LFileName: string;
begin
- if FUseVersioning then
- filename := LastObjectFileName(StorageName, AObject.ClassName, AObjectId)
- else
- filename := PlainObjectFileName(StorageName, AObject.ClassName, AObjectId);
- Result := LoadFromFileXML_UTF8(AObject, filename);
- Version := VersionFromFilename(filename);
+ LFileName := PlainObjectFileName(StorageName, AObject.ClassName, AObjectId);
+ Result := LoadFromFileXML_UTF8(AObject, LFileName);
+ AObjectUpdateCount := ObjectUpdateCountFromFileName(LFileName);
end;
-function TXMLFilesAccessor.WriteInstantObject(AObject: TInstantObject; const
- StorageName: string;
- out Version: integer): boolean;
+function TXMLFilesAccessor.WriteInstantObject(AObject: TInstantObject;
+ const AStorageName: string; out AObjectUpdateCount: Integer): Boolean;
var
- filename: string;
+ LFileName: string;
begin
- MkStorageDir(StorageName);
- if FUseVersioning then
- filename := NewObjectFileName(StorageName, AObject.ClassName, AObject.Id)
- else
- filename := PlainObjectFileName(StorageName, AObject.ClassName, AObject.Id);
- Result := SavetoFileXML_UTF8(AObject, filename);
- Version := VersionFromFilename(filename);
+ CreateStorageDir(AStorageName);
+ LFileName := PlainObjectFileName(AStorageName, AObject.ClassName, AObject.Id);
+ Result := SavetoFileXML_UTF8(AObject, LFileName);
+ AObjectUpdateCount := ObjectUpdateCountFromFileName(LFileName);
end;
-function TXMLFilesAccessor.Locate(const StorageName, AObjectClassName,
+function TXMLFilesAccessor.Locate(const AStorageName, AObjectClassName,
AObjectId: string): Boolean;
var
filename: string;
begin
- MkStorageDir(StorageName);
- if FUseVersioning then
- begin
- filename := LastObjectFileName(StorageName, AObjectClassName, AObjectId);
- Result := FileExists(filename) and (VersionFromFilename(filename) <> 0);
- end
- else
- begin
- filename := PlainObjectFileName(StorageName, AObjectClassName, AObjectId);
- Result := FileExists(filename);
- end;
+ filename := PlainObjectFileName(AStorageName, AObjectClassName, AObjectId);
+ Result := FileExists(filename);
end;
-procedure TXMLFilesAccessor.MkStorageDir(const StorageName: string);
+procedure TXMLFilesAccessor.CreateStorageDir(const AStorageName: string);
begin
- if not DirectoryExists(RootFolder + StorageName) then
- MkDir(RootFolder + StorageName);
+ if not DirectoryExists(RootFolder + AStorageName) then
+ MkDir(RootFolder + AStorageName);
end;
-function TXMLFilesAccessor.LastObjectFileName(const StorageName, ClassName,
- Id: string): string;
-var
- sr: TSearchRec;
- lastnum, nCurrent: Integer;
+function TXMLFilesAccessor.ObjectUpdateCountFromFileName(
+ const AFileName: string): Integer;
begin
- if FindFirst(
- RootFolder + StorageName + PathDelim + ClassName + '.' + Id + '.*' +
- DOT_XML_EXT,
- faAnyFile, SR) = 0 then
- try
- Result := RootFolder + StorageName + PathDelim + sr.Name;
- lastnum := VersionFromFileName(sr.Name);
- while FindNext(sr) = 0 do
- begin
- nCurrent := VersionFromFilename(sr.Name);
- // version "zero" means the file has been deleted
- if (nCurrent = 0) then
- begin
- Result := RootFolder + StorageName + PathDelim + sr.Name;
- Break;
- end;
- if nCurrent > lastnum then
- begin
- lastnum := nCurrent;
- Result := RootFolder + StorageName + PathDelim + sr.Name;
- end;
- end;
- finally
- SysUtils.FindClose(sr);
- end
- else
- Result := ''; // not found, new object/file
+ Result := GetObjectUpdateCount(ExtractFileName(AFileName));
end;
-function TXMLFilesAccessor.VersionFromFilename(const longfilename: string):
- Integer;
-begin
- Result := GetFileVersion(ExtractFileName(longfilename));
-end;
-
-function TXMLFilesAccessor.NewObjectFileName(const StorageName, ClassName,
- Id: string): string;
-var
- nVersion: Integer;
- filename: string;
-begin
- // grab the current "last" version number
- if FUseVersioning then
- begin
- filename := LastObjectFileName(storagename, ClassName, Id);
- if filename <> '' then
- begin
- nVersion := VersionFromFilename(filename);
- inc(nVersion);
- end
- else
- nVersion := 1; // new object, first version
- end
- else
- begin
- filename := PlainObjectFileName(StorageName, ClassName, Id);
- nVersion := 1; // no version always 1
- end;
- Result := RootFolder + StorageName + PathDelim + ClassName + '.' + Id + '.' +
- IntToStr(nVersion) + DOT_XML_EXT;
-end;
-
function TXMLFilesAccessor.DeleteInstantObject(AObject: TInstantObject;
- const StorageName: string): boolean;
+ const AStorageName: string): Boolean;
begin
- if UseVersioning then
- begin
- // save the document once more with 0 in the version name
- Result := SavetoFileXML_UTF8(AObject,
- DeleteObjectFileName(StorageName, AObject.ClassName, AObject.Id));
- end
- else
- begin
- // delete file from disk
- Result := SysUtils.DeleteFile(PlainObjectFileName(StorageName,
- AObject.ClassName, AObject.Id));
- end;
+ Result := SysUtils.DeleteFile(PlainObjectFileName(AStorageName,
+ AObject.ClassName, AObject.Id));
end;
-function TXMLFilesAccessor.DeleteObjectFileName(const StorageName,
- ClassName, Id: string): string;
-begin
- // mark deleted file as version 0
- Result := RootFolder + StorageName + PathDelim + ClassName + '.' + Id + '.' +
- IntToStr(0) + DOT_XML_EXT;
-end;
-
constructor TXMLFilesAccessor.Create(AOwner: TComponent);
begin
inherited;
-
- // default values for properties
- FUseVersioning := False;
FXMLFileFormat := xffUtf8;
end;
function TXMLFilesAccessor.PlainObjectFileName(const StorageName,
ClassName, Id: string): string;
begin
- // ignore versioning
- //FileName: ClassName.Id.UpdateCount.xml
Result := RootFolder + StorageName + PathDelim + ClassName + '.' + Id + '.1' +
DOT_XML_EXT;
end;
function TXMLFilesAccessor.CheckConflict(AObject: TInstantObject;
- const StorageName, AObjectId: string): Boolean;
-var
- version: Integer;
+ const AStorageName, AObjectId: string): Boolean;
begin
- if FUseVersioning then
- begin
- // check version of XML object
- version := GetFileVersion(LastObjectFileName
- (StorageName, AObject.ClassName, AObjectId));
- Result := (version = 0) or (Version <> AObject.UpdateCount);
- end
- else
- Result := False; // don't care about updatecount and versioning
+ Result := False; // don't care about updatecount
end;
-procedure TXMLFilesAccessor.LoadFileList(FFileListAccessor: TStringList; const
- StorageName: string);
-//var
- // xmldom: TGeoXslProcess; - to be finished by marcoc
- //strXPath, - to be finished by marcoc
- // result: string;
- // posOpenSquare, posCloseSquare: Integer;
+procedure TXMLFilesAccessor.LoadFileList(const AFileList: TStringList;
+ const AStorageNames: TStrings);
+var
+ I: Integer;
begin
- if FUseVersioning then
- GlobalLoadFileListLastVersion(RootFolder + StorageName, FFileListAccessor)
- else
- GlobalLoadFileList(RootFolder + StorageName, FFileListAccessor);
-
- // tentative XPATH support by marcoc
- {posOpenSquare := Pos ('[', Statement); - to be finished by marcoc
- posCloseSquare := Pos (']', Statement);
- strXPath := Copy (Statement, posOpenSquare, posCloseSquare - posOpenSquare + 1);
- strXpath := '/' + GetObjectClassName + strXPath;
- for i := FFileListAccessor.Count - 1 downto 0 do
- begin
- xmldom := TGeoXslProcess.Create;
- try
- xmldom.LoadXmlFile(Connector.Connection.RootFolder+StorageName +
- PathDelim + FFileListAccessor[i]);
- result := xmldom.applyXPathToXml(strXpath);
- if result = '' then
- FFileListAccessor.Delete (i);
- finally
- xmldom.Free;
- end;
- end; - to be finished by marcoc }
-
+ AFileList.Clear;
+ for I := 0 to AStorageNames.Count - 1 do
+ GlobalLoadFileList(RootFolder + AStorageNames[I], AFileList);
end;
procedure TXMLFilesAccessor.DoConnect;
begin
- //Check rootfolder
if DirectoryExists(RootFolder) then
FConnected := True;
end;
@@ -1374,12 +1179,38 @@
function TInstantXMLTranslator.TranslateClassRef(
ClassRef: TInstantIQLClassRef; Writer: TInstantIQLWriter): Boolean;
+var
+ vInheritedClasses: TList;
+ I: Integer;
begin
Result := inherited TranslateClassRef(ClassRef, Writer);
if TablePathCount > 0 then
- (Query as TInstantXMLQuery).StorageName := ClassTablePath
+ begin
+ (Query as TInstantXMLQuery).StorageNames.Text := TablePaths[0];
+ (Query as TInstantXMLQuery).ObjectClassNames.Text := ClassRef.ObjectClassName;
+ if ClassRef.Any then
+ begin
+ // Need to add all inherited classes as well.
+ vInheritedClasses := TList.Create;
+ try
+ InstantGetClasses(vInheritedClasses, InstantFindClass(ClassRef.ObjectClassName));
+ for I := 0 to vInheritedClasses.Count - 1 do
+ begin
+ (Query as TInstantXMLQuery).StorageNames.Add(
+ TInstantObjectClass(vInheritedClasses[I]).Metadata.TableName);
+ (Query as TInstantXMLQuery).ObjectClassNames.Add(
+ TInstantObjectClass(vInheritedClasses[I]).ClassName);
+ end;
+ finally
+ FreeAndNil(vInheritedClasses);
+ end;
+ end;
+ end
else
- (Query as TInstantXMLQuery).StorageName := '';
+ begin
+ (Query as TInstantXMLQuery).StorageNames.Clear;
+ (Query as TInstantXMLQuery).ObjectClassNames.Clear;
+ end;
end;
{ TInstantDBBuildXMLCommand }
@@ -1420,14 +1251,12 @@
Connector.CheckConnection;
vDatabaseName := Connector.DatabaseName;
- //build RootFolder if not exists
if not DirectoryExists(vDatabaseName) and
- not ForceDirectories(vDatabaseName) then
+ not ForceDirectories(vDatabaseName) then
raise EInOutError.CreateFmt(SCannotCreateDirectory, [vDatabaseName]);
- // Create a subFolder for the "storage name"
- if not DirectoryExists(vDatabaseName + TableMetadata.Name) then
- MkDir(vDatabaseName + TableMetadata.Name);
+ // No need to create the class-specific folders, which will be created
+ // when instances are written.
end;
function TInstantDBBuildXMLDropTableCommand.GetTableMetadata:
Modified: trunk/Source/Brokers/XML/InstantXMLConnectionDefEdit.dfm
===================================================================
--- trunk/Source/Brokers/XML/InstantXMLConnectionDefEdit.dfm 2006-11-02 03:51:57 UTC (rev 711)
+++ trunk/Source/Brokers/XML/InstantXMLConnectionDefEdit.dfm 2006-11-14 16:16:43 UTC (rev 712)
@@ -1,9 +1,9 @@
object InstantXMLConnectionDefEditForm: TInstantXMLConnectionDefEditForm
Left = 425
Top = 292
- Width = 302
- Height = 190
Caption = 'XML Connection'
+ ClientHeight = 133
+ ClientWidth = 294
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -17,7 +17,7 @@
TextHeight = 13
object BottomBevel: TBevel
Left = 0
- Top = 133
+ Top = 103
Width = 294
Height = 2
Align = alBottom
@@ -27,7 +27,7 @@
Left = 0
Top = 0
Width = 294
- Height = 133
+ Height = 103
Align = alClient
BevelOuter = bvNone
TabOrder = 0
@@ -41,7 +41,7 @@
end
object Label1: TLabel
Left = 8
- Top = 83
+ Top = 60
Width = 69
Height = 13
Caption = 'XML &encoding'
@@ -63,27 +63,19 @@
TabOrder = 1
OnClick = FolderButtonClick
end
- object cbVersioning: TCheckBox
+ object EncodingComboBox: TComboBox
Left = 8
- Top = 60
- Width = 149
- Height = 17
- Caption = 'Enable file versioning'
- TabOrder = 2
- end
- object cbEncoding: TComboBox
- Left = 8
- Top = 98
+ Top = 75
Width = 145
Height = 21
Style = csDropDownList
- ItemHeight = 13
- TabOrder = 3
+ ItemHeight = 0
+ TabOrder = 2
end
end
object BottomPanel: TPanel
Left = 0
- Top = 135
+ Top = 105
Width = 294
Height = 28
Align = alBottom
Modified: trunk/Source/Brokers/XML/InstantXMLConnectionDefEdit.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXMLConnectionDefEdit.pas 2006-11-02 03:51:57 UTC (rev 711)
+++ trunk/Source/Brokers/XML/InstantXMLConnectionDefEdit.pas 2006-11-14 16:16:43 UTC (rev 712)
@@ -48,12 +48,7 @@
QForms, QStdCtrls, QControls, QExtCtrls;
{$ENDIF}
-const
- AXMLFileFormatStr : Array[TXMLFileFormat] of string =
- ('xffUtf8', 'xffUtf8BOT', 'xffIso');
-
type
-
TInstantXMLConnectionDefEditForm = class(TForm)
BottomBevel: TBevel;
BottomPanel: TPanel;
@@ -64,8 +59,7 @@
ButtonsPanel: TPanel;
OkButton: TButton;
CancelButton: TButton;
- cbVersioning: TCheckBox;
- cbEncoding: TComboBox;
+ EncodingComboBox: TComboBox;
Label1: TLabel;
procedure FolderButtonClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
@@ -80,6 +74,7 @@
{$R *.dfm}
uses
+ TypInfo,
{$IFDEF MSWINDOWS}
FileCtrl;
{$ELSE}
@@ -91,19 +86,15 @@
procedure TInstantXMLConnectionDefEditForm.LoadData(
ConnectionDef: TInstantXMLConnectionDef);
begin
- { TODO: Copy data from ConnectionDef to edit controls }
RootDirEdit.Text := ConnectionDef.RootFolder;
- cbEncoding.ItemIndex := Ord(ConnectionDef.XMLFileFormat);
- cbVersioning.Checked := ConnectionDef.UseVersioning;
+ EncodingComboBox.ItemIndex := Ord(ConnectionDef.XMLFileFormat);
end;
procedure TInstantXMLConnectionDefEditForm.SaveData(
ConnectionDef: TInstantXMLConnectionDef);
begin
- { TODO: Copy data from edit controls to ConnectionDef }
ConnectionDef.RootFolder := RootDirEdit.Text;
- ConnectionDef.XMLFileFormat := TXMLFileFormat(cbEncoding.ItemIndex);
- ConnectionDef.UseVersioning := cbVersioning.Checked;
+ ConnectionDef.XMLFileFormat := TXMLFileFormat(EncodingComboBox.ItemIndex);
end;
procedure TInstantXMLConnectionDefEditForm.FolderButtonClick(
@@ -134,12 +125,10 @@
procedure TInstantXMLConnectionDefEditForm.InitXMLEncoding;
var
- i : TXMLFileFormat;
+ I: TXMLFileFormat;
begin
- for i := Low(TXMLFileFormat) to High(TXMLFileFormat) do
- begin
- cbEncoding.Items.Add(AXMLFileFormatStr[i]);
- end;
+ for I := Low(TXMLFileFormat) to High(TXMLFileFormat) do
+ EncodingComboBox.Items.Add(GetEnumName(TypeInfo(TXMLFileFormat), Ord(I)));
end;
end.
Property changes on: trunk/Source/Catalogs/MSSql/D2006
___________________________________________________________________
Name: svn:ignore
- *.local
*.dcu
+ *.local
*.dcu
*.identcache
Property changes on: trunk/Source/Core
___________________________________________________________________
Name: svn:ignore
- *.dcu
*.~*
*.ddp
+ *.dcu
*.~*
*.ddp
__history
Property changes on: trunk/Source/Design
___________________________________________________________________
Name: svn:ignore
- *.dcu
*.~*
*.ddp
+ *.dcu
*.~*
*.ddp
__history
Property changes on: trunk/Source/Design/D2006
___________________________________________________________________
Name: svn:ignore
- *.local
*.cfg
*.dcu
+ *.local
*.cfg
*.dcu
*.identcache
Property changes on: trunk/Tests
___________________________________________________________________
Name: svn:ignore
- __history
*.dcu
*.local
*.exe
+ __history
*.dcu
*.local
*.exe
*.identcache
Property changes on: trunk/Tests/ubmock/src
___________________________________________________________________
Name: svn:ignore
- *.rst
+ *.rst
*.dcu
|
|
From: <fas...@us...> - 2006-11-27 01:16:00
|
Revision: 718
http://svn.sourceforge.net/instantobjects/revision/?rev=718&view=rev
Author: fastbike2
Date: 2006-11-26 17:15:43 -0800 (Sun, 26 Nov 2006)
Log Message:
-----------
Updated version to 2.0.0.0 in resource files
Modified Paths:
--------------
trunk/ReleaseTools/InstantVersion.res
trunk/Source/Brokers/ADO/D2005/DclIOADO.res
trunk/Source/Brokers/ADO/D2005/IOADO.res
trunk/Source/Brokers/ADO/D2006/DclIOADO.res
trunk/Source/Brokers/ADO/D2006/IOADO.res
trunk/Source/Brokers/ADO/D5/DclIOADO_D5.res
trunk/Source/Brokers/ADO/D5/IOADO_D5.res
trunk/Source/Brokers/ADO/D6/DclIOADO.res
trunk/Source/Brokers/ADO/D6/IOADO.res
trunk/Source/Brokers/ADO/D7/DclIOADO.res
trunk/Source/Brokers/ADO/D7/IOADO.res
trunk/Source/Brokers/ADS/D5/DclIOADS_D5.res
trunk/Source/Brokers/ADS/D5/ioads_D5.res
trunk/Source/Brokers/BDE/D2005/DclIOBDE.res
trunk/Source/Brokers/BDE/D2005/IOBDE.res
trunk/Source/Brokers/BDE/D2006/DclIOBDE.res
trunk/Source/Brokers/BDE/D2006/IOBDE.res
trunk/Source/Brokers/BDE/D5/DclIOBDE_D5.res
trunk/Source/Brokers/BDE/D5/Iobde_D5.res
trunk/Source/Brokers/BDE/D6/DclIOBDE.res
trunk/Source/Brokers/BDE/D6/IOBDE.res
trunk/Source/Brokers/BDE/D7/DclIOBDE.res
trunk/Source/Brokers/BDE/D7/IOBDE.res
trunk/Source/Brokers/DBISAM/D6/DclDBISAM.res
trunk/Source/Brokers/DBISAM/D6/IODBISAM.res
trunk/Source/Brokers/DBISAM/D7/DclDBISAM.res
trunk/Source/Brokers/DBISAM/D7/IODBISAM.res
trunk/Source/Brokers/DBX/D2005/DclIODBX.res
trunk/Source/Brokers/DBX/D2005/IODBX.res
trunk/Source/Brokers/DBX/D2006/DclIODBX.res
trunk/Source/Brokers/DBX/D2006/IODBX.res
trunk/Source/Brokers/DBX/D6/DclIODBX.res
trunk/Source/Brokers/DBX/D6/IODBX.res
trunk/Source/Brokers/DBX/D7/DclIODBX.res
trunk/Source/Brokers/DBX/D7/IODBX.res
trunk/Source/Brokers/DBX/K3/DclIODBX.res
trunk/Source/Brokers/DBX/K3/IODBX.res
trunk/Source/Brokers/FlashFiler/D5/DclIOff_D5.res
trunk/Source/Brokers/FlashFiler/D5/ioff_D5.res
trunk/Source/Brokers/IBX/D2005/DclIOIBX.res
trunk/Source/Brokers/IBX/D2005/IOIBX.res
trunk/Source/Brokers/IBX/D2006/DclIOIBX.res
trunk/Source/Brokers/IBX/D2006/IOIBX.res
trunk/Source/Brokers/IBX/D5/DclIOIBX_D5.res
trunk/Source/Brokers/IBX/D5/Ioibx_D5.res
trunk/Source/Brokers/IBX/D6/DclIOIBX.res
trunk/Source/Brokers/IBX/D6/IOIBX.res
trunk/Source/Brokers/IBX/D7/DclIOIBX.res
trunk/Source/Brokers/IBX/D7/IOIBX.res
trunk/Source/Brokers/NexusDb/D2005/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D2005/IONexusDB.res
trunk/Source/Brokers/NexusDb/D2006/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D2006/IONexusDB.res
trunk/Source/Brokers/NexusDb/D5/DclIONexusDB_D5.res
trunk/Source/Brokers/NexusDb/D5/IONexusDB_D5.res
trunk/Source/Brokers/NexusDb/D6/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D6/IONexusDB.res
trunk/Source/Brokers/NexusDb/D7/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D7/IONexusDB.res
trunk/Source/Brokers/UIB/D2005/DclIOUIB.res
trunk/Source/Brokers/UIB/D2005/IOUIB.res
trunk/Source/Brokers/UIB/D2006/DclIOUIB.res
trunk/Source/Brokers/UIB/D2006/IOUIB.res
trunk/Source/Brokers/UIB/D5/DclIOUIB_D5.res
trunk/Source/Brokers/UIB/D5/IOUIB_D5.res
trunk/Source/Brokers/UIB/D6/DclIOUIB.res
trunk/Source/Brokers/UIB/D6/IOUIB.res
trunk/Source/Brokers/UIB/D7/DclIOUIB.res
trunk/Source/Brokers/UIB/D7/IOUIB.res
trunk/Source/Brokers/XML/D2005/DclIOXML.res
trunk/Source/Brokers/XML/D2005/IOXML.res
trunk/Source/Brokers/XML/D2006/DclIOXML.res
trunk/Source/Brokers/XML/D2006/IOXML.res
trunk/Source/Brokers/XML/D5/DclIOXML_D5.res
trunk/Source/Brokers/XML/D5/Ioxml_D5.res
trunk/Source/Brokers/XML/D6/DclIOXML.res
trunk/Source/Brokers/XML/D6/IOXML.res
trunk/Source/Brokers/XML/D7/DclIOXML.res
trunk/Source/Brokers/XML/D7/IOXML.res
trunk/Source/Brokers/XML/k3/DclIOXML.res
trunk/Source/Brokers/XML/k3/IOXML.res
trunk/Source/Brokers/ZeosDBO/D2005/DclIOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D2005/IOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D2006/DclIOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D2006/IOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D5/DclIOZeosDBO_D5.res
trunk/Source/Brokers/ZeosDBO/D5/IOZeosDBO_D5.res
trunk/Source/Brokers/ZeosDBO/D6/DclIOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D6/IOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D7/DclIOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D7/IOZeosDBO.res
trunk/Source/Catalogs/IBFb/D2005/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/D2006/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/D5/IOIBFbCatalog_D5.res
trunk/Source/Catalogs/IBFb/D6/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/D7/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/K3/IOIBFbCatalog.res
trunk/Source/Catalogs/MSSql/D2005/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/D2006/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/D5/IOMSSqlCatalog_D5.res
trunk/Source/Catalogs/MSSql/D6/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/D7/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/K3/IOMSSqlCatalog.res
trunk/Source/Core/D2005/IOCore.res
trunk/Source/Core/D2006/IOCore.res
trunk/Source/Core/D5/IOCore_D5.res
trunk/Source/Core/D6/IOCore.res
trunk/Source/Core/D7/IOCore.res
trunk/Source/Core/K3/IOCore.res
trunk/Source/Design/D2005/DclIOCore.res
trunk/Source/Design/D2006/DclIOCore.res
trunk/Source/Design/D5/DclIOCore_D5.res
trunk/Source/Design/D6/DclIOCore.res
trunk/Source/Design/D7/DclIOCore.res
trunk/Source/Design/K3/DclIOCore.res
Modified: trunk/ReleaseTools/InstantVersion.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2005/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2005/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2006/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2006/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D5/DclIOADO_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D5/IOADO_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D6/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D6/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D7/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D7/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADS/D5/DclIOADS_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADS/D5/ioads_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2005/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2005/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2006/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2006/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D5/DclIOBDE_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D5/Iobde_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D6/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D6/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D7/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D7/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBISAM/D6/DclDBISAM.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBISAM/D6/IODBISAM.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBISAM/D7/DclDBISAM.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBISAM/D7/IODBISAM.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2005/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2005/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2006/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2006/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D6/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D6/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D7/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D7/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/K3/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/K3/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/FlashFiler/D5/DclIOff_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/FlashFiler/D5/ioff_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2005/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2005/IOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2006/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2006/IOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D5/DclIOIBX_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D5/Ioibx_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D6/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D6/IOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D7/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D7/IOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D2005/DclIONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D2005/IONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D2006/DclIONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D2006/IONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D5/DclIONexusDB_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D5/IONexusDB_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D6/DclIONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D6/IONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D7/DclIONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D7/IONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D2005/DclIOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D2005/IOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D2006/DclIOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D2006/IOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D5/DclIOUIB_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D5/IOUIB_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D6/DclIOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D6/IOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D7/DclIOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D7/IOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D2005/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D2005/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D2006/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D2006/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D5/DclIOXML_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D5/Ioxml_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D6/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D6/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D7/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D7/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/k3/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/k3/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D2005/DclIOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D2005/IOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D2006/DclIOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D2006/IOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D5/DclIOZeosDBO_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D5/IOZeosDBO_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D6/DclIOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D6/IOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D7/DclIOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D7/IOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D2005/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D2006/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D5/IOIBFbCatalog_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D6/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D7/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/K3/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D2005/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D2006/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D5/IOMSSqlCatalog_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D6/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D7/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/K3/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D2005/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D2006/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D5/IOCore_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D6/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D7/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/K3/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D2005/DclIOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D2006/DclIOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D5/DclIOCore_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D6/DclIOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D7/DclIOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/K3/DclIOCore.res
===================================================================
(Binary files differ)
|
|
From: <sr...@us...> - 2006-11-29 03:55:09
|
Revision: 725
http://svn.sourceforge.net/instantobjects/revision/?rev=725&view=rev
Author: srmitch
Date: 2006-11-28 19:55:06 -0800 (Tue, 28 Nov 2006)
Log Message:
-----------
- Update for Object Foundry to support MM9.
- Updated and renamed 'OF_readme.txt' to 'ObjectFoundry_readme.txt' and moved it into the main Docs folder.
- Introduced an 'ObjectFoundry.inc' file to simplify future MM version support.
Modified Paths:
--------------
trunk/Source/Design/InstantAttributeEditor.pas
trunk/Source/ObjectFoundry/OFClassRegWizard.pas
trunk/Source/ObjectFoundry/OFClasses.pas
trunk/Source/ObjectFoundry/OFCritic.pas
trunk/Source/ObjectFoundry/OFDefs.pas
trunk/Source/ObjectFoundry/OFExpert.pas
trunk/Source/ObjectFoundry/OFNotify.pas
trunk/Source/ObjectFoundry/OFOptions.pas
trunk/Source/ObjectFoundry/OFReg.pas
trunk/Source/ObjectFoundry/OFUtils.pas
Added Paths:
-----------
trunk/Docs/ObjectFoundry_readme.txt
trunk/Source/ObjectFoundry/ObjectFoundry.inc
Removed Paths:
-------------
trunk/Source/ObjectFoundry/OF_readme.txt
Added: trunk/Docs/ObjectFoundry_readme.txt
===================================================================
--- trunk/Docs/ObjectFoundry_readme.txt (rev 0)
+++ trunk/Docs/ObjectFoundry_readme.txt 2006-11-29 03:55:06 UTC (rev 725)
@@ -0,0 +1,72 @@
+ObjectFoundry (for IO V2.x) Readme
+by Carlo Wolter/Steven Mitchell - 21 Mar 2005
+Revised by Steven Mitchell: 29 Nov 2006
+
+Introduction
+------------
+This file contains instructions and information for the
+Object Foundry (OF) integration between IO version 2 and
+ModelMaker(c)[http://www.modelmakertools.com].
+
+ModelMaker (MM) is an UML designer integrated with Delphi.
+It can be used also for InstantObject design, provided
+you place the
+ OFExpt.dll
+expert file in the
+ $(ProgramFiles)\ModelMakerTools\ModelMaker\x.x\Experts
+directory. MM detects and loads it during startup and
+"ObjectFoundry enabled" is included on the MM startup splash
+screen. It is also listed in the "Plug in expert manager"
+dialog launched from the Tools/Expert Manager menu option
+in MM.
+
+Currently MM versions 6 to 9 are supported with OF.
+
+Compiling
+---------
+This DLL can be compiled using the project in this directory.
+
+Please take note that the project needs to know where the
+MM Expert files are. Therefore make sure the subdir
+ $(ProgramFiles)\ModelMakerTools\ModelMaker\x.x\Experts
+is in the project options search path
+ (ie Project/Options/Directories-Conditionals/SearchPath).
+This is required because in the MM experts directory there is
+a single file that is needed:
+ MMToolsApi.PAS
+Also ensure that the appropriate compiler defines are entered
+in the project options Conditional defines (see table below).
+(ie Project/Options/Directories-Conditionals/Conditional defines)
+
+ MM Version Define
+ ---------- ------
+ 6.x [none]
+ 7.x or 8.x MM7+
+ 9.x MM9
+
+Note: The MMToolsApi.PAS file is protected by copyright of
+ModelMakerTools and cannot be put into CVS. Every legitimate
+owner of a MM licence, though, should have no problems in
+finding it.
+
+Notes on Usage
+--------------
+To operate correctly, this version of OF expects and
+generates the IO Metadata identifier tag in the class
+metadata info as follows:
+"{IOMETADATA " (without quotes but including trailing space).
+
+Conversion of IO MM projects that did not have the IO
+Metadata identifier tag:
+Make sure that the model is up to date then save and close
+Modelmaker. Backup the MM project file. Backup any previous
+'OFExpt.dll' file and copy the new 'OFExpt.dll' file to the
+{$Modelmaker}\Experts folder as indicated above. Re-open
+Modelmaker. Re-generating the Delphi code from ModelMaker
+should update the model code units to include the new class
+metadata identifier tag.
+
+Feedback
+--------
+Please report any problems to the IO news support group at
+"news.instantobjects.org/instantobjects.org.support".
Property changes on: trunk/Docs/ObjectFoundry_readme.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/Source/Design/InstantAttributeEditor.pas
===================================================================
--- trunk/Source/Design/InstantAttributeEditor.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/Design/InstantAttributeEditor.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -132,6 +132,7 @@
private
FBaseClassStorageName: string;
FLimited: Boolean;
+ FMMUninitializedNewAttribute: Boolean;
FModel: TInstantCodeModel;
FOnIsClassPersistent: TInstantBooleanEvent;
FOnLoadClasses: TInstantStringsEvent;
@@ -219,10 +220,14 @@
ObjectClassEdit.Items.Add(FModel.Classes[I].Name);
end
else if Assigned(ObjectClassEdit.Field) and
- (ObjectClassEdit.Field.AsString <> '') then
+ (ObjectClassEdit.Field.AsString <> '') and
+ not FMMUninitializedNewAttribute then
ObjectClassEdit.Items.Add(ObjectClassEdit.Field.AsString)
else if Assigned(FOnLoadClasses) then
+ begin
OnLoadClasses(Self, ObjectClassEdit.Items, NeedOnlyPersistentClasses);
+ FMMUninitializedNewAttribute := True;
+ end;
if Assigned(ObjectClassEdit.Field) then
ObjectClassEdit.ItemIndex :=
@@ -392,6 +397,8 @@
begin
SubjectExposer.AssignFieldValue(ObjectClassEdit.Field, ObjectClassEdit.Text);
UpdateControls;
+ if StorageKindEdit.Items.Count = 0 then
+ LoadStorageKind;
end;
procedure TInstantAttributeEditorForm.ObjectClassEditEnter(
Modified: trunk/Source/ObjectFoundry/OFClassRegWizard.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFClassRegWizard.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFClassRegWizard.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,11 +30,13 @@
unit OFClassRegWizard;
+{$I ObjectFoundry.inc}
+
interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
- StdCtrls, CheckLst, MMToolsAPI, ComCtrls;
+ StdCtrls, CheckLst, MMToolsAPI, OFDefs, ComCtrls;
type
TClassRegWizardForm = class(TForm)
@@ -206,7 +208,26 @@
Result := False;
end;
+{$IFDEF MM9}
var
+ UnitManager: IMMModuleManager;
+ AUnit: IMMModule;
+ I: Integer;
+begin
+ UnitList.Clear;
+ UnitManager := MMToolServices.ModuleManager;
+ if Assigned(UnitManager) then
+ begin
+ for I := 0 to Pred(UnitManager.ModuleCount) do
+ begin
+ AUnit := UnitManager.Modules[I];
+ if UnitHasPersistentClass(AUnit) then
+ UnitList.Add(AUnit);
+ end;
+ end;
+end;
+{$ELSE}
+var
UnitManager: IMMUnitManager;
AUnit: IMMUnit;
I: Integer;
@@ -223,6 +244,7 @@
end;
end;
end;
+{$ENDIF}
procedure TClassRegWizardForm.OkButtonClick(Sender: TObject);
begin
@@ -244,7 +266,11 @@
AUnit := Units[I];
with Items.Add do
begin
+ {$IFDEF MM9}
+ Caption := ExtractFileName(AUnit.RelModuleName);
+ {$ELSE}
Caption := ExtractFileName(AUnit.RelUnitName);
+ {$ENDIF}
Data := Pointer(AUnit);
Checked := True;
end;
Modified: trunk/Source/ObjectFoundry/OFClasses.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFClasses.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFClasses.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,13 +30,7 @@
unit OFClasses;
-{ 18 Sep 2004 - Steven Mitchell
- Modified for use in MM7.25 -
- Use V9Visibility property inplace of Visibility
- property in MMToolsAPI V10 IMMMember interface.
- 30 Sep 2004 - Steven Mitchell
- Added tags for part(s) external storage params
-}
+{$I ObjectFoundry.inc}
interface
@@ -113,10 +107,17 @@
finally
EndOld;
end;
+ {$IFDEF MM9}
+ if Prop.Classifier.FindMember(OldCountPropName, Index) then
+ begin
+ Member := Prop.Classifier.Members[Index];
+ Result := MemberAsProperty(Member);
+ {$ELSE}
if Prop.ClassBase.FindMember(OldCountPropName, Index) then
begin
Member := Prop.ClassBase.Members[Index];
Result := MemberAsProperty(Member);
+ {$ENDIF}
end else
Result := nil;
end;
@@ -130,15 +131,23 @@
Result := FindCountProp;
if not Assigned(Result) then
begin
+ {$IFDEF MM9}
+ Result := Prop.Classifier.AddProperty;
+ {$ELSE}
Result := Prop.ClassBase.AddProperty;
+ {$ENDIF}
Attribute.LinkMember(Result.Id);
end;
Result.Name := CountPropName;
-{$IFDEF MM7+} // SRM begin - 16 Mar 2005
+{$IFDEF MM7+}
+ {$IFDEF MM9}
+ Result.Visibility := InstantCodeVisibilityToMMVisibility(Visibility);
+ {$ELSE}
Result.V9Visibility := TV9Visibility(Visibility);
+ {$ENDIF}
{$ELSE}
Result.Visibility := TVisibility(Visibility);
-{$ENDIF} // SRM end - 16 Mar 2005
+{$ENDIF}
Result.SetAccessSpec(rwMethod, rwNone);
Getter := MemberAsMethod(Result.ReadMember);
if Assigned(Getter) then
@@ -208,7 +217,11 @@
begin
BeginOld;
try
+ {$IFDEF MM9}
+ Result := Prop.Classifier.FindMethod(GetMethodName(MT));
+ {$ELSE}
Result := Prop.ClassBase.FindMethod(GetMethodName(MT));
+ {$ENDIF}
finally
EndOld;
end;
@@ -235,7 +248,11 @@
begin
Result := FindMethod(MT);
if not Assigned(Result) then
+ {$IFDEF MM9}
+ Result := Prop.Classifier.AddMethod;
+ {$ELSE}
Result := Prop.ClassBase.AddMethod;
+ {$ENDIF}
Attribute.LinkMember(Result.Id);
Result.Name := CodeMethod.Name;
Result.Parameters := CodeMethod.Proc.Parameters.AsString;
@@ -245,11 +262,15 @@
Result.MethodKind := MMEngineDefs.mkFunction;
Result.DataName := CodeMethod.Proc.ResultTypeName;
end;
-{$IFDEF MM7+} // SRM begin - 16 Mar 2005
+{$IFDEF MM7+}
+ {$IFDEF MM9}
+ Result.Visibility := InstantCodeVisibilityToMMVisibility(Visibility);
+ {$ELSE}
Result.V9Visibility := TV9Visibility(Visibility);
+ {$ENDIF}
{$ELSE}
Result.Visibility := TVisibility(Visibility);
-{$ENDIF} // SRM end - 16 Mar 2005
+{$ENDIF}
NewBody := CodeMethod.Proc.Body.AsString;
if Result.SectionCount = 0 then
Result.AddSection(NewBody)
@@ -297,11 +318,15 @@
begin
Prop.Name := Name;
Prop.DataName := PropTypeName;
-{$IFDEF MM7+} // SRM begin - 16 Mar 2005
+{$IFDEF MM7+}
+ {$IFDEF MM9}
+ Prop.Visibility := InstantCodeVisibilityToMMVisibility(Visibility);
+ {$ELSE}
Prop.V9Visibility := TV9Visibility(Visibility);
+ {$ENDIF}
{$ELSE}
Prop.Visibility := TVisibility(Visibility);
-{$ENDIF} // SRM end - 16 Mar 2005
+{$ENDIF}
TaggedStrings['StorageName'] := StorageName;
// External part(s) options
TaggedStrings['ExternalStorageName'] := ExternalStorageName;
@@ -418,7 +443,11 @@
function TMMCodeAttribute.HasMethod(const Name: string): Boolean;
begin
+ {$IFDEF MM9}
+ Result := Assigned(Prop.Classifier.FindMethod(Name));
+ {$ELSE}
Result := Assigned(Prop.ClassBase.FindMethod(Name));
+ {$ENDIF}
end;
function TMMCodeAttribute.IsOld: Boolean;
@@ -439,13 +468,23 @@
for MT := Low(MT) to High(MT) do
if MT in MethodTypes then
begin
+ {$IFDEF MM9}
+ Method := Prop.Classifier.FindMethod(GetMethodName(MT));
+ {$ELSE}
Method := Prop.ClassBase.FindMethod(GetMethodName(MT));
+ {$ENDIF}
if Assigned(Method) then
Attribute.LinkMember(Method.Id);
end;
+ {$IFDEF MM9}
+ if Prop.Classifier.FindMember(CountPropName, Index) then
+ begin
+ Member := Prop.Classifier.Members[Index];
+ {$ELSE}
if Prop.ClassBase.FindMember(CountPropName, Index) then
begin
Member := Prop.ClassBase.Members[Index];
+ {$ENDIF}
CountProp := MemberAsProperty(Member);
Attribute.LinkMember(CountProp.Id);
end;
@@ -456,7 +495,11 @@
FieldTypeName: string;
begin
Name := Prop.Name;
- Visibility := TInstantCodeVisibility(Prop.V9Visibility); // SRM - 18 Sep 2004
+ {$IFDEF MM9}
+ Visibility := MMVisibilityToInstantCodeVisibility(Prop.Visibility);
+ {$ELSE}
+ Visibility := TInstantCodeVisibility(Prop.V9Visibility);
+ {$ENDIF}
if Attribute.IsIOAttribute then
begin
{ If the type of attribute field is Integer (which is considered
Modified: trunk/Source/ObjectFoundry/OFCritic.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFCritic.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFCritic.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,6 +30,8 @@
unit OFCritic;
+{$I ObjectFoundry.inc}
+
interface
uses Windows, SysUtils, Classes, MMEngineDefs, MMToolsApi, MMCriticsBase;
Modified: trunk/Source/ObjectFoundry/OFDefs.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFDefs.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFDefs.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,21 +30,30 @@
unit OFDefs;
+{$I ObjectFoundry.inc}
+
interface
-
-{$IFDEF MM7+}
uses
- MMToolsAPI, MMDiagramAPI;
+ MMToolsAPI
+ {$IFDEF MM7+}
+ , MMDiagramAPI
+ {$ENDIF}
+ ;
type
+{$IFDEF MM7+}
+ {$IFDEF MM9}
+ IMMUnit = IMMModule;
+ IMMUnitManager = IMMModuleManager;
+ IMMV9ClassBase = IMMClassifier;
+ IMMV9CodeModel = IMMCodeModel;
+ IMMClassBase = IMMClassifier;
+ {$ELSE}
IMMV9ClassBase = IMMClassBase;
IMMV9CodeModel = IMMCodeModel;
+ {$ENDIF}
{$ELSE}
-uses
- MMToolsAPI;
-
-type
TMMActionData = record
Caption: WideString; // ModelMaker provides a defaults name based on to the menu item name
ImageIndex: Integer; // Default = -1; Only used for toolbuttons, ignored for menu items
@@ -58,7 +67,6 @@
end;
{$ENDIF}
-type
IOFReference = IMMReference;
IOFEntityReference = IMMEntityReference;
Modified: trunk/Source/ObjectFoundry/OFExpert.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFExpert.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFExpert.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,6 +30,8 @@
unit OFExpert;
+{$I ObjectFoundry.inc}
+
interface
uses
@@ -207,7 +209,11 @@
begin
if Assigned(P) and P.Valid then
begin
+ {$IFDEF MM9}
+ lClass := P.Classifier;
+ {$ELSE}
lClass := P.ClassBase;
+ {$ENDIF}
Attribute := TMMCodeAttribute.Create(P);
AttributeValidator := TMMAttributeValidator.Create(Attribute, P);
try
@@ -615,21 +621,30 @@
if MMInterface = nil then
Exit;
MMProperty := MMInterface as IMMProperty;
+ {$IFDEF MM9}
+ CodeClass := MMProperty.Classifier;
+ {$ELSE}
+ CodeClass := MMProperty.ClassBase;
+ {$ENDIF}
- if MMProperty.ClassBase.FindMember(Attribute.Name, I) then
- raise Exception.Create('Attribute Name already used');
+ // check that the new attribute name is not used in parent class
+ // except by itself
+ if CodeClass.FindMember(Attribute.Name, I) and
+ (CodeClass.Members[I] <> MMProperty) then
+ raise Exception.Create('Attribute Name already used');
- // check that the same attribute name is not used in an ancestor class
- CodeClass := MMProperty.ClassBase;
+ // check that the new attribute name is not used in any child class
+ CheckChildClass(CodeClass);
+
+ // check that the new attribute name is not used in an ancestor class
+ CodeClass := CodeClass.Ancestor;
while (CodeClass <> nil) do
begin
if CodeClass.FindMember(Attribute.Name, I) then
raise Exception.CreateFmt('Attribute "%s" exists in ancestor class "%s"',
[Attribute.Name, CodeClass.Name]);
- CodeClass := CodeClass.Ancestor;
+ CodeClass := CodeClass.Ancestor;
end;
- // check that the same attribute name is not used in any child class
- CheckChildClass(MMProperty.ClassBase);
end;
end.
Modified: trunk/Source/ObjectFoundry/OFNotify.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFNotify.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFNotify.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,6 +30,8 @@
unit OFNotify;
+{$I ObjectFoundry.inc}
+
interface
uses SysUtils, Classes, MMEngineDefs, MMToolsApi;
Modified: trunk/Source/ObjectFoundry/OFOptions.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFOptions.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFOptions.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,6 +30,8 @@
unit OFOptions;
+{$I ObjectFoundry.inc}
+
interface
uses
Modified: trunk/Source/ObjectFoundry/OFReg.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFReg.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFReg.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,6 +30,8 @@
unit OFReg;
+{$I ObjectFoundry.inc}
+
interface
uses
Modified: trunk/Source/ObjectFoundry/OFUtils.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFUtils.pas 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OFUtils.pas 2006-11-29 03:55:06 UTC (rev 725)
@@ -30,10 +30,12 @@
unit OFUtils;
+{$I ObjectFoundry.inc}
+
interface
uses
- MMToolsAPI, MMIOAPI, OFDefs;
+ MMToolsAPI, MMIOAPI, MMEngineDefs, OFDefs, InstantCode;
function ClassAsV9ClassBase(AClass: IMMClassBase): IMMV9ClassBase;
function CodeModelAsV9CodeModel(ACodeModel: IMMCodeModel): IMMV9CodeModel;
@@ -47,6 +49,12 @@
function MemberAsAttributeProperty(Member: IMMMember): IMMProperty;
function SameCode(const Code1, Code2: string): Boolean;
+function MMVisibilityToInstantCodeVisibility(const Value: TVisibility):
+ TInstantCodeVisibility;
+
+function InstantCodeVisibilityToMMVisibility(const Value:
+ TInstantCodeVisibility): TVisibility;
+
implementation
uses
@@ -135,4 +143,23 @@
Result := SameText(Trim(Code1), Trim(Code2));
end;
+function MMVisibilityToInstantCodeVisibility(const Value: TVisibility):
+ TInstantCodeVisibility;
+const
+ Map: array[TVisibility] of TInstantCodeVisibility =
+ (viDefault, viPrivate, viPrivate, viProtected, viProtected,
+ viPublic, viPublished, viPublished);
+begin
+ Result := Map[Value];
+end;
+
+function InstantCodeVisibilityToMMVisibility(const Value:
+ TInstantCodeVisibility): TVisibility;
+const
+ Map: array[TInstantCodeVisibility] of TVisibility =
+ (scDefault, scPrivate, scProtected, scPublic, scPublished);
+begin
+ Result := Map[Value];
+end;
+
end.
Deleted: trunk/Source/ObjectFoundry/OF_readme.txt
===================================================================
--- trunk/Source/ObjectFoundry/OF_readme.txt 2006-11-29 03:30:29 UTC (rev 724)
+++ trunk/Source/ObjectFoundry/OF_readme.txt 2006-11-29 03:55:06 UTC (rev 725)
@@ -1,64 +0,0 @@
-ObjectFoundry (for IO V2) Readme
-by Carlo Wolter/Steven Mitchell - 21 Mar 2005
-
-Introduction
-------------
-This file contains instructions and information for the
-Object Foundry (OF) integration between IO version 2 and
-ModelMaker(c).
-
-ModelMaker (MM) is an UML designer integrated with Delphi.
-It can be used also for InstantObject design, provided
-you place the
- OFExpt.dll
-expert file in the
- $(ProgramFiles)\ModelMakerTools\ModelMaker\x.x\Experts
-directory. MM detects and loads it during startup and
-"ObjectFoundry enabled" is included on the MM startup splash
-screen. It is also listed in the "Plug in expert manager"
-dialog launched from the Tools/Expert Manager menu option
-in MM.
-
-Compiling
----------
-This DLL can be compiled using the project in this directory.
-
-Please take note that the project needs to know where the
-MM Expert files are. Therefore make sure the subdir
- $(ProgramFiles)\ModelMakerTools\ModelMaker\x.x\Experts
-is in the project options search path
- (ie Project/Options/Directories-Conditionals/SearchPath).
-This is required because in the MM experts directory there is
-a single file that is needed:
- MMToolsApi.PAS
-Also ensure that 'MM7+' is defined in the project options
-Conditional defines
- (ie Project/Options/Directories-Conditionals/Conditional defines)
-when using version 7 or higher of MM.
-
-Note: The MMToolsApi.PAS file is protected by copyright of
-ModelMakerTools and cannot be put into CVS. Every legitimate
-owner of a MM licence, though, should have no problems in
-finding it.
-
-Notes on Usage
---------------
-To operate correctly, this version of OF expects and
-generates the IO Metadata identifier tag in the class
-metadata info as follows:
-"{IOMETADATA " (without quotes but including trailing space).
-
-Conversion of IO MM projects that did not have the IO
-Metadata identifier tag:
-Make sure that the model is up to date then save and close
-Modelmaker. Backup the MM project file. Backup any previous
-'OFExpt.dll' file and copy the new 'OFExpt.dll' file to the
-{$Modelmaker}\Experts folder as indicated above. Re-open
-Modelmaker. Re-generating the Delphi code from ModelMaker
-should update the model code units to include the new class
-metadata identifier tag.
-
-Feedback
---------
-Please report any problems to the IO news groups at
-"news.instantobjects.org".
Added: trunk/Source/ObjectFoundry/ObjectFoundry.inc
===================================================================
--- trunk/Source/ObjectFoundry/ObjectFoundry.inc (rev 0)
+++ trunk/Source/ObjectFoundry/ObjectFoundry.inc 2006-11-29 03:55:06 UTC (rev 725)
@@ -0,0 +1,3 @@
+{$IFDEF MM9}
+ {$DEFINE MM7+}
+{$ENDIF}
Property changes on: trunk/Source/ObjectFoundry/ObjectFoundry.inc
___________________________________________________________________
Name: svn:eol-style
+ native
|
|
From: <bvs...@us...> - 2006-12-11 00:17:58
|
Revision: 737
http://svn.sourceforge.net/instantobjects/revision/?rev=737&view=rev
Author: bvsimmons
Date: 2006-12-10 16:17:56 -0800 (Sun, 10 Dec 2006)
Log Message:
-----------
Support for InstantDate and InstantTime
Modified Paths:
--------------
trunk/Demos/PrimerCross/DemoData.pas
trunk/Demos/PrimerCross/Model/Model.pas
trunk/Demos/PrimerCross/ModelExternal/Model.pas
trunk/Demos/PrimerCross/PersonEdit.dfm
trunk/Demos/PrimerCross/PersonEdit.pas
trunk/Demos/PrimerCross/Primer.mdr
trunk/Demos/PrimerCross/PrimerExternal.mdr
trunk/Source/Brokers/ADO/InstantADO.pas
trunk/Source/Brokers/BDE/InstantBDE.pas
trunk/Source/Brokers/BDE/InstantBDECatalog.pas
trunk/Source/Brokers/DBX/InstantDBX.pas
trunk/Source/Brokers/IBX/InstantIBX.pas
trunk/Source/Catalogs/MSSql/InstantMSSqlCatalog.pas
trunk/Source/Core/InstantBrokers.pas
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantMetadata.pas
trunk/Source/Core/InstantPersistence.pas
trunk/Source/Core/InstantPresentation.pas
trunk/Source/Core/InstantTypes.pas
trunk/Tests/TestIO.dpr
trunk/Tests/TestIO.mdr
trunk/Tests/TestInstantDateTime.pas
trunk/Tests/TestModel.pas
Added Paths:
-----------
trunk/Docs/InstantDate-InstantTime Release Notes.txt
trunk/Tests/TestInstantDate.pas
trunk/Tests/TestInstantTime.pas
Modified: trunk/Demos/PrimerCross/DemoData.pas
===================================================================
--- trunk/Demos/PrimerCross/DemoData.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Demos/PrimerCross/DemoData.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -184,6 +184,7 @@
Gender := TGender(Random(2));
Result.Name := RandomFullName(Gender);
Result.BirthDate := Date - (20 * 365 + Random(365 * 50)); // 20 - 70 years old
+ Result.BirthTime := Random;
Result.Address := CreateRandomAddress;
// Result.Salary := 922337203685470;
Result.Salary := 500 + Random(5000);
Modified: trunk/Demos/PrimerCross/Model/Model.pas
===================================================================
--- trunk/Demos/PrimerCross/Model/Model.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Demos/PrimerCross/Model/Model.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -8,7 +8,7 @@
interface
uses
- InstantPersistence;
+ InstantPersistence, InstantTypes;
type
TAddress = class;
@@ -21,6 +21,7 @@
TPerson = class;
TPhone = class;
+
TAddress = class(TInstantObject)
{IOMETADATA City: String(30) index;
Country: Reference(TCountry);
@@ -164,25 +165,29 @@
TPerson = class(TContact)
{IOMETADATA stored;
- BirthDate: DateTime;
Emails: Parts(TEmail);
Employer: Reference(TCompany);
Picture: Graphic;
- Salary: Currency; }
- _BirthDate: TInstantDateTime;
+ Salary: Currency;
+ BirthDate: Date;
+ BirthTime: Time; }
+ _BirthDate: TInstantDate;
+ _BirthTime: TInstantTime;
_Emails: TInstantParts;
_Employer: TInstantReference;
_Picture: TInstantGraphic;
_Salary: TInstantCurrency;
private
- function GetBirthDate: TDateTime;
+ function GetBirthDate: TDate;
+ function GetBirthTime: TTime;
function GetEmailCount: Integer;
function GetEmails(Index: Integer): TEmail;
function GetEmployer: TCompany;
function GetMainEmailAddress: string;
function GetPicture: string;
function GetSalary: Currency;
- procedure SetBirthDate(Value: TDateTime);
+ procedure SetBirthDate(Value: TDate);
+ procedure SetBirthTime(Value: TTime);
procedure SetEmails(Index: Integer; Value: TEmail);
procedure SetMainEmailAddress(const Value: string);
procedure SetPicture(const Value: string);
@@ -200,7 +205,8 @@
property EmailCount: Integer read GetEmailCount;
property Emails[Index: Integer]: TEmail read GetEmails write SetEmails;
published
- property BirthDate: TDateTime read GetBirthDate write SetBirthDate;
+ property BirthDate: TDate read GetBirthDate write SetBirthDate;
+ property BirthTime: TTime read GetBirthTime write SetBirthTime;
property Employer: TCompany read GetEmployer;
property MainEmailAddress: string read GetMainEmailAddress write SetMainEmailAddress;
property Picture: string read GetPicture write SetPicture;
@@ -390,11 +396,16 @@
end;
end;
-function TPerson.GetBirthDate: TDateTime;
+function TPerson.GetBirthDate: TDate;
begin
Result := _BirthDate.Value;
end;
+function TPerson.GetBirthTime: TTime;
+begin
+ Result := _BirthTime.Value;
+end;
+
function TPerson.GetEmailCount: Integer;
begin
Result := _Emails.Count
@@ -443,11 +454,16 @@
Result := _Emails.Remove(Email);
end;
-procedure TPerson.SetBirthDate(Value: TDateTime);
+procedure TPerson.SetBirthDate(Value: TDate);
begin
_BirthDate.Value := Value;
end;
+procedure TPerson.SetBirthTime(Value: TTime);
+begin
+ _BirthTime.Value := Value;
+end;
+
procedure TPerson.SetEmails(Index: Integer; Value: TEmail);
begin
_Emails[Index] := Value;
Modified: trunk/Demos/PrimerCross/ModelExternal/Model.pas
===================================================================
--- trunk/Demos/PrimerCross/ModelExternal/Model.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Demos/PrimerCross/ModelExternal/Model.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -8,7 +8,7 @@
interface
uses
- InstantPersistence;
+ InstantPersistence, InstantTypes;
type
TAddress = class;
@@ -167,25 +167,29 @@
TPerson = class(TContact)
{IOMETADATA stored;
- BirthDate: DateTime;
Emails: Parts(TEmail) external 'Person_Emails';
Employer: Reference(TCompany);
Picture: Graphic;
- Salary: Currency; }
- _BirthDate: TInstantDateTime;
+ Salary: Currency;
+ BirthDate: Date;
+ BirthTime: Time; }
+ _BirthDate: TInstantDate;
+ _BirthTime: TInstantTime;
_Emails: TInstantParts;
_Employer: TInstantReference;
_Picture: TInstantGraphic;
_Salary: TInstantCurrency;
private
- function GetBirthDate: TDateTime;
+ function GetBirthDate: TDate;
+ function GetBirthTime: TTime;
function GetEmailCount: Integer;
function GetEmails(Index: Integer): TEmail;
function GetEmployer: TCompany;
function GetMainEmailAddress: string;
function GetPicture: string;
function GetSalary: Currency;
- procedure SetBirthDate(Value: TDateTime);
+ procedure SetBirthDate(Value: TDate);
+ procedure SetBirthTime(Value: TTime);
procedure SetEmails(Index: Integer; Value: TEmail);
procedure SetMainEmailAddress(const Value: string);
procedure SetPicture(const Value: string);
@@ -203,7 +207,8 @@
property EmailCount: Integer read GetEmailCount;
property Emails[Index: Integer]: TEmail read GetEmails write SetEmails;
published
- property BirthDate: TDateTime read GetBirthDate write SetBirthDate;
+ property BirthDate: TDate read GetBirthDate write SetBirthDate;
+ property BirthTime: TTime read GetBirthTime write SetBirthTime;
property Employer: TCompany read GetEmployer;
property MainEmailAddress: string read GetMainEmailAddress write SetMainEmailAddress;
property Picture: string read GetPicture write SetPicture;
@@ -393,11 +398,16 @@
end;
end;
-function TPerson.GetBirthDate: TDateTime;
+function TPerson.GetBirthDate: TDate;
begin
Result := _BirthDate.Value;
end;
+function TPerson.GetBirthTime: TTime;
+begin
+ Result := _BirthTime.Value;
+end;
+
function TPerson.GetEmailCount: Integer;
begin
Result := _Emails.Count;
@@ -446,11 +456,16 @@
Result := _Emails.Remove(Email);
end;
-procedure TPerson.SetBirthDate(Value: TDateTime);
+procedure TPerson.SetBirthDate(Value: TDate);
begin
_BirthDate.Value := Value;
end;
+procedure TPerson.SetBirthTime(Value: TTime);
+begin
+ _BirthTime.Value := Value;
+end;
+
procedure TPerson.SetEmails(Index: Integer; Value: TEmail);
begin
_Emails[Index] := Value;
Modified: trunk/Demos/PrimerCross/PersonEdit.dfm
===================================================================
--- trunk/Demos/PrimerCross/PersonEdit.dfm 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Demos/PrimerCross/PersonEdit.dfm 2006-12-11 00:17:56 UTC (rev 737)
@@ -59,7 +59,15 @@
Height = 13
Caption = 'Sa&lary'
end
- object PicturePanel: TPanel [13]
+ object Label1: TLabel [13]
+ Left = 136
+ Top = 264
+ Width = 44
+ Height = 13
+ Caption = 'BirthTime'
+ FocusControl = BirthTimeEdit
+ end
+ object PicturePanel: TPanel [14]
Left = 332
Top = 203
Width = 76
@@ -95,7 +103,7 @@
Visible = True
end>
end
- object BirthDateEdit: TDBEdit [20]
+ object BirthDateEdit: TDBEdit [21]
Left = 136
Top = 200
Width = 73
@@ -104,7 +112,7 @@
DataSource = SubjectSource
TabOrder = 7
end
- object EmployerEdit: TDBEdit [21]
+ object EmployerEdit: TDBEdit [22]
Left = 8
Top = 240
Width = 129
@@ -114,7 +122,7 @@
ReadOnly = True
TabOrder = 8
end
- object EmailsGrid: TDBGrid [22]
+ object EmailsGrid: TDBGrid [23]
Left = 240
Top = 120
Width = 169
@@ -135,7 +143,7 @@
Visible = True
end>
end
- object EmployerToolBar: TToolBar [23]
+ object EmployerToolBar: TToolBar [24]
Left = 140
Top = 237
Width = 69
@@ -175,7 +183,7 @@
OnClick = EmployerClearButtonClick
end
end
- object PictureButton: TButton [24]
+ object PictureButton: TButton [25]
Left = 240
Top = 246
Width = 81
@@ -187,7 +195,7 @@
object SalaryEdit: TDBEdit
Left = 8
Top = 280
- Width = 153
+ Width = 121
Height = 21
DataField = 'Salary'
DataSource = SubjectSource
@@ -202,6 +210,15 @@
TabOrder = 15
OnClick = ClearButtonClick
end
+ object BirthTimeEdit: TDBEdit
+ Left = 136
+ Top = 280
+ Width = 81
+ Height = 21
+ DataField = 'BirthTime'
+ DataSource = SubjectSource
+ TabOrder = 16
+ end
end
end
end
Modified: trunk/Demos/PrimerCross/PersonEdit.pas
===================================================================
--- trunk/Demos/PrimerCross/PersonEdit.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Demos/PrimerCross/PersonEdit.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -41,6 +41,8 @@
PicturePanel: TPanel;
PictureImage: TImage;
ClearButton: TButton;
+ Label1: TLabel;
+ BirthTimeEdit: TDBEdit;
procedure EmployerClearButtonClick(Sender: TObject);
procedure EmployerEditButtonClick(Sender: TObject);
procedure EmployerLookupButtonClick(Sender: TObject);
Modified: trunk/Demos/PrimerCross/Primer.mdr
===================================================================
(Binary files differ)
Modified: trunk/Demos/PrimerCross/PrimerExternal.mdr
===================================================================
(Binary files differ)
Added: trunk/Docs/InstantDate-InstantTime Release Notes.txt
===================================================================
--- trunk/Docs/InstantDate-InstantTime Release Notes.txt (rev 0)
+++ trunk/Docs/InstantDate-InstantTime Release Notes.txt 2006-12-11 00:17:56 UTC (rev 737)
@@ -0,0 +1,122 @@
+---------- InstantDate InstantTime Release Notes -----------------
+Summary of Changes for Support of InstantDate and InstantTime Data types.
+
+Requirements
+---------------------------------
+1. Must completely rebuild IO.
+2. Must add InstantTypes to Interface Uses class of the model unit(s). if you want to use the new datatypes.
+
+InstantType.pas defines:
+TDate = class(TDateTime);
+TTime = class(TDateTime);
+The Model Explorer has been modified to automatically or (auto-magically) add the Interface uses clause of your model file(s) with InstantType and the Implementation uses clause with InstantMetadata when you edit your model.
+
+Files affected :
+Core Files modified:
+---------------------------------
+InstantBrokers.pas
+InstantClasses.pas
+InstantCode.pas
+InstantMetadata.pas
+InstantPersistence.pas
+InstantPresentation.pas
+InstantTypes.pas
+
+
+Tests Files Modified (* new files)
+---------------------------------
+* TestInstantDate.pas
+TestInstantDateTime.pas
+* TestInstantTime.pas
+TestIO.dpr
+TestIO.mdr
+TestModel.pas
+
+Document files (Docs Directory)
+--------------------------------
+* InstantDateInstantTime_Releasenotes.txt (this document)
+
+Demos - PrimerCross (Birthtime attribute added to TPerson and random Birthtimes are generated)
+---------------------------------
+DemoData.pas
+PersonEdit.dfm
+PersonEdit.pas
+Primer.mdr
+PrimerExternal.mdr
+Model/model.pas
+ModelExternal/model.pas
+
+Brokers (Note: I only modified the files for the standard set of Brokers which are build in RunTimePackages.bpg).
+---------------------------------
+InstantADO.pas
+InstantBDE.pas
+InstantDBX.pas
+InstantIBX.pas
+
+Note: The following brokers will also need to be modified.
+InstantADS.pas
+InstantDBISAM.pas
+InstantFlashFiler.pas
+InstantNexusDB.pas
+InstantUIB.pas
+InstantZeosDBO.pas
+
+Catalogs
+---------------------------------
+InstantBDECatalog.pas
+InstantIBFbCatalog.pas
+InstantMSSqlCatalog.pas
+
+Note: (AFIK InstantXML.pas does not need to be modified)
+
+Note:
+All brokers and catalogs must be modified to account for the two new data types. All standard brokers have been modified to map SQL datatypes for Date and Time. The default is to use DATETIME/TIMESTAMP for Date and Time Datatypes in SQL Brokers. The update has made this modification to all of the standard brokers and catalogs, but you should double check to be sure. If you have your own customized broker/catalog or you are using one of the brokers which is not part of the standard build, you will have to make similar changes as shown in the below mapping between SQL Datatypes and InstantDatatypes:
+
+function TInstantBDECatalog.ColumnTypeToDataType(const ColumnType: TFieldType;
+ out DataType: TInstantDataType): Boolean;
+begin
+ Result := True;
+ case ColumnType of
+ ftString: DataType := dtString;
+ ftSmallint,
+ ftInteger: DataType := dtInteger;
+ ftBoolean: DataType := dtBoolean;
+ ftFloat: DataType := dtFloat;
+ ftCurrency: DataType := dtCurrency;
+ ftDate: DataType := dtDate; // <- Map Date Fields
+ ftTime: DataType := dtTime; // <-- Map Time Fields
+ ftDateTime: DataType := dtDateTime;
+ ftAutoInc: DataType := dtInteger;
+ ftBlob,
+ ftGraphic: DataType := dtBlob;
+ ftMemo: DataType := dtMemo;
+ else
+ Result := False;
+ end;
+end;
+
+function TInstantADOMSSQLBroker.DataTypeToColumnType(
+ DataType: TInstantDataType; Size: Integer): string;
+const
+ Types: array[TInstantDataType] of string = (
+ 'INTEGER',
+ 'FLOAT',
+ 'MONEY',
+ 'BIT',
+ 'VARCHAR',
+ 'TEXT',
+ 'DATETIME',
+ 'IMAGE',
+ 'DATETIME', // <- Map Date Fields
+ 'DATETIME'); // <- Map Time Fields
+begin
+ Result := Types[DataType];
+ if (DataType = dtString) and (Size > 0) then
+ Result := Result + InstantEmbrace(IntToStr(Size), '()');
+end;
+
+I haved removed the following that were contained in my uploads to the repository ng.
+
+1. ACR - Accuracer
+2. DBX - Support for ASA-SqlAnyWhere (and it's Catalog 'InstantASACatalog.pas')
+3. SDAC - Corelab SQL Server Data Access Components
Property changes on: trunk/Docs/InstantDate-InstantTime Release Notes.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/Source/Brokers/ADO/InstantADO.pas
===================================================================
--- trunk/Source/Brokers/ADO/InstantADO.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Brokers/ADO/InstantADO.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -107,9 +107,12 @@
function GetDataSet: TCustomADODataSet;
protected
function CreateDataSet: TDataSet; override;
+ function CreateNavigationalLinkResolver(const ATableName: string):
+ TInstantNavigationalLinkResolver; override;
function Find(const AClassName, AObjectId: string): Boolean;
function Locate(const AClassName, AObjectId: string): Boolean; override;
public
+ function FormatTableName(const ATableName: string): string; virtual;
property Broker: TInstantADOBroker read GetBroker;
property DataSet: TCustomADODataSet read GetDataSet;
end;
@@ -148,6 +151,23 @@
property Connector: TInstantADOConnector read GetConnector;
end;
+ TInstantADOLinkResolver = class(TInstantNavigationalLinkResolver)
+ private
+ function GetBroker: TInstantADOBroker;
+ function GetDataSet: TADODataSet;
+ function GetResolver: TInstantADOResolver;
+ protected
+ function CreateDataSet: TDataSet; override;
+ procedure SetDatasetParentRange(const AParentClass, AParentId: string);
+ override;
+ public
+ constructor Create(AResolver: TInstantNavigationalResolver; const ATableName:
+ string);
+ property Broker: TInstantADOBroker read GetBroker;
+ property DataSet: TADODataSet read GetDataSet;
+ property Resolver: TInstantADOResolver read GetResolver;
+ end;
+
{ MS Jet }
TInstantADOMSJetBroker = class(TInstantADOBroker)
@@ -331,7 +351,9 @@
(adVarChar, adVarWChar, adVarChar, adVarChar, adVarChar, adVarChar), // dtString
(adLongVarChar, adLongVarWChar, adLongVarChar, adVarBinary, adLongVarChar, adLongVarChar), // dtMemo
(adDate, adDate, adDBTimeStamp, adDBTimeStamp, adDate, adDate), // dtDateTime
- (adLongVarBinary, adLongVarBinary, adLongVarBinary, adVarBinary, adLongVarBinary, adLongVarBinary) // dtBlob
+ (adLongVarBinary, adLongVarBinary, adLongVarBinary, adVarBinary, adLongVarBinary, adLongVarBinary), // dtBlob
+ (adDate, adDate, adDBTimeStamp, adDBTimeStamp, adDate, adDate), // dtDate
+ (adDate, adDate, adDBTimeStamp, adDBTimeStamp, adDate, adDate) // dtTime
);
var
Column: _Column;
@@ -447,7 +469,9 @@
'VARCHAR',
'MEMO',
'DATETIME',
- 'BLOB'
+ 'BLOB',
+ 'DATE',
+ 'TIME'
);
begin
Result := Types[DataType];
@@ -467,6 +491,8 @@
Result := 'TEXT';
dtBlob:
Result := 'IMAGE';
+ dtDate, dtDateTime:
+ Result := 'DATETIME';
end;
ptOracle:
case DataType of
@@ -474,7 +500,7 @@
Result := 'CHAR(1)';
dtCurrency:
Result := 'DECIMAL(14,4)';
- dtDateTime:
+ dtDateTime, dtDate, dtTime:
Result := 'DATE';
dtBlob:
Result := 'BLOB';
@@ -485,7 +511,7 @@
case DataType of
dtCurrency:
Result := 'DECIMAL(14,4)';
- dtDateTime:
+ dtDateTime, dtDate, dtTime:
Result := 'TIMESTAMP';
dtBlob:
Result := 'BLOB (1000 K)';
@@ -795,6 +821,12 @@
end;
end;
+function TInstantADOResolver.CreateNavigationalLinkResolver(
+ const ATableName: string): TInstantNavigationalLinkResolver;
+begin
+ Result := TInstantADOLinkResolver.Create(Self, ATableName);
+end;
+
function TInstantADOResolver.Find(const AClassName,
AObjectId: string): Boolean;
var
@@ -837,6 +869,12 @@
end;
end;
+function TInstantADOResolver.FormatTableName(
+ const ATableName: string): string;
+begin
+ Result := TableName;
+end;
+
function TInstantADOResolver.GetBroker: TInstantADOBroker;
begin
Result := inherited Broker as TInstantADOBroker;
@@ -1144,7 +1182,9 @@
'VARCHAR',
'TEXT',
'DATETIME',
- 'IMAGE');
+ 'IMAGE',
+ 'DATETIME',
+ 'DATETIME');
begin
Result := Types[DataType];
if (DataType = dtString) and (Size > 0) then
@@ -1176,6 +1216,50 @@
{ TInstantADOMSSQLQuery }
+{ TInstantADOLinkResolver }
+
+constructor TInstantADOLinkResolver.Create(
+ AResolver: TInstantNavigationalResolver; const ATableName: string);
+begin
+ inherited Create(AResolver, ATableName);
+end;
+
+function TInstantADOLinkResolver.CreateDataSet: TDataSet;
+begin
+ Result:= TADOTable.Create(nil);
+ with TADOTable(Result) do
+ try
+ Connection := Broker.Connector.Connection;
+ TableName := Self.TableName;
+ IndexFieldNames := InstantParentClassFieldName + ';' +
+ InstantParentIdFieldName;
+ except
+ Result.Free;
+ raise;
+ end;
+end;
+
+function TInstantADOLinkResolver.GetBroker: TInstantADOBroker;
+begin
+ Result := inherited Broker as TInstantADOBroker;
+end;
+
+function TInstantADOLinkResolver.GetDataSet: TADODataSet;
+begin
+ Result := inherited DataSet as TADODataSet;
+end;
+
+function TInstantADOLinkResolver.GetResolver: TInstantADOResolver;
+begin
+ Result := inherited Resolver as TInstantADOResolver;
+end;
+
+procedure TInstantADOLinkResolver.SetDatasetParentRange(const AParentClass,
+ AParentId: string);
+begin
+// Dataset.SetRange([AParentClass, AParentId], [AParentClass, AParentId]);
+end;
+
initialization
RegisterClass(TInstantADOConnectionDef);
TInstantADOConnector.RegisterClass;
Modified: trunk/Source/Brokers/BDE/InstantBDE.pas
===================================================================
--- trunk/Source/Brokers/BDE/InstantBDE.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Brokers/BDE/InstantBDE.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -405,7 +405,7 @@
procedure CreateTable(TableMetadata: TInstantTableMetadata);
const
FieldTypes: array[TInstantDataType] of TFieldType =
- (ftInteger, ftFloat, ftBCD, ftBoolean, ftString, ftMemo, ftDateTime, ftBlob);
+ (ftInteger, ftFloat, ftBCD, ftBoolean, ftString, ftMemo, ftDateTime, ftBlob, ftDate, ftTime);
var
I: Integer;
Table: TTable;
@@ -758,7 +758,7 @@
procedure TInstantDBBuildBDEAddTableCommand.InternalExecute;
const
FieldTypes: array[TInstantDataType] of TFieldType =
- (ftInteger, ftFloat, ftCurrency, ftBoolean, ftString, ftMemo, ftDateTime, ftBlob);
+ (ftInteger, ftFloat, ftCurrency, ftBoolean, ftString, ftMemo, ftDateTime, ftBlob, ftDate, ftTime);
var
I: Integer;
Table: TTable;
Modified: trunk/Source/Brokers/BDE/InstantBDECatalog.pas
===================================================================
--- trunk/Source/Brokers/BDE/InstantBDECatalog.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Brokers/BDE/InstantBDECatalog.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -171,8 +171,8 @@
ftBoolean: DataType := dtBoolean;
ftFloat: DataType := dtFloat;
ftCurrency: DataType := dtCurrency;
- ftDate,
- ftTime,
+ ftDate: DataType := dtDate;
+ ftTime: DataType := dtTime;
ftDateTime: DataType := dtDateTime;
ftAutoInc: DataType := dtInteger;
ftBlob,
Modified: trunk/Source/Brokers/DBX/InstantDBX.pas
===================================================================
--- trunk/Source/Brokers/DBX/InstantDBX.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Brokers/DBX/InstantDBX.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -160,6 +160,14 @@
{ MS SQL Server }
+ TInstantDBXMSSQLSQLGenerator = class(TInstantSQLGenerator)
+ protected
+ function InternalGenerateAlterFieldSQL(OldMetadata, NewMetadata: TInstantFieldMetadata): string; override;
+ function InternalGenerateDropFieldSQL(Metadata: TInstantFieldMetadata): string; override;
+ function InternalGenerateDropIndexSQL(Metadata: TInstantIndexMetadata): string; override;
+ function EmbraceIndex(const IndexName: string): string; virtual;
+ end;
+
TInstantDBXMSSQLBroker = class(TInstantDBXBroker)
protected
function CreateCatalog(const AScheme: TInstantScheme): TInstantCatalog; override;
@@ -169,6 +177,8 @@
function GetDBMSName: string; override;
function GetSQLQuote: Char; override;
function InternalCreateQuery: TInstantQuery; override;
+ public
+ class function GeneratorClass: TInstantSQLGeneratorClass; override;
end;
TInstantDBXMSSQLResolver = class(TInstantSQLResolver)
@@ -522,7 +532,9 @@
'VARCHAR',
'BLOB SUB_TYPE 1',
'TIMESTAMP',
- 'BLOB');
+ 'BLOB',
+ 'TIMESTAMP',
+ 'TIMESTAMP');
begin
Result := Types[DataType];
end;
@@ -564,7 +576,9 @@
'VARCHAR',
'TEXT',
'DATETIME',
- 'IMAGE');
+ 'IMAGE',
+ 'DATETIME',
+ 'DATETIME');
begin
Result := Types[DataType];
end;
@@ -581,6 +595,11 @@
Result := TInstantDBXMSSQLResolver.Create(Self, Map);
end;
+class function TInstantDBXMSSQLBroker.GeneratorClass: TInstantSQLGeneratorClass;
+begin
+ Result := TInstantDBXMSSQLSQLGenerator;
+end;
+
function TInstantDBXMSSQLBroker.GetDBMSName: string;
begin
Result := 'MS SQL Server';
@@ -596,6 +615,39 @@
Result := TInstantDBXMSSQLQuery.Create(Connector);
end;
+{ TInstantDBXMSSQLSQLGenerator }
+
+function TInstantDBXMSSQLSQLGenerator.EmbraceIndex(
+ const IndexName: string): string;
+begin
+ Result := InstantEmbrace(IndexName, Delimiters);
+end;
+
+function TInstantDBXMSSQLSQLGenerator.InternalGenerateAlterFieldSQL(
+ OldMetadata, NewMetadata: TInstantFieldMetadata): string;
+begin
+ Result := Format('ALTER TABLE %s ALTER COLUMN %s %s',
+ [EmbraceTable(OldMetadata.TableMetadata.Name),
+ EmbraceField(OldMetadata.Name),
+ Broker.DataTypeToColumnType(NewMetadata.DataType, NewMetadata.Size)]);
+end;
+
+function TInstantDBXMSSQLSQLGenerator.InternalGenerateDropFieldSQL(
+ Metadata: TInstantFieldMetadata): string;
+begin
+ Result := Format('ALTER TABLE %s DROP COLUMN %s',
+ [EmbraceTable(Metadata.TableMetadata.Name),
+ EmbraceField(Metadata.Name)]);
+end;
+
+function TInstantDBXMSSQLSQLGenerator.InternalGenerateDropIndexSQL(
+ Metadata: TInstantIndexMetadata): string;
+begin
+ Result := Format('DROP INDEX %s.%s',
+ [EmbraceTable(Metadata.TableMetadata.Name),
+ EmbraceIndex(Metadata.Name)]);
+end;
+
{ TInstantDBXOracleBroker }
procedure TInstantDBXOracleBroker.AssignParam(SourceParam, TargetParam: TParam);
@@ -621,7 +673,9 @@
'VARCHAR',
'CLOB',
'DATE',
- 'BLOB');
+ 'BLOB',
+ 'DATE',
+ 'DATE');
begin
Result := Types[DataType];
end;
@@ -649,7 +703,9 @@
'VARCHAR',
'CLOB (1000 K)',
'TIMESTAMP',
- 'BLOB (1000 K)');
+ 'BLOB (1000 K)',
+ 'TIMESTAMP',
+ 'TIMESTAMP');
begin
Result := Types[DataType];
end;
@@ -690,7 +746,9 @@
'VARCHAR',
'TEXT',
'DATETIME',
- 'BLOB');
+ 'BLOB',
+ 'DATE',
+ 'TIME');
begin
Result := Types[DataType];
end;
Modified: trunk/Source/Brokers/IBX/InstantIBX.pas
===================================================================
--- trunk/Source/Brokers/IBX/InstantIBX.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Brokers/IBX/InstantIBX.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -426,7 +426,9 @@
'VARCHAR',
'BLOB SUB_TYPE 1',
'TIMESTAMP',
- 'BLOB');
+ 'BLOB',
+ 'DATE',
+ 'TIME');
begin
Result := Types[DataType];
if (DataType = dtString) and (Size > 0) then
Modified: trunk/Source/Catalogs/MSSql/InstantMSSqlCatalog.pas
===================================================================
--- trunk/Source/Catalogs/MSSql/InstantMSSqlCatalog.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Catalogs/MSSql/InstantMSSqlCatalog.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -167,6 +167,8 @@
FieldMetadata := TableMetadata.FieldMetadatas.Add;
FieldMetadata.Name := Fields.FieldByName('COLUMN_NAME').AsString;
FieldMetadata.DataType := FieldDataType;
+ if FieldDataType = dtDateTime then
+ FieldMetadata.AlternateDataTypes := [dtDate, dtTime];
FieldMetadata.Options := [];
if Fields.FieldByName('COLUMN_NULLABLE').AsInteger <> 1 then
FieldMetadata.Options := FieldMetadata.Options + [foRequired];
@@ -387,6 +389,8 @@
ExternalPartAttributeClass varchar 17 0 129 167 32 32 NULL 1
ExternalPartAttributeId varchar 18 0 129 167 32 32 NULL 1
EmbeddedReferencesAtttribute image 19 0 128 34 16 NULL NULL 1
+DateAttr datetime 8 0 135 61 16 23 3 1
+TimeAttr datetime 8 0 135 61 16 23 3 1
*)
end.
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Core/InstantBrokers.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -316,6 +316,8 @@
procedure ClearBlob(Attribute: TInstantBlob); virtual;
procedure ClearBoolean(Attribute: TInstantBoolean); virtual;
procedure ClearDateTime(Attribute: TInstantDateTime); virtual;
+ procedure ClearDate(Attribute: TInstantDate); virtual;
+ procedure ClearTime(Attribute: TInstantTime); virtual;
procedure ClearInteger(Attribute: TInstantInteger); virtual;
procedure ClearFloat(Attribute: TInstantFloat); virtual;
procedure ClearCurrency(Attribute: TInstantCurrency); virtual;
@@ -356,6 +358,8 @@
procedure ReadBlob(Attribute: TInstantBlob); virtual;
procedure ReadBoolean(Attribute: TInstantBoolean); virtual;
procedure ReadDateTime(Attribute: TInstantDateTime); virtual;
+ procedure ReadDate(Attribute: TInstantDate); virtual;
+ procedure ReadTime(Attribute: TInstantTime); virtual;
procedure ReadInteger(Attribute: TInstantInteger); virtual;
procedure ReadFloat(Attribute: TInstantFloat); virtual;
procedure ReadCurrency(Attribute: TInstantCurrency); virtual;
@@ -373,6 +377,8 @@
procedure WriteBlob(Attribute: TInstantBlob); virtual;
procedure WriteBoolean(Attribute: TInstantBoolean); virtual;
procedure WriteDateTime(Attribute: TInstantDateTime); virtual;
+ procedure WriteDate(Attribute: TInstantDate); virtual;
+ procedure WriteTime(Attribute: TInstantTime); virtual;
procedure WriteFloat(Attribute: TInstantFloat); virtual;
procedure WriteCurrency(Attribute: TInstantCurrency); virtual;
procedure WriteInteger(Attribute: TInstantInteger); virtual;
@@ -464,6 +470,10 @@
Boolean; virtual;
function ReadDateTimeField(DataSet: TDataSet; const FieldName: string):
TDateTime; virtual;
+ function ReadDateField(DataSet: TDataSet; const FieldName: string):
+ TDateTime; virtual;
+ function ReadTimeField(DataSet: TDataSet; const FieldName: string):
+ TDateTime; virtual;
function ReadFloatField(DataSet: TDataSet; const FieldName: string): Double;
virtual;
function ReadCurrencyField(DataSet: TDataSet; const FieldName: string):
@@ -969,6 +979,7 @@
{$IFDEF D6+}
Variants,
{$ENDIF}
+ DateUtils,
TypInfo, InstantUtils, InstantRtti;
const
@@ -1719,6 +1730,10 @@
ClearString(Attribute as TInstantString);
atDateTime:
ClearDateTime(Attribute as TInstantDateTime);
+ atDate:
+ ClearDate(Attribute as TInstantDate);
+ atTime:
+ ClearTime(Attribute as TInstantTime);
atBlob:
ClearBlob(Attribute as TInstantBlob);
atGraphic:
@@ -1753,6 +1768,14 @@
begin
end;
+procedure TInstantNavigationalResolver.ClearDate(Attribute: TInstantDate);
+begin
+end;
+
+procedure TInstantNavigationalResolver.ClearTime(Attribute: TInstantTime);
+begin
+end;
+
procedure TInstantNavigationalResolver.ClearFloat(Attribute: TInstantFloat);
begin
end;
@@ -2083,6 +2106,10 @@
ReadString(Attribute as TInstantString);
atDateTime:
ReadDateTime(Attribute as TInstantDateTime);
+ atDate:
+ ReadDate(Attribute as TInstantDate);
+ atTime:
+ ReadTime(Attribute as TInstantTime);
atBlob:
ReadBlob(Attribute as TInstantBlob);
atGraphic:
@@ -2126,6 +2153,20 @@
Value := FieldByName(Metadata.FieldName).AsDateTime;
end;
+procedure TInstantNavigationalResolver.ReadDate(
+ Attribute: TInstantDate);
+begin
+ with Attribute do
+ Value := DateOf(FieldByName(Metadata.FieldName).AsDateTime);
+end;
+
+procedure TInstantNavigationalResolver.ReadTime(
+ Attribute: TInstantTime);
+begin
+ with Attribute do
+ Value := TimeOf(FieldByName(Metadata.FieldName).AsDateTime);
+end;
+
procedure TInstantNavigationalResolver.ReadFloat(Attribute: TInstantFloat);
begin
with Attribute do
@@ -2320,6 +2361,10 @@
WriteString(Attribute as TInstantString);
atDateTime:
WriteDateTime(Attribute as TInstantDateTime);
+ atDate:
+ WriteDate(Attribute as TInstantDate);
+ atTime:
+ WriteTime(Attribute as TInstantTime);
atBlob:
WriteBlob(Attribute as TInstantBlob);
atGraphic:
@@ -2367,6 +2412,20 @@
FieldByName(Metadata.FieldName).AsDateTime := Value;
end;
+procedure TInstantNavigationalResolver.WriteDate(
+ Attribute: TInstantDate);
+begin
+ with Attribute do
+ FieldByName(Metadata.FieldName).AsDateTime := Value;
+end;
+
+procedure TInstantNavigationalResolver.WriteTime(
+ Attribute: TInstantTime);
+begin
+ with Attribute do
+ FieldByName(Metadata.FieldName).AsDateTime := Value;
+end;
+
procedure TInstantNavigationalResolver.WriteFloat(Attribute: TInstantFloat);
begin
with Attribute do
@@ -2553,6 +2612,18 @@
(Attribute as TInstantDateTime).Value;
end;
+ procedure AddDateAttributeParam;
+ begin
+ AddParam(Params, FieldName, ftDate).AsDateTime :=
+ (Attribute as TInstantDate).Value;
+ end;
+
+ procedure AddTimeAttributeParam;
+ begin
+ AddParam(Params, FieldName, ftTime).AsDateTime :=
+ (Attribute as TInstantTime).Value;
+ end;
+
procedure AddFloatAttributeParam;
begin
AddParam(Params, FieldName, ftFloat).AsFloat :=
@@ -2664,6 +2735,10 @@
AddBooleanAttributeParam;
atDateTime:
AddDateTimeAttributeParam;
+ atDate:
+ AddDateAttributeParam;
+ atTime:
+ AddTimeAttributeParam;
atFloat:
AddFloatAttributeParam;
atCurrency:
@@ -3236,6 +3311,18 @@
ReadDateTimeField(DataSet, AFieldName);
end;
+ procedure ReadDateAttribute;
+ begin
+ (Attribute as TInstantDate).Value :=
+ ReadDateField(DataSet, AFieldName);
+ end;
+
+ procedure ReadTimeAttribute;
+ begin
+ (Attribute as TInstantTime).Value :=
+ ReadTimeField(DataSet, AFieldName);
+ end;
+
procedure ReadFloatAttribute;
begin
(Attribute as TInstantFloat).Value := ReadFloatField(DataSet, AFieldName);
@@ -3398,6 +3485,10 @@
ReadStringAttribute;
atDateTime:
ReadDateTimeAttribute;
+ atDate:
+ ReadDateAttribute;
+ atTime:
+ ReadTimeAttribute;
atBlob, atGraphic:
ReadBlobAttribute;
atMemo:
@@ -3448,6 +3539,18 @@
Result := DataSet.FieldByName(FieldName).AsDateTime;
end;
+function TInstantSQLResolver.ReadDateField(DataSet: TDataSet;
+ const FieldName: string): TDateTime;
+begin
+ Result := DateOf(DataSet.FieldByName(FieldName).AsDateTime);
+end;
+
+function TInstantSQLResolver.ReadTimeField(DataSet: TDataSet;
+ const FieldName: string): TDateTime;
+begin
+ Result := TimeOf(DataSet.FieldByName(FieldName).AsDateTime);
+end;
+
function TInstantSQLResolver.ReadFloatField(DataSet: TDataSet;
const FieldName: string): Double;
begin
Modified: trunk/Source/Core/InstantCode.pas
===================================================================
--- trunk/Source/Core/InstantCode.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Core/InstantCode.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -889,6 +889,9 @@
procedure SetName(const Value: string); override;
procedure VisibilityFilter(Sender: TInstantCodeObject;
var Include: Boolean; Arg: Pointer);
+ procedure AddUses(const AUnitNames: array of string; Scope:
+ TInstantCodeScope; var Source: string; ChangeInfo:
+ TInstantCodeClassChangeInfo);
property SubClassList: TList read GetSubClassList;
public
constructor Create(AOwner: TInstantCodeObject); override;
@@ -1241,15 +1244,15 @@
procedure SetModuleTypeName(const Value: string);
protected
function GetModule: TInstantCodeModule; override;
- procedure InsertType(AType: TInstantCodeType);
procedure InternalRead(Reader: TInstantCodeReader); override;
procedure InternalWrite(Writer: TInstantCodeWriter); override;
- procedure RemoveType(AType: TInstantCodeType);
public
constructor Create(AOwner: TInstantCodeObject); override;
destructor Destroy; override;
function FindClass(const Name: string): TInstantCodeClass;
function FindType(const Name: string): TInstantCodeType;
+ procedure InsertType(AType: TInstantCodeType);
+ procedure RemoveType(AType: TInstantCodeType);
procedure LoadFromFile(const FileName: string; Scope: TInstantCodeScope);
procedure LoadFromStream(Stream: TStream; Scope: TInstantCodeScope);
procedure LoadFromString(const Str: string; Scope: TInstantCodeScope);
@@ -1413,7 +1416,7 @@
function AddMethod(AClass: TInstantCodeClass; Template: TInstantCodeMethod): TInstantCodeMethod;
function AddProc(Template: TInstantCodeProc): TInstantCodeProc;
function AddProperty(AClass: TInstantCodeClass; Template: TInstantCodeProperty): TInstantCodeProperty;
- procedure AddUses(const AUnitName: string; Scope: TInstantCodeScope);
+ procedure AddUses(const AUnitNames: array of string; Scope: TInstantCodeScope = scInterface);
procedure ChangeAttribute(AClass: TInstantCodeClass; Name: string;
Template: TInstantCodeAttribute);
procedure ChangeClass(ChangeInfo: TInstantCodeClassChangeInfo; NewClass: TInstantCodeClass);
@@ -1570,6 +1573,10 @@
Result := 'string';
atDateTime:
Result := 'TDateTime';
+ atDate:
+ Result := 'TDate';
+ atTime:
+ Result := 'TTime';
else
Result := '';
end;
@@ -1592,8 +1599,9 @@
'', // atPart
'', // atReference
'', // atParts,
- '' // atReferences
- );
+ '', // atReferences
+ 'TDate',
+ 'TTime');
begin
for Result := Low(Result) to High(Result) do
if SameText(PropType, TypeNames[Result]) then
@@ -1615,6 +1623,8 @@
AddObject('String', TStringTypeProcessor.Create);
AddObject('Memo', TStringTypeProcessor.Create);
AddObject('DateTime', TDateTimeTypeProcessor.Create);
+ AddObject('Date', TDateTimeTypeProcessor.Create);
+ AddObject('Time', TDateTimeTypeProcessor.Create);
AddObject('Part', TPartTypeProcessor.Create);
AddObject('Reference', TObjectTypeProcessor.Create);
AddObject('Parts', TContainerTypeProcessor.Create);
@@ -4813,6 +4823,24 @@
Result := TInstantCodeProperty(AddMember(TInstantCodeProperty, Visibility));
end;
+procedure TInstantCodeClass.AddUses(const AUnitNames: array of string;
+ Scope: TInstantCodeScope; var Source: string;
+ ChangeInfo: TInstantCodeClassChangeInfo);
+var
+ Modifier: TInstantCodeModifier;
+begin
+ if Assigned(ChangeInfo.Modifier) then
+ Modifier := ChangeInfo.Modifier
+ else
+ Modifier := TInstantCodeModifier.Create(Source, Self.Project);
+ try
+ Modifier.AddUses(AUnitNames, Scope);
+ finally
+ if not Assigned(ChangeInfo.Modifier) then
+ Modifier.Free;
+ end;
+end;
+
procedure TInstantCodeClass.ApplyToSource(var Source: string;
ChangeInfo: TInstantCodeClassChangeInfo);
var
@@ -4825,7 +4853,6 @@
Modifier := TInstantCodeModifier.Create(Source, Self.Project);
try
with Modifier do
- begin
case ChangeInfo.ChangeType of
ctNew:
AddClass(Self);
@@ -4834,12 +4861,13 @@
ctDelete:
DeleteClass(Self);
end;
- AddUses('InstantPersistence', scInterface);
- end;
finally
if not Assigned(ChangeInfo.Modifier) then
Modifier.Free;
end;
+ AddUses(['InstantPersistence', 'InstantTypes'],
+ scInterface, Source, ChangeInfo);
+ AddUses(['InstantMetadata'], scImplementation, Source, ChangeInfo);
end;
procedure TInstantCodeClass.AssignAttributes(List: TList);
@@ -7488,33 +7516,56 @@
Result.Setter := AddMethod(AClass, Template.Setter);
end;
-procedure TInstantCodeModifier.AddUses(const AUnitName: string;
- Scope: TInstantCodeScope);
+procedure TInstantCodeModifier.AddUses(const AUnitNames: array of string; Scope: TInstantCodeScope);
var
Section: TInstantCodeSection;
UsesClause: TInstantCodeUsesClause;
+ iNames: Integer;
+ sStr: string;
begin
+ { check for an empty array }
+ if Length(AUnitNames) = 0 then
+ Exit;
+
with Module do
if Scope = scInterface then
Section := InterfaceSection else
Section := ImplementationSection;
with Section do
begin
+ sStr := '';
UsesClause := FindUsesClause;
if Assigned(UsesClause) then
begin
- if Assigned(UsesClause.Find(AUnitName)) then
- Exit;
- InsertMode := imBefore;
- CursorPos := UsesClause.EndPos;
- MoveCursor(-1);
- InsertText(', ' + AUnitName, True);
- end else
+ { check an existing uses clause and add missing units }
+ for iNames := Low(AUnitNames) to High(AUnitNames) do
+ { build the required string first }
+ if (AUnitNames[iNames] <> '') and
+ not Assigned(UsesClause.Find(AUnitNames[iNames])) then
+ sStr := sStr + ', ' + AUnitNames[iNames];
+ if sStr <> '' then
+ begin
+ InsertMode := imBefore;
+ CursorPos := UsesClause.EndPos;
+ MoveCursor(-1);
+ InsertText(sStr, True);
+ end;
+ end
+ else
begin
+ { uses clause was not found, add all units }
InsertMode := imAfter;
CursorPos := StartPos;
SkipLine;
- InsertText(CRLF + 'uses' + CRLF + ' ' + AUnitName + ';' + CRLF);
+ for iNames := Low(AUnitNames) to High(AUnitNames) do
+ begin
+ if AUnitNames[iNames] <> '' then
+ if sStr = '' then
+ sStr := ' ' + AUnitNames[iNames]
+ else
+ sStr := sStr + ', ' + AUnitNames[iNames];
+ end;
+ InsertText(CRLF + 'uses' + CRLF + sStr + ';' + CRLF)
end;
end;
end;
Modified: trunk/Source/Core/InstantMetadata.pas
===================================================================
--- trunk/Source/Core/InstantMetadata.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Core/InstantMetadata.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -538,9 +538,9 @@
const
AttributeClasses: array[TInstantAttributeType] of TInstantAttributeClass = (
nil, TInstantInteger, TInstantFloat, TInstantCurrency, TInstantBoolean,
- TInstantString, TInstantDateTime, TInstantBlob, TInstantMemo,
+ TInstantString, TInstantDateTime, TInstantBlob, TInstantMemo,
TInstantGraphic, TInstantPart, TInstantReference, TInstantParts,
- TInstantReferences);
+ TInstantReferences, TInstantDate, TInstantTime);
{ TInstantMetadata }
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Core/InstantPersistence.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -169,6 +169,8 @@
function GetAsBoolean: Boolean; virtual;
function GetAsCurrency: Currency; virtual;
function GetAsDateTime: TDateTime; virtual;
+ function GetAsDate: TDateTime; virtual;
+ function GetAsTime: TDateTime; virtual;
function GetAsFloat: Double; virtual;
function GetAsInteger: Integer; virtual;
function GetAsObject: TInstantObject; virtual;
@@ -184,6 +186,8 @@
procedure SetAsBoolean(AValue: Boolean); virtual;
procedure SetAsCurrency(AValue: Currency); virtual;
procedure SetAsDateTime(AValue: TDateTime); virtual;
+ procedure SetAsDate(AValue: TDateTime); virtual;
+ procedure SetAsTime(AValue: TDateTime); virtual;
procedure SetAsFloat(AValue: Double); virtual;
procedure SetAsInteger(AValue: Integer); virtual;
procedure SetAsObject(AValue: TInstantObject); virtual;
@@ -203,6 +207,8 @@
property AsBoolean: Boolean read GetAsBoolean write SetAsBoolean;
property AsCurrency: Currency read GetAsCurrency write SetAsCurrency;
property AsDateTime: TDateTime read GetAsDateTime write SetAsDateTime;
+ property AsDate: TDateTime read GetAsDate write SetAsDate;
+ property AsTime: TDateTime read GetAsTime write SetAsTime;
property AsFloat: Double read GetAsFloat write SetAsFloat;
property AsInteger: Integer read GetAsInteger write SetAsInteger;
property AsObject: TInstantObject read GetAsObject write SetAsObject;
@@ -377,7 +383,7 @@
property Value: string read GetValue write SetValue;
end;
- TInstantDateTime = class(TInstantSimple)
+ TInstantCustomDateTime = class(TInstantSimple)
private
FValue: TDateTime;
function DefaultValue: TDateTime;
@@ -403,6 +409,32 @@
property Value: TDateTime read GetValue write SetValue;
end;
+ TInstantDateTime = class(TInstantCustomDateTime)
+ protected
+ class function AttributeType: TInstantAttributeType; override;
+ function GetAsDate: TDateTime; override;
+ function GetAsTime: TDateTime; override;
+ procedure SetAsDate(AValue: TDateTime); override;
+ procedure SetAsTime(AValue: TDateTime); override;
+ end;
+
+ TInstantDate = class(TInstantCustomDateTime)
+ protected
+ class function AttributeType: TInstantAttributeType; override;
+ function GetAsDate: TDateTime; override;
+ procedure SetValue(AValue: TDateTime); override;
+ procedure SetAsDate(AValue: TDateTime); override;
+ end;
+
+ TInstantTime = class(TInstantCustomDateTime)
+ protected
+ class function AttributeType: TInstantAttributeType; override;
+ function GetAsString: string; override;
+ function GetAsTime: TDateTime; override;
+ procedure SetValue(AValue: TDateTime); override;
+ procedure SetAsTime(AValue: TDateTime); override;
+ end;
+
TInstantBlob = class(TInstantSimple)
private
FStream: TMemoryStream;
@@ -1542,7 +1574,7 @@
const
InstantDataTypeStrings: array[TInstantDataType] of string =
- ('Integer', 'Float', 'Currency', 'Boolean', 'String', 'Memo', 'DateTime', 'Blob');
+ ('Integer', 'Float', 'Currency', 'Boolean', 'String', 'Memo', 'DateTime', 'Blob', 'Date', 'Time');
procedure AssignInstantDataTypeStrings(Strings: TStrings);
@@ -1569,6 +1601,7 @@
{$ELSE}
Mask,
{$ENDIF}
+ DateUtils,
InstantUtils, {InstantRtti, }InstantDesignHook, InstantCode;
var
@@ -1643,7 +1676,9 @@
dtBlob, //atPart
dtString, //atReference
dtBlob, //atParts
- dtBlob); //atReferences
+ dtBlob, //atReferences
+ dtDate, //atDate
+ dtTime); //atTime
DataTypesXML: array[TInstantAttributeType] of TInstantDataType = (
dtString, //atUnknown
@@ -1659,7 +1694,9 @@
dtMemo, //atPart
dtString, //atReference
dtMemo, //atParts
- dtMemo); //atReferences
+ dtMemo, //atReferences
+ dtDate, //atDate
+ dtTime); //atTime
begin
if BlobStreamFormat = sfBinary then
Result := DataTypesBinary[AttributeType]
@@ -1677,6 +1714,8 @@
dtString: Result := ftString;
dtMemo: Result := ftMemo;
dtDateTime: Result := ftDateTime;
+ dtDate: Result := ftDate;
+ dtTime: Result := ftTime;
dtBlob: Result := ftBlob;
else
raise EInstantError.CreateFmt(SUnsupportedDataType,
@@ -2292,6 +2331,16 @@
raise AccessError('DateTime');
end;
+function TInstantAttribute.GetAsDate: TDateTime;
+begin
+ raise AccessError('Date');
+end;
+
+function TInstantAttribute.GetAsTime: TDateTime;
+begin
+ raise AccessError('Time');
+end;
+
function TInstantAttribute.GetAsFloat: Double;
begin
raise AccessError('Float');
@@ -2417,6 +2466,16 @@
raise AccessError('DateTime');
end;
+procedure TInstantAttribute.SetAsDate(AValue: TDateTime);
+begin
+ raise AccessError('Date');
+end;
+
+procedure TInstantAttribute.SetAsTime(AValue: TDateTime);
+begin
+ raise AccessError('Time');
+end;
+
procedure TInstantAttribute.SetAsFloat(AValue: Double);
begin
raise AccessError('Float');
@@ -3194,20 +3253,15 @@
{ TInstantDateTime }
-procedure TInstantDateTime.Assign(Source: TPersistent);
+procedure TInstantCustomDateTime.Assign(Source: TPersistent);
begin
inherited;
- if Source is TInstantDateTime then
- Value := TInstantDateTime(Source).Value
+ if Source is TInstantCustomDateTime then
+ Value := TInstantCustomDateTime(Source).Value
end;
-class function TInstantDateTime.AttributeType: TInstantAttributeType;
+function TInstantCustomDateTime.DefaultValue: TDateTime;
begin
- Result := atDateTime;
-end;
-
-function TInstantDateTime.DefaultValue: TDateTime;
-begin
if Assigned(Metadata) and (Metadata.DefaultValue <> '') then
if SameText(Metadata.DefaultValue, InstantNowString) then
Result := Now
@@ -3226,22 +3280,22 @@
Result := 0;
end;
-function TInstantDateTime.GetAsDateTime: TDateTime;
+function TInstantCustomDateTime.GetAsDateTime: TDateTime;
begin
Result := Value;
end;
-function TInstantDateTime.GetAsString: string;
+function TInstantCustomDateTime.GetAsString: string;
begin
Result := DateTimeToStr(Value);
end;
-function TInstantDateTime.GetAsVariant: Variant;
+function TInstantCustomDateTime.GetAsVariant: Variant;
begin
Result := Value;
end;
-function TInstantDateTime.GetDisplayText: string;
+function TInstantCustomDateTime.GetDisplayText: string;
begin
if AsDateTime = 0 then
Result := ''
@@ -3253,28 +3307,28 @@
end
end;
-function TInstantDateTime.GetIsDefault: Boolean;
+function TInstantCustomDateTime.GetIsDefault: Boolean;
begin
Result := Value = DefaultValue;
end;
-function TInstantDateTime.GetValue: TDateTime;
+function TInstantCustomDateTime.GetValue: TDateTime;
begin
Result := FValue;
end;
-procedure TInstantDateTime.Initialize;
+procedure TInstantCustomDateTime.Initialize;
begin
FValue := DefaultValue;
end;
-procedure TInstantDateTime.ReadObject(Reader: TInstantReader);
+procedure TInstantCustomDateTime.ReadObject(Reader: TInstantReader);
begin
ReadName(Reader);
Value := Reader.ReadDate;
end;
-procedure TInstantDateTime.Reset;
+procedure TInstantCustomDateTime.Reset;
begin
if Assigned(Metadata) then
Initialize
@@ -3283,12 +3337,12 @@
Changed;
end;
-procedure TInstantDateTime.SetAsDateTime(AValue: TDateTime);
+procedure TInstantCustomDateTime.SetAsDateTime(AValue: TDateTime);
begin
Value := AValue;
end;
-procedure TInstantDateTime.SetAsString(const AValue: string);
+procedure TInstantCustomDateTime.SetAsString(const AValue: string);
begin
try
Value := StrToDateTime(AValue)
@@ -3298,7 +3352,7 @@
end;
end;
-procedure TInstantDateTime.SetAsVariant(AValue: Variant);
+procedure TInstantCustomDateTime.SetAsVariant(AValue: Variant);
begin
try
Value := AValue;
@@ -3308,7 +3362,7 @@
end;
end;
-procedure TInstantDateTime.SetValue(AValue: TDateTime);
+procedure TInstantCustomDateTime.SetValue(AValue: TDateTime);
begin
if AValue <> FValue then
begin
@@ -3317,12 +3371,39 @@
end;
end;
-procedure TInstantDateTime.WriteObject(Writer: TInstantWriter);
+procedure TInstantCustomDateTime.WriteObject(Writer: TInstantWriter);
begin
WriteName(Writer);
Writer.WriteDate(Value);
end;
+{ TInstantDateTime }
+
+class function TInstantDateTime.AttributeType: TInstantAttributeType;
+begin
+ Result := atDateTime;
+end;
+
+function TInstantDateTime.GetAsDate: TDateTime;
+begin
+ Result := DateOf(Value);
+end;
+
+function TInstantDateTime.GetAsTime: TDateTime;
+begin
+ Result := TimeOf(Value);
+end;
+
+procedure TInstantDateTime.SetAsDate(AValue: TDateTime);
+begin
+ Value := DateOf(AValue);
+end;
+
+procedure TInstantDateTime.SetAsTime(AValue: TDateTime);
+begin
+ Value := TimeOf(AValue);
+end;
+
{ TInstantBlob }
procedure TInstantBlob.Assign(Source: TPersistent);
@@ -5407,7 +5488,7 @@
Writer.WriteBoolean(SameText(Processor.ReadData, InstantTrueString));
atString, atMemo:
Writer.WriteString(Processor.ReadData);
- atDateTime:
+ atDateTime, atDate, atTime:
Writer.WriteDate(InstantStrToDateTime(Processor.ReadData));
atBlob, atGraphic:
begin
@@ -8820,7 +8901,63 @@
inherited Items[Index] := Value;
end;
+{ TInstantDate }
+class function TInstantDate.AttributeType: TInstantAttributeType;
+begin
+ Result := atDate;
+end;
+
+function TInstantDate.GetAsDate: TDateTime;
+begin
+ Result := Value;
+end;
+
+procedure TInstantDate.SetAsDate(AValue: TDateTime);
+begin
+ Value := DateOf(AValue);
+end;
+
+procedure TInstantDate.SetValue(AValue: TDateTime);
+begin
+ if AValue <> FValue then
+ begin
+ FValue := DateOf(AValue);
+ Changed;
+ end;
+end;
+
+{ TInstantTime }
+
+class function TInstantTime.AttributeType: TInstantAttributeType;
+begin
+ Result := atTime;
+end;
+
+function TInstantTime.GetAsTime: TDateTime;
+begin
+ Result := Value;
+end;
+
+function TInstantTime.GetAsString: string;
+begin
+ Result := TimeToStr(Value);
+end;
+
+procedure TInstantTime.SetAsTime(AValue: TDateTime);
+begin
+ Value := TimeOf(AValue);
+end;
+
+procedure TInstantTime.SetValue(AValue: TDateTime);
+begin
+ if AValue <> FValue then
+ begin
+ FValue := TimeOf(AValue);
+ Changed;
+ end;
+end;
+
initialization
RegisterClasses([TInstantClassMetadatas, TInstantClassMetadata,
TInstantAttributeMetadatas, TInstantAttributeMetadata,
Modified: trunk/Source/Core/InstantPresentation.pas
===================================================================
--- trunk/Source/Core/InstantPresentation.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Core/InstantPresentation.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -769,7 +769,8 @@
const
FieldTypes: array[TInstantAttributeType] of TFieldType = (
ftUnknown, ftInteger, ftFloat, ftBCD, ftBoolean, ftString, ftDateTime,
- ftBlob, ftMemo, ftBlob, ftInteger, ftInteger, ftDataSet, ftDataSet);
+ ftBlob, ftMemo, ftBlob, ftInteger, ftInteger, ftDataSet, ftDataSet,
+ ftDate, ftTime);
begin
Result := FieldTypes[AttributeType];
end;
@@ -2162,6 +2163,7 @@
ATypeInfo : PTypeInfo;
begin
ATypeInfo := PropInfo.PropType^;
+
if GetTypeData(PropInfo^.PropType^).FloatType = ftCurr then
Result := DB.ftBcd
else
@@ -2172,7 +2174,7 @@
Result := DB.ftDate
else if ATypeInfo = TypeInfo(TTime) then
Result := DB.ftTime
-*)
+*)
else
Result := DB.ftFloat;
end;
@@ -2225,7 +2227,12 @@
tkInteger:
FieldType := ftInteger;
tkFloat:
- FieldType := FloatFieldType;
+ if PropInfo^.PropType^^.Name = 'TTime' then
+ FieldType := DB.ftTime
+ else if PropInfo^.PropType^^.Name = 'TDate' then
+ FieldType := DB.ftDate
+ else
+ FieldType := FloatFieldType;
tkClass:
FieldType := ftInteger;
tkSet:
Modified: trunk/Source/Core/InstantTypes.pas
===================================================================
--- trunk/Source/Core/InstantTypes.pas 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Source/Core/InstantTypes.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -44,7 +44,7 @@
TInstantStorageKind = (skEmbedded, skExternal);
TInstantAttributeType = (atUnknown, atInteger, atFloat, atCurrency, atBoolean,
atString, atDateTime, atBlob, atMemo, atGraphic,
- atPart, atReference, atParts, atReferences);
+ atPart, atReference, atParts, atReferences, atDate, atTime);
TInstantAttributeCategory = (acUnknown, acSimple, acElement, acContainer);
TInstantGraphicFileFormat = (gffUnknown, gffBmp, gffTiff, gffJpeg, gffPng,
@@ -53,7 +53,7 @@
TInstantPersistence = (peEmbedded, peStored);
TInstantDataType = (dtInteger, dtFloat, dtCurrency, dtBoolean, dtString,
- dtMemo, dtDateTime, dtBlob);
+ dtMemo, dtDateTime, dtBlob, dtDate, dtTime);
TInstantDataTypes = set of TInstantDataType;
TInstantFieldOption = (foRequired, foIndexed);
TInstantFieldOptions = set of TInstantFieldOption;
@@ -81,6 +81,9 @@
TInstantWarningEvent = procedure (const Sender: TObject;
const AWarningText: string) of object;
+ TTime = type TDateTime;
+ TDate = type TDateTime;
+
implementation
end.
Modified: trunk/Tests/TestIO.dpr
===================================================================
--- trunk/Tests/TestIO.dpr 2006-12-10 05:19:12 UTC (rev 736)
+++ trunk/Tests/TestIO.dpr 2006-12-11 00:17:56 UTC (rev 737)
@@ -38,6 +38,8 @@
TestInstantInteger in 'TestInstantInteger.pas',
TestInstantString in 'TestInstantString.pas',
TestInstantDateTime in 'TestInstantDateTime.pas',
+ TestInstantDate in 'TestInstantDate.pas',
+ TestInstantTime in 'TestInstantTime.pas',
TestInstantBoolean in 'TestInstantBoolean.pas',
TestInstantFloat in 'TestInstantFloat.pas',
TestInstantCurrency in 'TestInstantCurrency.pas',
Modified: trunk/Tests/TestIO.mdr
===================================================================
(Binary files differ)
Added: trunk/Tests/TestInstantDate.pas
===================================================================
--- trunk/Tests/TestInstantDate.pas (rev 0)
+++ trunk/Tests/TestInstantDate.pas 2006-12-11 00:17:56 UTC (rev 737)
@@ -0,0 +1,323 @@
+(*
+ * InstantObjects Test Suite
+ * TestInstantDate
+ *)
+
+(* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is: InstantObjects Test Suite/TestInstantDate
+ *
+ * The Initial Developer of the Original Code is: Steven Mitchell
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+unit TestInstantDate;
+
+interface
+
+uses fpcunit, InstantPersistence, InstantMock, TestModel;
+
+type
+
+ // Test methods for class TInstantDate
+ TestTInstantDate = class(TTestCase)
+ private
+ FConn: TInstantMockConnector;
+ FInstantDate: TInstantDate;
+ FOwner: TPerson;
+ public
+ procedure SetUp; override;
+ procedure TearDown; override;
+ published
+ procedure TestAsBoolean;
+ procedure TestAsCurrency;
+ procedure TestAsDate;
+ procedure TestAsDateTime;
+ procedure TestAsTime;
+ procedure TestAsFloat;
+ procedure TestAsInteger;
+ procedure TestAsObject;
+ procedure TestAssign;
+ procedure TestAsString;
+ procedure TestAsVariant;
+ procedure TestDisplayText;
+ procedure TestIsDefault;
+ procedure TestReset;
+ procedure TestValue;
+ end;
+
+implementation
+
+uses SysUtils, testregistry, InstantClasses;
+
+procedure TestTInstantDate.SetUp;
+begin
+ FConn := TInstantMockConnector.Create(nil);
+ FConn.BrokerClass := TInstantMockBroker;
+
+ if InstantModel.ClassMetadatas.Count > 0 then
+ InstantModel.ClassMetadatas.Clear;
+ InstantModel.LoadFromResFile(ChangeFileExt(ParamStr(0), '.mdr'));
+
+ FOwner := TPerson.Create(FConn);
+ FInstantDate := FOwner._EmploymentDate;
+ FInstantDate.Value := 100;
+end;
+
+procedure TestTInstantDate.TearDown;
+begin
+ FInstantDate := nil;
+ FreeAndNil(FOwner);
+ InstantModel.ClassMetadatas.Clear;
+ ...
[truncated message content] |
|
From: <na...@us...> - 2007-02-25 09:44:47
|
Revision: 767
http://svn.sourceforge.net/instantobjects/revision/?rev=767&view=rev
Author: nandod
Date: 2007-02-25 01:44:46 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
* Docs updated for 2.1.
Modified Paths:
--------------
trunk/Docs/Changes.txt
trunk/Docs/Install.txt
trunk/Readme1st.txt
trunk/Source/PackageGroups/Install.txt
Modified: trunk/Docs/Changes.txt
===================================================================
--- trunk/Docs/Changes.txt 2007-02-24 23:49:44 UTC (rev 766)
+++ trunk/Docs/Changes.txt 2007-02-25 09:44:46 UTC (rev 767)
@@ -1,6 +1,77 @@
VERSION HISTORY
---------------
+Version 2.1 (2.1.0.0) (2007-02-26)
+
+- Support for SQL Server 2005; catalog support for SQL Server 7;
+ better support for SQL Server in general.
+
+- Support for ModelMaker 6.20 to 9; better ModelMaker support
+ in general in ObjectFoundry.
+
+- Support for InstantDate and InstantTime for date-only and
+ time-only attribute types.
+
+- Instant Model Explorer enhancements:
+ - Class B has a base class A and subclasses C, D, etc.
+ making a three tier class hierarchy. If Class B is deleted
+ classes C, D, etc. will become subclasses of class A.
+ Previously they would become subclasses of TInstantObject.
+ - New class B in model unit X has a base class A in model unit Y.
+ When adding new class B, unit Y will be automatically
+ added to the Interface uses clause of unit X.
+ - Whenever a unit is added to the uses clause of an interface
+ section, that unit is removed from the implementation
+ section uses clause if present. Whenever a unit is added to the
+ implementation section uses clause, check the interface section
+ uses clause and if the unit is there then don't add anything.
+
+- Instant model Explorer now uses the newer ToolsAPI on Delphi 7+.
+
+- Improved object circular reference detection.
+
+- Added ability to disable circular reference checking
+ by undefining IO_CIRCULAR_REFERENCE_CHECK.
+
+- Enhanced SQL statement logging: now logs all statements,
+ including select statements.
+
+- BDE broker: fixed incomplete implementation of IdDataType
+ and IdSize.
+
+- ADO broker: fixed incomplete implementation of IdDataType
+ and IdSize.
+
+- XML broker: now only creates one file for each object,
+ in the concrete class' folder.
+
+- XML broker: removed support for versioning and
+ utf-8 "BOT" encoding.
+
+- XML broker: fixed failure on query refresh.
+
+- XML broker restructured for easier customization.
+
+- Refactored InstantPersistence.pas into:
+ InstantPersistence.pas - Remains the main 'IO interface' unit.
+ InstantBrokers.pas - Contains the descendant brokers, connectors classes.
+ InstantMetadata.pas - Contains the metadata, scheme, etc. classes.
+ InstantTypes - Contains some type declarations.
+
+- Ubmock and fpcunit integrated into the source tree
+ for easier test development.
+
+- Help file has been greatly improved.
+
+- Added explanatory document for IO to InterBase
+ and Firebird data type mappings.
+
+- Various fixes and enhancements (see tracker).
+
+Version 2.0 (2.0.0.0) (2006-08-07)
+
+- All 2.0 RC changes.
+
Version 2.0 RC 1 (1.9.2.1) (2006-05-07)
- Help file has been improved.
Modified: trunk/Docs/Install.txt
===================================================================
--- trunk/Docs/Install.txt 2007-02-24 23:49:44 UTC (rev 766)
+++ trunk/Docs/Install.txt 2007-02-25 09:44:46 UTC (rev 767)
@@ -1,6 +1,6 @@
------------------------------------------------------------------
- InstantObjects 2.0 for Delphi, Kylix, FPC
+ InstantObjects for Delphi, Kylix, FPC
Mozilla Public License 1.1
Based on Seleqt InstantObjects.
Modified: trunk/Readme1st.txt
===================================================================
--- trunk/Readme1st.txt 2007-02-24 23:49:44 UTC (rev 766)
+++ trunk/Readme1st.txt 2007-02-25 09:44:46 UTC (rev 767)
@@ -1,6 +1,6 @@
------------------------------------------------------------------
- InstantObjects 2.0 for Delphi, Kylix, FPC
+ InstantObjects for Delphi, Kylix, FPC
Mozilla Public License 1.1 Edition
Based on Seleqt InstantObjects.
Modified: trunk/Source/PackageGroups/Install.txt
===================================================================
--- trunk/Source/PackageGroups/Install.txt 2007-02-24 23:49:44 UTC (rev 766)
+++ trunk/Source/PackageGroups/Install.txt 2007-02-25 09:44:46 UTC (rev 767)
@@ -1,10 +1,9 @@
------------------------------------------------------------------
- InstantObjects 2.0 Beta 2 (1.9.2.1) for Delphi, Kylix, FPC
+ InstantObjects for Delphi, Kylix, FPC
Mozilla Public License 1.1 Edition
- January 2006 release
-
+
Based on Seleqt InstantObjects.
Portions created by Seleqt are Copyright (c) 2001-2003 Seleqt.
Other portions and changes are Copyright (c) the authors.
|
|
From: <na...@us...> - 2007-02-25 15:46:54
|
Revision: 768
http://svn.sourceforge.net/instantobjects/revision/?rev=768&view=rev
Author: nandod
Date: 2007-02-25 07:46:50 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
* res files updated for 2.1.
Modified Paths:
--------------
trunk/ReleaseTools/InstantVersion.res
trunk/Source/Brokers/ADO/D2005/DclIOADO.res
trunk/Source/Brokers/ADO/D2005/IOADO.res
trunk/Source/Brokers/ADO/D2006/DclIOADO.res
trunk/Source/Brokers/ADO/D2006/IOADO.res
trunk/Source/Brokers/ADO/D5/DclIOADO_D5.res
trunk/Source/Brokers/ADO/D5/IOADO_D5.res
trunk/Source/Brokers/ADO/D6/DclIOADO.res
trunk/Source/Brokers/ADO/D6/IOADO.res
trunk/Source/Brokers/ADO/D7/DclIOADO.res
trunk/Source/Brokers/ADO/D7/IOADO.res
trunk/Source/Brokers/ADS/D5/DclIOADS_D5.res
trunk/Source/Brokers/ADS/D5/ioads_D5.res
trunk/Source/Brokers/BDE/D2005/DclIOBDE.res
trunk/Source/Brokers/BDE/D2005/IOBDE.res
trunk/Source/Brokers/BDE/D2006/DclIOBDE.res
trunk/Source/Brokers/BDE/D2006/IOBDE.res
trunk/Source/Brokers/BDE/D5/DclIOBDE_D5.res
trunk/Source/Brokers/BDE/D5/Iobde_D5.res
trunk/Source/Brokers/BDE/D6/DclIOBDE.res
trunk/Source/Brokers/BDE/D6/IOBDE.res
trunk/Source/Brokers/BDE/D7/DclIOBDE.res
trunk/Source/Brokers/BDE/D7/IOBDE.res
trunk/Source/Brokers/DBISAM/D6/DclDBISAM.res
trunk/Source/Brokers/DBISAM/D6/IODBISAM.res
trunk/Source/Brokers/DBISAM/D7/DclDBISAM.res
trunk/Source/Brokers/DBISAM/D7/IODBISAM.res
trunk/Source/Brokers/DBX/D2005/DclIODBX.res
trunk/Source/Brokers/DBX/D2005/IODBX.res
trunk/Source/Brokers/DBX/D2006/DclIODBX.res
trunk/Source/Brokers/DBX/D2006/IODBX.res
trunk/Source/Brokers/DBX/D6/DclIODBX.res
trunk/Source/Brokers/DBX/D6/IODBX.res
trunk/Source/Brokers/DBX/D7/DclIODBX.res
trunk/Source/Brokers/DBX/D7/IODBX.res
trunk/Source/Brokers/DBX/K3/DclIODBX.res
trunk/Source/Brokers/DBX/K3/IODBX.res
trunk/Source/Brokers/FlashFiler/D5/DclIOff_D5.res
trunk/Source/Brokers/FlashFiler/D5/ioff_D5.res
trunk/Source/Brokers/IBX/D2005/DclIOIBX.res
trunk/Source/Brokers/IBX/D2005/IOIBX.res
trunk/Source/Brokers/IBX/D2006/DclIOIBX.res
trunk/Source/Brokers/IBX/D2006/IOIBX.res
trunk/Source/Brokers/IBX/D5/DclIOIBX_D5.res
trunk/Source/Brokers/IBX/D5/Ioibx_D5.res
trunk/Source/Brokers/IBX/D6/DclIOIBX.res
trunk/Source/Brokers/IBX/D6/IOIBX.res
trunk/Source/Brokers/IBX/D7/DclIOIBX.res
trunk/Source/Brokers/IBX/D7/IOIBX.res
trunk/Source/Brokers/NexusDb/D2005/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D2005/IONexusDB.res
trunk/Source/Brokers/NexusDb/D2006/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D2006/IONexusDB.res
trunk/Source/Brokers/NexusDb/D5/DclIONexusDB_D5.res
trunk/Source/Brokers/NexusDb/D5/IONexusDB_D5.res
trunk/Source/Brokers/NexusDb/D6/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D6/IONexusDB.res
trunk/Source/Brokers/NexusDb/D7/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D7/IONexusDB.res
trunk/Source/Brokers/UIB/D2005/DclIOUIB.res
trunk/Source/Brokers/UIB/D2005/IOUIB.res
trunk/Source/Brokers/UIB/D2006/DclIOUIB.res
trunk/Source/Brokers/UIB/D2006/IOUIB.res
trunk/Source/Brokers/UIB/D5/DclIOUIB_D5.res
trunk/Source/Brokers/UIB/D5/IOUIB_D5.res
trunk/Source/Brokers/UIB/D6/DclIOUIB.res
trunk/Source/Brokers/UIB/D6/IOUIB.res
trunk/Source/Brokers/UIB/D7/DclIOUIB.res
trunk/Source/Brokers/UIB/D7/IOUIB.res
trunk/Source/Brokers/XML/D2005/DclIOXML.res
trunk/Source/Brokers/XML/D2005/IOXML.res
trunk/Source/Brokers/XML/D2006/DclIOXML.res
trunk/Source/Brokers/XML/D2006/IOXML.res
trunk/Source/Brokers/XML/D5/DclIOXML_D5.res
trunk/Source/Brokers/XML/D5/Ioxml_D5.res
trunk/Source/Brokers/XML/D6/DclIOXML.res
trunk/Source/Brokers/XML/D6/IOXML.res
trunk/Source/Brokers/XML/D7/DclIOXML.res
trunk/Source/Brokers/XML/D7/IOXML.res
trunk/Source/Brokers/XML/k3/DclIOXML.res
trunk/Source/Brokers/XML/k3/IOXML.res
trunk/Source/Brokers/ZeosDBO/D2005/DclIOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D2005/IOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D2006/DclIOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D2006/IOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D5/DclIOZeosDBO_D5.res
trunk/Source/Brokers/ZeosDBO/D5/IOZeosDBO_D5.res
trunk/Source/Brokers/ZeosDBO/D6/DclIOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D6/IOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D7/DclIOZeosDBO.res
trunk/Source/Brokers/ZeosDBO/D7/IOZeosDBO.res
trunk/Source/Catalogs/IBFb/D2005/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/D2006/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/D5/IOIBFbCatalog_D5.res
trunk/Source/Catalogs/IBFb/D6/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/D7/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/K3/IOIBFbCatalog.res
trunk/Source/Catalogs/MSSql/D2005/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/D2006/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/D5/IOMSSqlCatalog_D5.res
trunk/Source/Catalogs/MSSql/D6/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/D7/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/K3/IOMSSqlCatalog.res
trunk/Source/Core/D2005/IOCore.res
trunk/Source/Core/D2006/IOCore.res
trunk/Source/Core/D5/IOCore_D5.res
trunk/Source/Core/D6/IOCore.res
trunk/Source/Core/D7/IOCore.res
trunk/Source/Core/K3/IOCore.res
trunk/Source/Design/D2005/DclIOCore.res
trunk/Source/Design/D2006/DclIOCore.res
trunk/Source/Design/D5/DclIOCore_D5.res
trunk/Source/Design/D6/DclIOCore.res
trunk/Source/Design/D7/DclIOCore.res
trunk/Source/Design/K3/DclIOCore.res
Modified: trunk/ReleaseTools/InstantVersion.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2005/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2005/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2006/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2006/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D5/DclIOADO_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D5/IOADO_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D6/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D6/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D7/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D7/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADS/D5/DclIOADS_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADS/D5/ioads_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2005/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2005/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2006/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2006/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D5/DclIOBDE_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D5/Iobde_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D6/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D6/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D7/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D7/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBISAM/D6/DclDBISAM.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBISAM/D6/IODBISAM.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBISAM/D7/DclDBISAM.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBISAM/D7/IODBISAM.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2005/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2005/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2006/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2006/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D6/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D6/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D7/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D7/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/K3/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/K3/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/FlashFiler/D5/DclIOff_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/FlashFiler/D5/ioff_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2005/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2005/IOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2006/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2006/IOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D5/DclIOIBX_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D5/Ioibx_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D6/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D6/IOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D7/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D7/IOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D2005/DclIONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D2005/IONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D2006/DclIONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D2006/IONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D5/DclIONexusDB_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D5/IONexusDB_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D6/DclIONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D6/IONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D7/DclIONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/NexusDb/D7/IONexusDB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D2005/DclIOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D2005/IOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D2006/DclIOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D2006/IOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D5/DclIOUIB_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D5/IOUIB_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D6/DclIOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D6/IOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D7/DclIOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/UIB/D7/IOUIB.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D2005/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D2005/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D2006/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D2006/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D5/DclIOXML_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D5/Ioxml_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D6/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D6/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D7/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/D7/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/k3/DclIOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/XML/k3/IOXML.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D2005/DclIOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D2005/IOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D2006/DclIOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D2006/IOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D5/DclIOZeosDBO_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D5/IOZeosDBO_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D6/DclIOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D6/IOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D7/DclIOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ZeosDBO/D7/IOZeosDBO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D2005/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D2006/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D5/IOIBFbCatalog_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D6/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/D7/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/IBFb/K3/IOIBFbCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D2005/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D2006/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D5/IOMSSqlCatalog_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D6/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/D7/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Catalogs/MSSql/K3/IOMSSqlCatalog.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D2005/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D2006/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D5/IOCore_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D6/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/D7/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Core/K3/IOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D2005/DclIOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D2006/DclIOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D5/DclIOCore_D5.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D6/DclIOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/D7/DclIOCore.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Design/K3/DclIOCore.res
===================================================================
(Binary files differ)
|
|
From: <na...@us...> - 2007-02-25 16:19:14
|
Revision: 770
http://svn.sourceforge.net/instantobjects/revision/?rev=770&view=rev
Author: nandod
Date: 2007-02-25 08:19:14 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
* small fixes to the test project.
* svn:ignore set on various folders.
Modified Paths:
--------------
trunk/Tests/TestIO.dpr
Property Changed:
----------------
trunk/Demos/PrimerCross/
trunk/Source/
trunk/Source/Brokers/ADO/
trunk/Source/Brokers/ADO/D7/
trunk/Source/Brokers/BDE/
trunk/Source/Brokers/BDE/D7/
trunk/Source/Brokers/DBX/D7/
trunk/Source/Brokers/IBX/D7/
trunk/Source/Brokers/XML/D7/
trunk/Source/Catalogs/IBFb/D7/
trunk/Source/Catalogs/MSSql/
trunk/Source/Catalogs/MSSql/D7/
trunk/Source/Design/D7/
trunk/Source/PackageGroups/D7/
Property changes on: trunk/Demos/PrimerCross
___________________________________________________________________
Name: svn:ignore
- *.dcu
*.~*
*.ddp
*.exe
__history
*.identcache
*.local
+ *.dcu
*.~*
*.ddp
*.exe
__history
*.identcache
*.local
*.dsk
Property changes on: trunk/Source
___________________________________________________________________
Name: svn:ignore
+ __history
Property changes on: trunk/Source/Brokers/ADO
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
*.~pas
*.~dfm
Property changes on: trunk/Source/Brokers/ADO/D7
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
*.cfg
*.dof
Property changes on: trunk/Source/Brokers/BDE
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
*.~dfm
*.~pas
Property changes on: trunk/Source/Brokers/BDE/D7
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
*.cfg
*.dof
Property changes on: trunk/Source/Brokers/DBX/D7
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
*.cfg
*.dof
Property changes on: trunk/Source/Brokers/IBX/D7
___________________________________________________________________
Name: svn:ignore
+ *.cfg
*.dcu
*.dof
Property changes on: trunk/Source/Brokers/XML/D7
___________________________________________________________________
Name: svn:ignore
+ *.cfg
*.dcu
*.dof
*.~dpk
Property changes on: trunk/Source/Catalogs/IBFb/D7
___________________________________________________________________
Name: svn:ignore
+ *.dcu
Property changes on: trunk/Source/Catalogs/MSSql
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
__history
Property changes on: trunk/Source/Catalogs/MSSql/D7
___________________________________________________________________
Name: svn:ignore
+ *.dcu
Property changes on: trunk/Source/Design/D7
___________________________________________________________________
Name: svn:ignore
- *.dcu
*.~*
*.ddp
+ *.dcu
*.~*
*.ddp
*.cfg
*.dof
Property changes on: trunk/Source/PackageGroups/D7
___________________________________________________________________
Name: svn:ignore
+ *.dsk
*.~dsk
Modified: trunk/Tests/TestIO.dpr
===================================================================
--- trunk/Tests/TestIO.dpr 2007-02-25 15:49:44 UTC (rev 769)
+++ trunk/Tests/TestIO.dpr 2007-02-25 16:19:14 UTC (rev 770)
@@ -54,7 +54,8 @@
TestInstantParts in 'TestInstantParts.pas',
TestInstantReferences in 'TestInstantReferences.pas',
TestInstantCircularReferences in 'TestInstantCircularReferences.pas',
- TestInstantObjectReference in 'TestInstantObjectReference.pas';
+ TestInstantObjectReference in 'TestInstantObjectReference.pas',
+ MinimalModel in 'MinimalModel.pas';
{$R *.res}
{$R *.mdr} {TestModel}
@@ -62,8 +63,8 @@
begin
Application.Initialize;
InstantModel.ClassMetadatas.Clear;
-// Application.CreateForm(TGUITestRunner, TestRunner);
Application.CreateForm(TGUITestRunner, TestRunner);
+ //Application.CreateForm(TTestRunner, TestRunner);
Application.Run;
end.
|
|
From: <na...@us...> - 2007-04-03 07:52:06
|
Revision: 771
http://svn.sourceforge.net/instantobjects/revision/?rev=771&view=rev
Author: nandod
Date: 2007-04-03 00:52:04 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
* Updates for D2007 support.
Modified Paths:
--------------
trunk/Demos/Intro/Main.pas
trunk/Demos/IntroIW/UserSessionUnit.pas
trunk/ReleaseTools/InstantReplicateResource.bat
trunk/Source/Brokers/DBX/InstantDBX.pas
trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.pas
trunk/Source/InstantDefines.inc
Added Paths:
-----------
trunk/Demos/Intro/Intro.dproj
trunk/Demos/IntroIW/IntroIW.dproj
trunk/Demos/PrimerCross/Primer.dproj
trunk/Demos/PrimerCross/PrimerExternal.dproj
trunk/Source/Brokers/ADO/D2007/
trunk/Source/Brokers/ADO/D2007/DclIOADO.dpk
trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj
trunk/Source/Brokers/ADO/D2007/DclIOADO.res
trunk/Source/Brokers/ADO/D2007/IOADO.dpk
trunk/Source/Brokers/ADO/D2007/IOADO.dproj
trunk/Source/Brokers/ADO/D2007/IOADO.res
trunk/Source/Brokers/BDE/D2007/
trunk/Source/Brokers/BDE/D2007/DclIOBDE.dpk
trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj
trunk/Source/Brokers/BDE/D2007/DclIOBDE.res
trunk/Source/Brokers/BDE/D2007/IOBDE.dpk
trunk/Source/Brokers/BDE/D2007/IOBDE.dproj
trunk/Source/Brokers/BDE/D2007/IOBDE.res
trunk/Source/Brokers/DBX/D2007/
trunk/Source/Brokers/DBX/D2007/DclIODBX.dpk
trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj
trunk/Source/Brokers/DBX/D2007/DclIODBX.res
trunk/Source/Brokers/DBX/D2007/IODBX.dpk
trunk/Source/Brokers/DBX/D2007/IODBX.dproj
trunk/Source/Brokers/DBX/D2007/IODBX.res
trunk/Source/Brokers/IBX/D2007/
trunk/Source/Brokers/IBX/D2007/DclIOIBX.dpk
trunk/Source/Brokers/IBX/D2007/DclIOIBX.dproj
trunk/Source/Brokers/IBX/D2007/DclIOIBX.res
trunk/Source/Brokers/IBX/D2007/IOIBX.dpk
trunk/Source/Brokers/IBX/D2007/IOIBX.dproj
trunk/Source/Brokers/IBX/D2007/IOIBX.res
trunk/Source/Brokers/XML/D2007/
trunk/Source/Brokers/XML/D2007/DclIOXML.dpk
trunk/Source/Brokers/XML/D2007/DclIOXML.dproj
trunk/Source/Brokers/XML/D2007/DclIOXML.res
trunk/Source/Brokers/XML/D2007/IOXML.dpk
trunk/Source/Brokers/XML/D2007/IOXML.dproj
trunk/Source/Brokers/XML/D2007/IOXML.res
trunk/Source/Catalogs/IBFb/D2007/
trunk/Source/Catalogs/IBFb/D2007/IOIBFbCatalog.dpk
trunk/Source/Catalogs/IBFb/D2007/IOIBFbCatalog.dproj
trunk/Source/Catalogs/IBFb/D2007/IOIBFbCatalog.res
trunk/Source/Catalogs/MSSql/D2007/
trunk/Source/Catalogs/MSSql/D2007/IOMSSqlCatalog.dpk
trunk/Source/Catalogs/MSSql/D2007/IOMSSqlCatalog.dproj
trunk/Source/Catalogs/MSSql/D2007/IOMSSqlCatalog.res
trunk/Source/Core/D2007/
trunk/Source/Core/D2007/IOCore.dpk
trunk/Source/Core/D2007/IOCore.dproj
trunk/Source/Core/D2007/IOCore.res
trunk/Source/Design/D2007/
trunk/Source/Design/D2007/DclIOCore.dpk
trunk/Source/Design/D2007/DclIOCore.dproj
trunk/Source/Design/D2007/DclIOCore.res
trunk/Source/PackageGroups/D2007/
trunk/Source/PackageGroups/D2007/AllPackages.groupproj
trunk/Source/PackageGroups/D2007/DesignTimePackages.groupproj
trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj
trunk/Tests/TestIO.dproj
trunk/Tests/ubmock/tests/ConsoleTest.dproj
Property Changed:
----------------
trunk/Demos/IntroIW/
trunk/Source/Brokers/DBX/
trunk/Tests/ubmock/tests/
Added: trunk/Demos/Intro/Intro.dproj
===================================================================
--- trunk/Demos/Intro/Intro.dproj (rev 0)
+++ trunk/Demos/Intro/Intro.dproj 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,103 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{5e7fed32-48a7-4d66-a1ed-fbf2fb9c43c1}</ProjectGuid>
+ <MainSource>Intro.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>Intro.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_WriteableConstants>True</DCC_WriteableConstants>
+ <DCC_Optimize>False</DCC_Optimize>
+ <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+ <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_IncludePath>
+ <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE>
+ <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE>
+ <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_WriteableConstants>True</DCC_WriteableConstants>
+ <DCC_Optimize>False</DCC_Optimize>
+ <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+ <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\BDE</DCC_IncludePath>
+ <DCC_Define>DEBUG</DCC_Define>
+ <DCC_UNSAFE_TYPE>True</DCC_UNSAFE_TYPE>
+ <DCC_UNSAFE_CODE>True</DCC_UNSAFE_CODE>
+ <DCC_UNSAFE_CAST>True</DCC_UNSAFE_CAST>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject xmlns=""> <Delphi.Personality> <Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Language>
+ <Language Name="ProjectLang">$00000406</Language>
+ </Language>
+ <VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+ <VersionInfo Name="MajorVer">1</VersionInfo>
+ <VersionInfo Name="MinorVer">0</VersionInfo>
+ <VersionInfo Name="Release">0</VersionInfo>
+ <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Debug">False</VersionInfo>
+ <VersionInfo Name="PreRelease">False</VersionInfo>
+ <VersionInfo Name="Special">False</VersionInfo>
+ <VersionInfo Name="Private">False</VersionInfo>
+ <VersionInfo Name="DLL">False</VersionInfo>
+ <VersionInfo Name="Locale">1030</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+ </VersionInfoKeys>
+ <Source>
+ <Source Name="MainSource">Intro.dpr</Source>
+ </Source>
+ </Delphi.Personality> </BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <ItemGroup />
+ <ItemGroup>
+ <DelphiCompile Include="Intro.dpr">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="CompanyEdit.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEdit.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="Main.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="Model.pas" />
+ <DCCReference Include="PersonEdit.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>
\ No newline at end of file
Modified: trunk/Demos/Intro/Main.pas
===================================================================
--- trunk/Demos/Intro/Main.pas 2007-02-25 16:19:14 UTC (rev 770)
+++ trunk/Demos/Intro/Main.pas 2007-04-03 07:52:04 UTC (rev 771)
@@ -5,7 +5,7 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
StdCtrls, Db, InstantPresentation, InstantPersistence, Grids, DBGrids,
- ExtCtrls, DBCtrls, Model, DBTables, InstantBDE;
+ ExtCtrls, DBCtrls, Model, DBTables, InstantBDE, InstantBrokers;
type
TMainForm = class(TForm)
Property changes on: trunk/Demos/IntroIW
___________________________________________________________________
Name: svn:ignore
+ __history
*.local
*.identcache
*.dcu
*.exe
Added: trunk/Demos/IntroIW/IntroIW.dproj
===================================================================
--- trunk/Demos/IntroIW/IntroIW.dproj (rev 0)
+++ trunk/Demos/IntroIW/IntroIW.dproj 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,98 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{541830bc-f093-438e-b0f8-7606626e64ed}</ProjectGuid>
+ <MainSource>IntroIW.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>IntroIW.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_Define>DEBUG</DCC_Define>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_IncludePath>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject xmlns=""> <Delphi.Personality> <Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+ <VersionInfo Name="MajorVer">1</VersionInfo>
+ <VersionInfo Name="MinorVer">0</VersionInfo>
+ <VersionInfo Name="Release">0</VersionInfo>
+ <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Debug">False</VersionInfo>
+ <VersionInfo Name="PreRelease">False</VersionInfo>
+ <VersionInfo Name="Special">False</VersionInfo>
+ <VersionInfo Name="Private">False</VersionInfo>
+ <VersionInfo Name="DLL">False</VersionInfo>
+ <VersionInfo Name="Locale">1040</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+ </VersionInfoKeys>
+ <Source>
+ <Source Name="MainSource">IntroIW.dpr</Source>
+ </Source>
+ </Delphi.Personality> </BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="IntroIW.dpr">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="CompanyEditIW.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEditIW.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="MainIW.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="Model.pas" />
+ <DCCReference Include="PersonEditIW.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="QueryIW.pas">
+ <Form>QueryForm</Form>
+ </DCCReference>
+ <DCCReference Include="ServerController.pas">
+ <Form>IWServerController</Form>
+ </DCCReference>
+ <DCCReference Include="UserSessionUnit.pas">
+ <Form>IWUserSession</Form>
+ </DCCReference>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Modified: trunk/Demos/IntroIW/UserSessionUnit.pas
===================================================================
--- trunk/Demos/IntroIW/UserSessionUnit.pas 2007-02-25 16:19:14 UTC (rev 770)
+++ trunk/Demos/IntroIW/UserSessionUnit.pas 2007-04-03 07:52:04 UTC (rev 771)
@@ -9,7 +9,7 @@
uses
IWUserSessionBase, SysUtils, Classes, InstantPersistence, DB,
- InstantADO, ADODB;
+ InstantADO, ADODB, InstantBrokers;
type
TIWUserSession = class(TIWUserSessionBase)
Added: trunk/Demos/PrimerCross/Primer.dproj
===================================================================
--- trunk/Demos/PrimerCross/Primer.dproj (rev 0)
+++ trunk/Demos/PrimerCross/Primer.dproj 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,109 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid>
+ <MainSource>Primer.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_Define>DEBUG</DCC_Define>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_IncludePath>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">2057</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">InstantObjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Primer Demo</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">MPL public license</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Primer.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="Primer.dpr">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="BasicBrowse.pas">
+ <Form>BasicBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicEdit.pas">
+ <Form>BasicEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicView.pas">
+ <Form>BasicViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="CategoryBrowse.pas">
+ <Form>CategoryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyBrowse.pas">
+ <Form>CompanyBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyEdit.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactBrowse.pas">
+ <Form>ContactBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEdit.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactFilterEdit.pas">
+ <Form>ContactFilterEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactSort.pas">
+ <Form>ContactSortForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactView.pas">
+ <Form>ContactViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="CountryBrowse.pas">
+ <Form>CountryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoData.pas" />
+ <DCCReference Include="DemoDataRequest.pas">
+ <Form>DemoDataRequestForm</Form>
+ </DCCReference>
+ <DCCReference Include="HelpView.pas">
+ <Form>HelpViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="Main.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="MainData.pas">
+ <Form>MainDataModule</Form>
+ </DCCReference>
+ <DCCReference Include="Model\Model.pas" />
+ <DCCReference Include="PerformanceView.pas">
+ <Form>PerformanceViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonBrowse.pas">
+ <Form>PersonBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonEdit.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="QueryView.pas">
+ <Form>QueryViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="RandomData.pas" />
+ <DCCReference Include="Stopwatch.pas" />
+ <DCCReference Include="Utility.pas" />
+ <DCCReference Include="Welcome.pas">
+ <Form>WelcomeForm</Form>
+ </DCCReference>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/Demos/PrimerCross/PrimerExternal.dproj
===================================================================
--- trunk/Demos/PrimerCross/PrimerExternal.dproj (rev 0)
+++ trunk/Demos/PrimerCross/PrimerExternal.dproj 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{0d607f9b-9c2b-445d-84fd-7072bc53deff}</ProjectGuid>
+ <MainSource>PrimerExternal.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>PrimerExternal.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_Define>DEBUG</DCC_Define>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_IncludePath>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages"></Compiler></Compiler><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">2057</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">InstantObjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Primer Demo</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">MPL public license</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">PrimerExternal.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="PrimerExternal.dpr">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="BasicBrowse.pas">
+ <Form>BasicBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicEdit.pas">
+ <Form>BasicEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicView.pas">
+ <Form>BasicViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="CategoryBrowse.pas">
+ <Form>CategoryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyBrowse.pas">
+ <Form>CompanyBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyEdit.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactBrowse.pas">
+ <Form>ContactBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEdit.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactFilterEdit.pas">
+ <Form>ContactFilterEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactSort.pas">
+ <Form>ContactSortForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactView.pas">
+ <Form>ContactViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="CountryBrowse.pas">
+ <Form>CountryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoData.pas" />
+ <DCCReference Include="DemoDataRequest.pas">
+ <Form>DemoDataRequestForm</Form>
+ </DCCReference>
+ <DCCReference Include="HelpView.pas">
+ <Form>HelpViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="Main.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="MainData.pas">
+ <Form>MainDataModule</Form>
+ </DCCReference>
+ <DCCReference Include="ModelExternal\Model.pas" />
+ <DCCReference Include="PerformanceView.pas">
+ <Form>PerformanceViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonBrowse.pas">
+ <Form>PersonBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonEdit.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="QueryView.pas">
+ <Form>QueryViewForm</Form>
+ </DCCReference>
+ <DCCReference Include="RandomData.pas" />
+ <DCCReference Include="Stopwatch.pas" />
+ <DCCReference Include="Utility.pas" />
+ <DCCReference Include="Welcome.pas">
+ <Form>WelcomeForm</Form>
+ </DCCReference>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Modified: trunk/ReleaseTools/InstantReplicateResource.bat
===================================================================
--- trunk/ReleaseTools/InstantReplicateResource.bat 2007-02-25 16:19:14 UTC (rev 770)
+++ trunk/ReleaseTools/InstantReplicateResource.bat 2007-04-03 07:52:04 UTC (rev 771)
@@ -62,6 +62,10 @@
echo ..\Source\Brokers\XML\D2006\IOXML.res
copy "InstantVersion.res" "..\Source\Brokers\XML\D2006\DclIOXML.res" > nul
echo ..\Source\Brokers\XML\D2006\DclIOXML.res
+copy "InstantVersion.res" "..\Source\Brokers\XML\D2007\IOXML.res" > nul
+echo ..\Source\Brokers\XML\D2007\IOXML.res
+copy "InstantVersion.res" "..\Source\Brokers\XML\D2007\DclIOXML.res" > nul
+echo ..\Source\Brokers\XML\D2007\DclIOXML.res
copy "InstantVersion.res" "..\Source\Brokers\XML\k3\IOXML.res" > nul
echo ..\Source\Brokers\XML\k3\IOXML.res
copy "InstantVersion.res" "..\Source\Brokers\XML\k3\DclIOXML.res" > nul
@@ -86,6 +90,10 @@
echo ..\Source\Brokers\IBX\D2006\IOIBX.res
copy "InstantVersion.res" "..\Source\Brokers\IBX\D2006\DclIOIBX.res" > nul
echo ..\Source\Brokers\IBX\D2006\DclIOIBX.res
+copy "InstantVersion.res" "..\Source\Brokers\IBX\D2007\IOIBX.res" > nul
+echo ..\Source\Brokers\IBX\D2007\IOIBX.res
+copy "InstantVersion.res" "..\Source\Brokers\IBX\D2007\DclIOIBX.res" > nul
+echo ..\Source\Brokers\IBX\D2007\DclIOIBX.res
copy "InstantVersion.res" "..\Source\Brokers\ADO\D5\DclIOADO_D5.res" > nul
echo ..\Source\Brokers\ADO\D5\DclIOADO_D5.res
copy "InstantVersion.res" "..\Source\Brokers\ADO\D5\IOADO_D5.res" > nul
@@ -106,6 +114,10 @@
echo ..\Source\Brokers\ADO\D2006\IOADO.res
copy "InstantVersion.res" "..\Source\Brokers\ADO\D2006\DclIOADO.res" > nul
echo ..\Source\Brokers\ADO\D2006\DclIOADO.res
+copy "InstantVersion.res" "..\Source\Brokers\ADO\D2007\IOADO.res" > nul
+echo ..\Source\Brokers\ADO\D2007\IOADO.res
+copy "InstantVersion.res" "..\Source\Brokers\ADO\D2007\DclIOADO.res" > nul
+echo ..\Source\Brokers\ADO\D2007\DclIOADO.res
copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D5\DclIOZeosDBO_D5.res" > nul
echo ..\Source\Brokers\ZeosDBO\D5\DclIOZeosDBO_D5.res
copy "InstantVersion.res" "..\Source\Brokers\ZeosDBO\D5\IOZeosDBO_D5.res" > nul
@@ -170,6 +182,10 @@
echo ..\Source\Brokers\BDE\D2006\IOBDE.res
copy "InstantVersion.res" "..\Source\Brokers\BDE\D2006\DclIOBDE.res" > nul
echo ..\Source\Brokers\BDE\D2006\DclIOBDE.res
+copy "InstantVersion.res" "..\Source\Brokers\BDE\D2007\IOBDE.res" > nul
+echo ..\Source\Brokers\BDE\D2007\IOBDE.res
+copy "InstantVersion.res" "..\Source\Brokers\BDE\D2007\DclIOBDE.res" > nul
+echo ..\Source\Brokers\BDE\D2007\DclIOBDE.res
copy "InstantVersion.res" "..\Source\Brokers\DBX\D6\IODBX.res" > nul
echo ..\Source\Brokers\DBX\D6\IODBX.res
copy "InstantVersion.res" "..\Source\Brokers\DBX\D6\DclIODBX.res" > nul
@@ -186,6 +202,10 @@
echo ..\Source\Brokers\DBX\D2006\IODBX.res
copy "InstantVersion.res" "..\Source\Brokers\DBX\D2006\DclIODBX.res" > nul
echo ..\Source\Brokers\DBX\D2006\DclIODBX.res
+copy "InstantVersion.res" "..\Source\Brokers\DBX\D2007\IODBX.res" > nul
+echo ..\Source\Brokers\DBX\D2007\IODBX.res
+copy "InstantVersion.res" "..\Source\Brokers\DBX\D2007\DclIODBX.res" > nul
+echo ..\Source\Brokers\DBX\D2007\DclIODBX.res
copy "InstantVersion.res" "..\Source\Brokers\DBX\K3\IODBX.res" > nul
echo ..\Source\Brokers\DBX\K3\IODBX.res
copy "InstantVersion.res" "..\Source\Brokers\DBX\K3\DclIODBX.res" > nul
@@ -194,6 +214,8 @@
echo ..\Source\Core\D2005\IOCore.res
copy "InstantVersion.res" "..\Source\Core\D2006\IOCore.res" > nul
echo ..\Source\Core\D2006\IOCore.res
+copy "InstantVersion.res" "..\Source\Core\D2007\IOCore.res" > nul
+echo ..\Source\Core\D2007\IOCore.res
copy "InstantVersion.res" "..\Source\Core\K3\IOCore.res" > nul
echo ..\Source\Core\K3\IOCore.res
copy "InstantVersion.res" "..\Source\Core\D5\IOCore_D5.res" > nul
@@ -206,6 +228,8 @@
echo ..\Source\Design\D2005\DclIOCore.res
copy "InstantVersion.res" "..\Source\Design\D2006\DclIOCore.res" > nul
echo ..\Source\Design\D2006\DclIOCore.res
+copy "InstantVersion.res" "..\Source\Design\D2007\DclIOCore.res" > nul
+echo ..\Source\Design\D2007\DclIOCore.res
copy "InstantVersion.res" "..\Source\Design\K3\DclIOCore.res" > nul
echo ..\Source\Design\K3\DclIOCore.res
copy "InstantVersion.res" "..\Source\Design\D5\DclIOCore_D5.res" > nul
@@ -224,6 +248,8 @@
echo ..\Source\Catalogs\MSSql\D7\IOMSSqlCatalog.res
copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D2006\IOMSSqlCatalog.res" > nul
echo ..\Source\Catalogs\MSSql\D2006\IOMSSqlCatalog.res
+copy "InstantVersion.res" "..\Source\Catalogs\MSSql\D2007\IOMSSqlCatalog.res" > nul
+echo ..\Source\Catalogs\MSSql\D2007\IOMSSqlCatalog.res
copy "InstantVersion.res" "..\Source\Catalogs\MSSql\K3\IOMSSqlCatalog.res" > nul
echo ..\Source\Catalogs\MSSql\K3\IOMSSqlCatalog.res
copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D5\IOIBFbCatalog_D5.res" > nul
@@ -236,6 +262,8 @@
echo ..\Source\Catalogs\IBFb\D7\IOIBFbCatalog.res
copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D2006\IOIBFbCatalog.res" > nul
echo ..\Source\Catalogs\IBFb\D2006\IOIBFbCatalog.res
+copy "InstantVersion.res" "..\Source\Catalogs\IBFb\D2007\IOIBFbCatalog.res" > nul
+echo ..\Source\Catalogs\IBFb\D2007\IOIBFbCatalog.res
copy "InstantVersion.res" "..\Source\Catalogs\IBFb\K3\IOIBFbCatalog.res" > nul
echo ..\Source\Catalogs\IBFb\K3\IOIBFbCatalog.res
echo.
Property changes on: trunk/Source/Brokers/ADO/D2007
___________________________________________________________________
Name: svn:ignore
+ __history
*.dcu
*.local
Added: trunk/Source/Brokers/ADO/D2007/DclIOADO.dpk
===================================================================
--- trunk/Source/Brokers/ADO/D2007/DclIOADO.dpk (rev 0)
+++ trunk/Source/Brokers/ADO/D2007/DclIOADO.dpk 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,38 @@
+package DclIOADO;
+
+{$R *.res}
+{$R '..\InstantADO.dcr'}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS ON}
+{$RANGECHECKS ON}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DESCRIPTION 'InstantObjects ADO Design-Time Support (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ rtl,
+ IOADO;
+
+contains
+ InstantADOReg in '..\InstantADOReg.pas';
+
+end.
Added: trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj (rev 0)
+++ trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,41 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{83fb334c-a8d7-4ac2-a891-1c5f3085aaf1}</ProjectGuid>
+ <MainSource>DclIOADO.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>C:\Documents and Settings\nandod\Documenti\RAD Studio\5.0\Bpl\DclIOADO_D11.bpl</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_IntegerOverflowCheck>True</DCC_IntegerOverflowCheck>
+ <DCC_RangeChecking>True</DCC_RangeChecking>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_IntegerOverflowCheck>True</DCC_IntegerOverflowCheck>
+ <DCC_RangeChecking>True</DCC_RangeChecking>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages"></Compiler></Compiler><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">InstantObjects ADO Design-Time Support (Delphi 2007)</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">True</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options><Package_Options Name="LibSuffix">_D11</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1040</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">DclIOADO.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="DclIOADO.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\..\..\PackageGroups\D2007\IOADO.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\rtl.dcp" />
+ <DCCReference Include="..\InstantADO.dcr" />
+ <DCCReference Include="..\InstantADO.dcr" />
+ <DCCReference Include="..\InstantADOReg.pas" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/Source/Brokers/ADO/D2007/DclIOADO.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/ADO/D2007/DclIOADO.res
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Source/Brokers/ADO/D2007/IOADO.dpk
===================================================================
--- trunk/Source/Brokers/ADO/D2007/IOADO.dpk (rev 0)
+++ trunk/Source/Brokers/ADO/D2007/IOADO.dpk 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,44 @@
+package IOADO;
+
+{$R *.res}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DESCRIPTION 'InstantObjects ADO Run-Time Support (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vcldb,
+ adortl,
+ IOCore,
+ IOMSSqlCatalog;
+
+contains
+ InstantADOX in '..\InstantADOX.pas',
+ InstantADOJRO in '..\InstantADOJRO.pas',
+ InstantADOTools in '..\InstantADOTools.pas',
+ InstantADOConnectionDefEdit in '..\InstantADOConnectionDefEdit.pas' {InstantADOConnectionDefEditForm},
+ InstantADO in '..\InstantADO.pas';
+
+end.
Added: trunk/Source/Brokers/ADO/D2007/IOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/D2007/IOADO.dproj (rev 0)
+++ trunk/Source/Brokers/ADO/D2007/IOADO.dproj 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,46 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{92084594-c0f7-4f8d-8e98-b5fdc630773c}</ProjectGuid>
+ <MainSource>IOADO.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>C:\Documents and Settings\nandod\Documenti\RAD Studio\Projects\Bpl\IOADO_D11.bpl</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_WriteableConstants>True</DCC_WriteableConstants>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_WriteableConstants>True</DCC_WriteableConstants>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages"></Compiler></Compiler><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">InstantObjects ADO Run-Time Support (Delphi 2007)</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">True</Package_Options><Package_Options Name="LibSuffix">_D11</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1040</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">IOADO.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="IOADO.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\..\..\PackageGroups\D2007\adortl.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\IOCore.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\IOMSSqlCatalog.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\vcl.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\vcldb.dcp" />
+ <DCCReference Include="..\InstantADO.pas" />
+ <DCCReference Include="..\InstantADOConnectionDefEdit.pas">
+ <Form>InstantADOConnectionDefEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantADOJRO.pas" />
+ <DCCReference Include="..\InstantADOTools.pas" />
+ <DCCReference Include="..\InstantADOX.pas" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/Source/Brokers/ADO/D2007/IOADO.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/ADO/D2007/IOADO.res
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/Source/Brokers/BDE/D2007
___________________________________________________________________
Name: svn:ignore
+ __history
*.dcu
*.local
Added: trunk/Source/Brokers/BDE/D2007/DclIOBDE.dpk
===================================================================
--- trunk/Source/Brokers/BDE/D2007/DclIOBDE.dpk (rev 0)
+++ trunk/Source/Brokers/BDE/D2007/DclIOBDE.dpk 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,41 @@
+package DclIOBDE;
+
+{$R *.res}
+{$R '..\InstantBDE.dcr'}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DESCRIPTION 'InstantObjects BDE Design-Time Support (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vcldb,
+ bdertl,
+ IOCore,
+ IOBDE;
+
+contains
+ InstantBDEReg in '..\InstantBDEReg.pas';
+
+end.
Added: trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj
===================================================================
--- trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj (rev 0)
+++ trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,42 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{54d8280d-11e9-4256-ba0a-30fc942591e7}</ProjectGuid>
+ <MainSource>DclIOBDE.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>C:\Documents and Settings\nandod\Documenti\RAD Studio\5.0\Bpl\DclIOBDE_D11.bpl</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages"></Compiler></Compiler><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">InstantObjects BDE Design-Time Support (Delphi 2007)</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">True</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options><Package_Options Name="LibSuffix">_D11</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1040</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">DclIOBDE.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="DclIOBDE.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\..\..\PackageGroups\D2007\bdertl.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\IOBDE.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\IOCore.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\vcl.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\vcldb.dcp" />
+ <DCCReference Include="..\InstantBDE.dcr" />
+ <DCCReference Include="..\InstantBDE.dcr" />
+ <DCCReference Include="..\InstantBDEReg.pas" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/Source/Brokers/BDE/D2007/DclIOBDE.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/BDE/D2007/DclIOBDE.res
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Source/Brokers/BDE/D2007/IOBDE.dpk
===================================================================
--- trunk/Source/Brokers/BDE/D2007/IOBDE.dpk (rev 0)
+++ trunk/Source/Brokers/BDE/D2007/IOBDE.dpk 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,41 @@
+package IOBDE;
+
+{$R *.res}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DESCRIPTION 'InstantObjects BDE Run-Time Support (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vcldb,
+ bdertl,
+ IOCore;
+
+contains
+ InstantBDECatalog in '..\InstantBDECatalog.pas',
+ InstantBDEConnectionDefEdit in '..\InstantBDEConnectionDefEdit.pas' {InstantBDEConnectionDefEditForm},
+ InstantBDE in '..\InstantBDE.pas';
+
+end.
Added: trunk/Source/Brokers/BDE/D2007/IOBDE.dproj
===================================================================
--- trunk/Source/Brokers/BDE/D2007/IOBDE.dproj (rev 0)
+++ trunk/Source/Brokers/BDE/D2007/IOBDE.dproj 2007-04-03 07:52:04 UTC (rev 771)
@@ -0,0 +1,43 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{340a6323-81f2-431c-adca-555d83affb71}</ProjectGuid>
+ <MainSource>IOBDE.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>C:\Documents and Settings\nandod\Documenti\RAD Studio\Projects\Bpl\IOBDE_D11.bpl</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <Version>7.0</Version>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages"></Compiler></Compiler><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">InstantObjects BDE Run-Time Support (Delphi 2007)</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">True</Package_Options><Package_Options Name="LibSuffix">_D11</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1040</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">IOBDE.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+ <ItemGroup>
+ <DelphiCompile Include="IOBDE.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\..\..\PackageGroups\D2007\bdertl.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\IOCore.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\vcl.dcp" />
+ <DCCReference Include="..\..\..\PackageGroups\D2007\vcldb.dcp" />
+ <DCCReference Include="..\InstantBDE.pas" />
+ <DCCReference Include="..\InstantBDECatalog.pas" />
+ <DCCReference Include="..\InstantBDEConnectionDefEdit.pas">
+ <Form>InstantBDEConnectionD...
[truncated message content] |
|
From: <na...@us...> - 2008-02-25 17:55:08
|
Revision: 777
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=777&view=rev
Author: nandod
Date: 2008-02-25 09:55:07 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
* PrimerCross: Fixed uses clause and D2007 project options.
* Fixed various project files for D2006 and D2007.
* svn:ignore set on various folders and files.
Modified Paths:
--------------
trunk/Demos/PrimerCross/Model/Model.pas
trunk/Demos/PrimerCross/Primer.dproj
trunk/Demos/PrimerCross/Primer.mdr
trunk/Source/Brokers/ADO/D2006/DclIOADO.bdsproj
trunk/Source/Brokers/ADO/D2006/DclIOADO.res
trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj
trunk/Source/Brokers/BDE/D2006/DclIOBDE.bdsproj
trunk/Source/Brokers/BDE/D2006/DclIOBDE.res
trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj
trunk/Source/Brokers/DBX/D2006/DclIODBX.bdsproj
trunk/Source/Brokers/DBX/D2006/DclIODBX.res
trunk/Source/Brokers/DBX/D2006/IODBX.bdsproj
trunk/Source/Brokers/DBX/D2006/IODBX.dpk
trunk/Source/Brokers/DBX/D2006/IODBX.res
trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj
trunk/Source/Brokers/DBX/D2007/IODBX.dpk
trunk/Source/Brokers/DBX/D2007/IODBX.dproj
trunk/Source/Brokers/IBX/D2006/DclIOIBX.bdsproj
trunk/Source/Brokers/IBX/D2006/DclIOIBX.res
trunk/Source/Brokers/IBX/D2007/DclIOIBX.dproj
trunk/Source/Brokers/IBX/InstantIBX.pas
trunk/Source/Brokers/XML/D2006/DclIOXML.bdsproj
trunk/Source/Brokers/XML/D2007/DclIOXML.dproj
trunk/Source/Core/D2007/IOCore.dproj
trunk/Source/Design/D2006/DclIOCore.bdsproj
trunk/Source/Design/D2006/DclIOCore.res
trunk/Source/Design/D2007/DclIOCore.dproj
trunk/Source/PackageGroups/D2007/AllPackages.groupproj
Added Paths:
-----------
trunk/Demos/Intro/Intro.bdsproj
trunk/Source/Catalogs/MySQL/D2006/
trunk/Source/Catalogs/MySQL/D2006/IOMySQLCatalog.bdsproj
trunk/Source/Catalogs/MySQL/D2006/IOMySQLCatalog.dpk
trunk/Source/Catalogs/MySQL/D2006/IOMySQLCatalog.res
trunk/Source/Catalogs/MySQL/D2007/IOMySQLCatalog.dproj
trunk/Source/Catalogs/MySQL/D2007/IOMySQLCatalog.res
trunk/Source/PackageGroups/D2006/AllPackages.bdsgroup
Property Changed:
----------------
trunk/Demos/PrimerCross/Model/
trunk/Source/Brokers/ADO/D2007/
trunk/Source/Brokers/BDE/D2007/
trunk/Source/Brokers/IBX/
trunk/Source/Brokers/IBX/D2007/
trunk/Source/Brokers/XML/D2007/
trunk/Source/Catalogs/IBFb/D2007/
trunk/Source/Catalogs/MSSql/D2007/
trunk/Source/Catalogs/MySQL/
trunk/Source/Catalogs/MySQL/D2007/
Added: trunk/Demos/Intro/Intro.bdsproj
===================================================================
--- trunk/Demos/Intro/Intro.bdsproj (rev 0)
+++ trunk/Demos/Intro/Intro.bdsproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BorlandProject>
+ <PersonalityInfo>
+ <Option>
+ <Option Name="Personality">Delphi.Personality</Option>
+ <Option Name="ProjectType">VCLApplication</Option>
+ <Option Name="Version">1.0</Option>
+ <Option Name="GUID">{AD1A38FE-2C49-4F94-A0AF-D2EF4A0C9095}</Option>
+ </Option>
+ </PersonalityInfo>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">Intro.dpr</Source>
+ </Source>
+ <FileVersion>
+ <FileVersion Name="Version">7.0</FileVersion>
+ </FileVersion>
+ <Compiler>
+ <Compiler Name="A">8</Compiler>
+ <Compiler Name="B">0</Compiler>
+ <Compiler Name="C">1</Compiler>
+ <Compiler Name="D">1</Compiler>
+ <Compiler Name="E">0</Compiler>
+ <Compiler Name="F">0</Compiler>
+ <Compiler Name="G">1</Compiler>
+ <Compiler Name="H">1</Compiler>
+ <Compiler Name="I">1</Compiler>
+ <Compiler Name="J">1</Compiler>
+ <Compiler Name="K">0</Compiler>
+ <Compiler Name="L">1</Compiler>
+ <Compiler Name="M">0</Compiler>
+ <Compiler Name="N">1</Compiler>
+ <Compiler Name="O">0</Compiler>
+ <Compiler Name="P">1</Compiler>
+ <Compiler Name="Q">0</Compiler>
+ <Compiler Name="R">0</Compiler>
+ <Compiler Name="S">0</Compiler>
+ <Compiler Name="T">0</Compiler>
+ <Compiler Name="U">0</Compiler>
+ <Compiler Name="V">1</Compiler>
+ <Compiler Name="W">1</Compiler>
+ <Compiler Name="X">1</Compiler>
+ <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Z">1</Compiler>
+ <Compiler Name="ShowHints">True</Compiler>
+ <Compiler Name="ShowWarnings">True</Compiler>
+ <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+ <Compiler Name="NamespacePrefix"></Compiler>
+ <Compiler Name="GenerateDocumentation">False</Compiler>
+ <Compiler Name="DefaultNamespace"></Compiler>
+ <Compiler Name="SymbolDeprecated">True</Compiler>
+ <Compiler Name="SymbolLibrary">True</Compiler>
+ <Compiler Name="SymbolPlatform">True</Compiler>
+ <Compiler Name="SymbolExperimental">True</Compiler>
+ <Compiler Name="UnitLibrary">True</Compiler>
+ <Compiler Name="UnitPlatform">True</Compiler>
+ <Compiler Name="UnitDeprecated">True</Compiler>
+ <Compiler Name="UnitExperimental">True</Compiler>
+ <Compiler Name="HResultCompat">True</Compiler>
+ <Compiler Name="HidingMember">True</Compiler>
+ <Compiler Name="HiddenVirtual">True</Compiler>
+ <Compiler Name="Garbage">True</Compiler>
+ <Compiler Name="BoundsError">True</Compiler>
+ <Compiler Name="ZeroNilCompat">True</Compiler>
+ <Compiler Name="StringConstTruncated">True</Compiler>
+ <Compiler Name="ForLoopVarVarPar">True</Compiler>
+ <Compiler Name="TypedConstVarPar">True</Compiler>
+ <Compiler Name="AsgToTypedConst">True</Compiler>
+ <Compiler Name="CaseLabelRange">True</Compiler>
+ <Compiler Name="ForVariable">True</Compiler>
+ <Compiler Name="ConstructingAbstract">True</Compiler>
+ <Compiler Name="ComparisonFalse">True</Compiler>
+ <Compiler Name="ComparisonTrue">True</Compiler>
+ <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+ <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+ <Compiler Name="UnsupportedConstruct">True</Compiler>
+ <Compiler Name="FileOpen">True</Compiler>
+ <Compiler Name="FileOpenUnitSrc">True</Compiler>
+ <Compiler Name="BadGlobalSymbol">True</Compiler>
+ <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+ <Compiler Name="InvalidDirective">True</Compiler>
+ <Compiler Name="PackageNoLink">True</Compiler>
+ <Compiler Name="PackageThreadVar">True</Compiler>
+ <Compiler Name="ImplicitImport">True</Compiler>
+ <Compiler Name="HPPEMITIgnored">True</Compiler>
+ <Compiler Name="NoRetVal">True</Compiler>
+ <Compiler Name="UseBeforeDef">True</Compiler>
+ <Compiler Name="ForLoopVarUndef">True</Compiler>
+ <Compiler Name="UnitNameMismatch">True</Compiler>
+ <Compiler Name="NoCFGFileFound">True</Compiler>
+ <Compiler Name="ImplicitVariants">True</Compiler>
+ <Compiler Name="UnicodeToLocale">True</Compiler>
+ <Compiler Name="LocaleToUnicode">True</Compiler>
+ <Compiler Name="ImagebaseMultiple">True</Compiler>
+ <Compiler Name="SuspiciousTypecast">True</Compiler>
+ <Compiler Name="PrivatePropAccessor">True</Compiler>
+ <Compiler Name="UnsafeType">True</Compiler>
+ <Compiler Name="UnsafeCode">True</Compiler>
+ <Compiler Name="UnsafeCast">True</Compiler>
+ <Compiler Name="OptionTruncated">True</Compiler>
+ <Compiler Name="WideCharReduced">True</Compiler>
+ <Compiler Name="DuplicatesIgnored">True</Compiler>
+ <Compiler Name="UnitInitSeq">True</Compiler>
+ <Compiler Name="LocalPInvoke">True</Compiler>
+ <Compiler Name="MessageDirective">True</Compiler>
+ <Compiler Name="CodePage"></Compiler>
+ </Compiler>
+ <Linker>
+ <Linker Name="MapFile">0</Linker>
+ <Linker Name="OutputObjs">0</Linker>
+ <Linker Name="GenerateHpps">False</Linker>
+ <Linker Name="ConsoleApp">1</Linker>
+ <Linker Name="DebugInfo">True</Linker>
+ <Linker Name="RemoteSymbols">False</Linker>
+ <Linker Name="GenerateDRC">False</Linker>
+ <Linker Name="MinStackSize">16384</Linker>
+ <Linker Name="MaxStackSize">1048576</Linker>
+ <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ExeDescription"></Linker>
+ </Linker>
+ <Directories>
+ <Directories Name="OutputDir"></Directories>
+ <Directories Name="UnitOutputDir"></Directories>
+ <Directories Name="PackageDLLOutputDir"></Directories>
+ <Directories Name="PackageDCPOutputDir"></Directories>
+ <Directories Name="SearchPath">..\..\Source\Core;..\..\Source\Brokers\BDE</Directories>
+ <Directories Name="Packages">VCL50;VCLX50;VCLSMP50;VCLDB50;VCLADO50;ibevnt50;VCLBDE50;VCLDBX50;QRPT50;TEEUI50;TEEDB50;TEE50;DSS50;TEEQR50;VCLIB50;VCLIE50;INETDB50;INET50;VCLMID50;NMFAST50;WEBMID50;dclocx50;dclaxserver50;Orbit50;Bgo23;Bgo22;RBTDBC51;RBRCL45;RBCIDE45;RBIDE45;RBBDE45;RBUSER45;RBDB45;dclRBA45;RBDAD45;dclRBI45;TSDG5201;TSG5201</Directories>
+ <Directories Name="Conditionals"></Directories>
+ <Directories Name="DebugSourceDirs"></Directories>
+ <Directories Name="UsePackages">False</Directories>
+ </Directories>
+ <Parameters>
+ <Parameters Name="RunParams"></Parameters>
+ <Parameters Name="HostApplication"></Parameters>
+ <Parameters Name="Launcher"></Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="DebugCWD"></Parameters>
+ <Parameters Name="Debug Symbols Search Path"></Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Language>
+ <Language Name="ActiveLang"></Language>
+ <Language Name="ProjectLang">$00000406</Language>
+ <Language Name="RootDir"></Language>
+ </Language>
+ <VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+ <VersionInfo Name="MajorVer">1</VersionInfo>
+ <VersionInfo Name="MinorVer">0</VersionInfo>
+ <VersionInfo Name="Release">0</VersionInfo>
+ <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Debug">False</VersionInfo>
+ <VersionInfo Name="PreRelease">False</VersionInfo>
+ <VersionInfo Name="Special">False</VersionInfo>
+ <VersionInfo Name="Private">False</VersionInfo>
+ <VersionInfo Name="DLL">False</VersionInfo>
+ <VersionInfo Name="Locale">1030</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+ </VersionInfoKeys>
+ </Delphi.Personality>
+</BorlandProject>
Property changes on: trunk/Demos/PrimerCross/Model
___________________________________________________________________
Name: svn:ignore
- *.dcu
+ *.dcu
__history
Modified: trunk/Demos/PrimerCross/Model/Model.pas
===================================================================
--- trunk/Demos/PrimerCross/Model/Model.pas 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Demos/PrimerCross/Model/Model.pas 2008-02-25 17:55:07 UTC (rev 777)
@@ -234,7 +234,7 @@
implementation
uses
- SysUtils, InstantUtils;
+ SysUtils, InstantUtils, InstantMetadata;
{ TAddress }
Modified: trunk/Demos/PrimerCross/Primer.dproj
===================================================================
--- trunk/Demos/PrimerCross/Primer.dproj 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Demos/PrimerCross/Primer.dproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid>
<MainSource>Primer.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName>
@@ -13,24 +13,24 @@
<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_Define>RELEASE</DCC_Define>
- <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ResourcePath>
- <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ObjPath>
- <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_IncludePath>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql</DCC_IncludePath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<Version>7.0</Version>
<DCC_Define>DEBUG</DCC_Define>
- <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ResourcePath>
- <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_ObjPath>
- <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql</DCC_IncludePath>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql</DCC_UnitSearchPath>
+ <DCC_ResourcePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql</DCC_ResourcePath>
+ <DCC_ObjPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql</DCC_ObjPath>
+ <DCC_IncludePath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql</DCC_IncludePath>
</PropertyGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">2057</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">InstantObjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Primer Demo</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">MPL public license</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Primer.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1030</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">InstantObjects.org</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Primer Demo</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">MPL public license</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Primer.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
@@ -45,6 +45,7 @@
</DCCReference>
<DCCReference Include="BasicView.pas">
<Form>BasicViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="CategoryBrowse.pas">
<Form>CategoryBrowseForm</Form>
@@ -69,6 +70,7 @@
</DCCReference>
<DCCReference Include="ContactView.pas">
<Form>ContactViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="CountryBrowse.pas">
<Form>CountryBrowseForm</Form>
@@ -79,16 +81,19 @@
</DCCReference>
<DCCReference Include="HelpView.pas">
<Form>HelpViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="Main.pas">
<Form>MainForm</Form>
</DCCReference>
<DCCReference Include="MainData.pas">
<Form>MainDataModule</Form>
+ <DesignClass>TDataModule</DesignClass>
</DCCReference>
<DCCReference Include="Model\Model.pas" />
<DCCReference Include="PerformanceView.pas">
<Form>PerformanceViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="PersonBrowse.pas">
<Form>PersonBrowseForm</Form>
@@ -98,6 +103,7 @@
</DCCReference>
<DCCReference Include="QueryView.pas">
<Form>QueryViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="RandomData.pas" />
<DCCReference Include="Stopwatch.pas" />
Modified: trunk/Demos/PrimerCross/Primer.mdr
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/D2006/DclIOADO.bdsproj
===================================================================
--- trunk/Source/Brokers/ADO/D2006/DclIOADO.bdsproj 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Source/Brokers/ADO/D2006/DclIOADO.bdsproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -15,5 +15,161 @@
<FileVersion>
<FileVersion Name="Version">7.0</FileVersion>
</FileVersion>
- </Delphi.Personality>
+ <Compiler>
+ <Compiler Name="A">8</Compiler>
+ <Compiler Name="B">0</Compiler>
+ <Compiler Name="C">1</Compiler>
+ <Compiler Name="D">1</Compiler>
+ <Compiler Name="E">0</Compiler>
+ <Compiler Name="F">0</Compiler>
+ <Compiler Name="G">1</Compiler>
+ <Compiler Name="H">1</Compiler>
+ <Compiler Name="I">1</Compiler>
+ <Compiler Name="J">0</Compiler>
+ <Compiler Name="K">0</Compiler>
+ <Compiler Name="L">1</Compiler>
+ <Compiler Name="M">0</Compiler>
+ <Compiler Name="N">1</Compiler>
+ <Compiler Name="O">1</Compiler>
+ <Compiler Name="P">1</Compiler>
+ <Compiler Name="Q">1</Compiler>
+ <Compiler Name="R">1</Compiler>
+ <Compiler Name="S">0</Compiler>
+ <Compiler Name="T">0</Compiler>
+ <Compiler Name="U">0</Compiler>
+ <Compiler Name="V">1</Compiler>
+ <Compiler Name="W">0</Compiler>
+ <Compiler Name="X">1</Compiler>
+ <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Z">1</Compiler>
+ <Compiler Name="ShowHints">True</Compiler>
+ <Compiler Name="ShowWarnings">True</Compiler>
+ <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+ <Compiler Name="NamespacePrefix"></Compiler>
+ <Compiler Name="GenerateDocumentation">False</Compiler>
+ <Compiler Name="DefaultNamespace"></Compiler>
+ <Compiler Name="SymbolDeprecated">True</Compiler>
+ <Compiler Name="SymbolLibrary">True</Compiler>
+ <Compiler Name="SymbolPlatform">True</Compiler>
+ <Compiler Name="SymbolExperimental">True</Compiler>
+ <Compiler Name="UnitLibrary">True</Compiler>
+ <Compiler Name="UnitPlatform">True</Compiler>
+ <Compiler Name="UnitDeprecated">True</Compiler>
+ <Compiler Name="UnitExperimental">True</Compiler>
+ <Compiler Name="HResultCompat">True</Compiler>
+ <Compiler Name="HidingMember">True</Compiler>
+ <Compiler Name="HiddenVirtual">True</Compiler>
+ <Compiler Name="Garbage">True</Compiler>
+ <Compiler Name="BoundsError">True</Compiler>
+ <Compiler Name="ZeroNilCompat">True</Compiler>
+ <Compiler Name="StringConstTruncated">True</Compiler>
+ <Compiler Name="ForLoopVarVarPar">True</Compiler>
+ <Compiler Name="TypedConstVarPar">True</Compiler>
+ <Compiler Name="AsgToTypedConst">True</Compiler>
+ <Compiler Name="CaseLabelRange">True</Compiler>
+ <Compiler Name="ForVariable">True</Compiler>
+ <Compiler Name="ConstructingAbstract">True</Compiler>
+ <Compiler Name="ComparisonFalse">True</Compiler>
+ <Compiler Name="ComparisonTrue">True</Compiler>
+ <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+ <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+ <Compiler Name="UnsupportedConstruct">True</Compiler>
+ <Compiler Name="FileOpen">True</Compiler>
+ <Compiler Name="FileOpenUnitSrc">True</Compiler>
+ <Compiler Name="BadGlobalSymbol">True</Compiler>
+ <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+ <Compiler Name="InvalidDirective">True</Compiler>
+ <Compiler Name="PackageNoLink">True</Compiler>
+ <Compiler Name="PackageThreadVar">True</Compiler>
+ <Compiler Name="ImplicitImport">True</Compiler>
+ <Compiler Name="HPPEMITIgnored">True</Compiler>
+ <Compiler Name="NoRetVal">True</Compiler>
+ <Compiler Name="UseBeforeDef">True</Compiler>
+ <Compiler Name="ForLoopVarUndef">True</Compiler>
+ <Compiler Name="UnitNameMismatch">True</Compiler>
+ <Compiler Name="NoCFGFileFound">True</Compiler>
+ <Compiler Name="ImplicitVariants">True</Compiler>
+ <Compiler Name="UnicodeToLocale">True</Compiler>
+ <Compiler Name="LocaleToUnicode">True</Compiler>
+ <Compiler Name="ImagebaseMultiple">True</Compiler>
+ <Compiler Name="SuspiciousTypecast">True</Compiler>
+ <Compiler Name="PrivatePropAccessor">True</Compiler>
+ <Compiler Name="UnsafeType">False</Compiler>
+ <Compiler Name="UnsafeCode">False</Compiler>
+ <Compiler Name="UnsafeCast">False</Compiler>
+ <Compiler Name="OptionTruncated">True</Compiler>
+ <Compiler Name="WideCharReduced">True</Compiler>
+ <Compiler Name="DuplicatesIgnored">True</Compiler>
+ <Compiler Name="UnitInitSeq">True</Compiler>
+ <Compiler Name="LocalPInvoke">True</Compiler>
+ <Compiler Name="MessageDirective">True</Compiler>
+ <Compiler Name="CodePage"></Compiler>
+ </Compiler>
+ <Linker>
+ <Linker Name="MapFile">0</Linker>
+ <Linker Name="OutputObjs">0</Linker>
+ <Linker Name="GenerateHpps">False</Linker>
+ <Linker Name="ConsoleApp">1</Linker>
+ <Linker Name="DebugInfo">False</Linker>
+ <Linker Name="RemoteSymbols">False</Linker>
+ <Linker Name="GenerateDRC">False</Linker>
+ <Linker Name="MinStackSize">16384</Linker>
+ <Linker Name="MaxStackSize">1048576</Linker>
+ <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ExeDescription">InstantObjects ADO Design-Time Support (Delphi 2006)</Linker>
+ </Linker>
+ <Directories>
+ <Directories Name="OutputDir"></Directories>
+ <Directories Name="UnitOutputDir"></Directories>
+ <Directories Name="PackageDLLOutputDir"></Directories>
+ <Directories Name="PackageDCPOutputDir"></Directories>
+ <Directories Name="SearchPath"></Directories>
+ <Directories Name="Packages"></Directories>
+ <Directories Name="Conditionals"></Directories>
+ <Directories Name="DebugSourceDirs"></Directories>
+ <Directories Name="UsePackages">False</Directories>
+ </Directories>
+ <Parameters>
+ <Parameters Name="RunParams"></Parameters>
+ <Parameters Name="HostApplication"></Parameters>
+ <Parameters Name="Launcher"></Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="DebugCWD"></Parameters>
+ <Parameters Name="Debug Symbols Search Path"></Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Language>
+ <Language Name="ActiveLang"></Language>
+ <Language Name="ProjectLang">$00000000</Language>
+ <Language Name="RootDir"></Language>
+ </Language>
+ <VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+ <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+ <VersionInfo Name="MajorVer">1</VersionInfo>
+ <VersionInfo Name="MinorVer">0</VersionInfo>
+ <VersionInfo Name="Release">0</VersionInfo>
+ <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Debug">False</VersionInfo>
+ <VersionInfo Name="PreRelease">False</VersionInfo>
+ <VersionInfo Name="Special">False</VersionInfo>
+ <VersionInfo Name="Private">False</VersionInfo>
+ <VersionInfo Name="DLL">False</VersionInfo>
+ <VersionInfo Name="Locale">1040</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+ </VersionInfoKeys>
+ </Delphi.Personality>
</BorlandProject>
Modified: trunk/Source/Brokers/ADO/D2006/DclIOADO.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/ADO/D2007
___________________________________________________________________
Name: svn:ignore
- __history
*.dcu
*.local
+ __history
*.dcu
*.local
*.identcache
Modified: trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_DependencyCheckOutputName>C:\Documents and Settings\nandod\Documenti\RAD Studio\5.0\Bpl\DclIOADO_D11.bpl</DCC_DependencyCheckOutputName>
+ <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\DclIOADO_D11.bpl</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
@@ -32,8 +32,8 @@
<DelphiCompile Include="DclIOADO.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
- <DCCReference Include="..\..\..\PackageGroups\D2007\IOADO.dcp" />
- <DCCReference Include="..\..\..\PackageGroups\D2007\rtl.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\IOADO.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\rtl.dcp" />
<DCCReference Include="..\InstantADO.dcr" />
<DCCReference Include="..\InstantADO.dcr" />
<DCCReference Include="..\InstantADOReg.pas" />
Modified: trunk/Source/Brokers/BDE/D2006/DclIOBDE.bdsproj
===================================================================
--- trunk/Source/Brokers/BDE/D2006/DclIOBDE.bdsproj 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Source/Brokers/BDE/D2006/DclIOBDE.bdsproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -15,5 +15,161 @@
<FileVersion>
<FileVersion Name="Version">7.0</FileVersion>
</FileVersion>
- </Delphi.Personality>
+ <Compiler>
+ <Compiler Name="A">8</Compiler>
+ <Compiler Name="B">0</Compiler>
+ <Compiler Name="C">1</Compiler>
+ <Compiler Name="D">1</Compiler>
+ <Compiler Name="E">0</Compiler>
+ <Compiler Name="F">0</Compiler>
+ <Compiler Name="G">1</Compiler>
+ <Compiler Name="H">1</Compiler>
+ <Compiler Name="I">1</Compiler>
+ <Compiler Name="J">0</Compiler>
+ <Compiler Name="K">0</Compiler>
+ <Compiler Name="L">1</Compiler>
+ <Compiler Name="M">0</Compiler>
+ <Compiler Name="N">1</Compiler>
+ <Compiler Name="O">1</Compiler>
+ <Compiler Name="P">1</Compiler>
+ <Compiler Name="Q">0</Compiler>
+ <Compiler Name="R">0</Compiler>
+ <Compiler Name="S">0</Compiler>
+ <Compiler Name="T">1</Compiler>
+ <Compiler Name="U">0</Compiler>
+ <Compiler Name="V">1</Compiler>
+ <Compiler Name="W">0</Compiler>
+ <Compiler Name="X">1</Compiler>
+ <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Z">1</Compiler>
+ <Compiler Name="ShowHints">True</Compiler>
+ <Compiler Name="ShowWarnings">True</Compiler>
+ <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+ <Compiler Name="NamespacePrefix"></Compiler>
+ <Compiler Name="GenerateDocumentation">False</Compiler>
+ <Compiler Name="DefaultNamespace"></Compiler>
+ <Compiler Name="SymbolDeprecated">True</Compiler>
+ <Compiler Name="SymbolLibrary">True</Compiler>
+ <Compiler Name="SymbolPlatform">True</Compiler>
+ <Compiler Name="SymbolExperimental">True</Compiler>
+ <Compiler Name="UnitLibrary">True</Compiler>
+ <Compiler Name="UnitPlatform">True</Compiler>
+ <Compiler Name="UnitDeprecated">True</Compiler>
+ <Compiler Name="UnitExperimental">True</Compiler>
+ <Compiler Name="HResultCompat">True</Compiler>
+ <Compiler Name="HidingMember">True</Compiler>
+ <Compiler Name="HiddenVirtual">True</Compiler>
+ <Compiler Name="Garbage">True</Compiler>
+ <Compiler Name="BoundsError">True</Compiler>
+ <Compiler Name="ZeroNilCompat">True</Compiler>
+ <Compiler Name="StringConstTruncated">True</Compiler>
+ <Compiler Name="ForLoopVarVarPar">True</Compiler>
+ <Compiler Name="TypedConstVarPar">True</Compiler>
+ <Compiler Name="AsgToTypedConst">True</Compiler>
+ <Compiler Name="CaseLabelRange">True</Compiler>
+ <Compiler Name="ForVariable">True</Compiler>
+ <Compiler Name="ConstructingAbstract">True</Compiler>
+ <Compiler Name="ComparisonFalse">True</Compiler>
+ <Compiler Name="ComparisonTrue">True</Compiler>
+ <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+ <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+ <Compiler Name="UnsupportedConstruct">True</Compiler>
+ <Compiler Name="FileOpen">True</Compiler>
+ <Compiler Name="FileOpenUnitSrc">True</Compiler>
+ <Compiler Name="BadGlobalSymbol">True</Compiler>
+ <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+ <Compiler Name="InvalidDirective">True</Compiler>
+ <Compiler Name="PackageNoLink">True</Compiler>
+ <Compiler Name="PackageThreadVar">True</Compiler>
+ <Compiler Name="ImplicitImport">True</Compiler>
+ <Compiler Name="HPPEMITIgnored">True</Compiler>
+ <Compiler Name="NoRetVal">True</Compiler>
+ <Compiler Name="UseBeforeDef">True</Compiler>
+ <Compiler Name="ForLoopVarUndef">True</Compiler>
+ <Compiler Name="UnitNameMismatch">True</Compiler>
+ <Compiler Name="NoCFGFileFound">True</Compiler>
+ <Compiler Name="ImplicitVariants">True</Compiler>
+ <Compiler Name="UnicodeToLocale">True</Compiler>
+ <Compiler Name="LocaleToUnicode">True</Compiler>
+ <Compiler Name="ImagebaseMultiple">True</Compiler>
+ <Compiler Name="SuspiciousTypecast">True</Compiler>
+ <Compiler Name="PrivatePropAccessor">True</Compiler>
+ <Compiler Name="UnsafeType">False</Compiler>
+ <Compiler Name="UnsafeCode">False</Compiler>
+ <Compiler Name="UnsafeCast">False</Compiler>
+ <Compiler Name="OptionTruncated">True</Compiler>
+ <Compiler Name="WideCharReduced">True</Compiler>
+ <Compiler Name="DuplicatesIgnored">True</Compiler>
+ <Compiler Name="UnitInitSeq">True</Compiler>
+ <Compiler Name="LocalPInvoke">True</Compiler>
+ <Compiler Name="MessageDirective">True</Compiler>
+ <Compiler Name="CodePage"></Compiler>
+ </Compiler>
+ <Linker>
+ <Linker Name="MapFile">0</Linker>
+ <Linker Name="OutputObjs">0</Linker>
+ <Linker Name="GenerateHpps">False</Linker>
+ <Linker Name="ConsoleApp">1</Linker>
+ <Linker Name="DebugInfo">False</Linker>
+ <Linker Name="RemoteSymbols">False</Linker>
+ <Linker Name="GenerateDRC">False</Linker>
+ <Linker Name="MinStackSize">16384</Linker>
+ <Linker Name="MaxStackSize">1048576</Linker>
+ <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ExeDescription">InstantObjects BDE Design-Time Support (Delphi 2006)</Linker>
+ </Linker>
+ <Directories>
+ <Directories Name="OutputDir"></Directories>
+ <Directories Name="UnitOutputDir"></Directories>
+ <Directories Name="PackageDLLOutputDir"></Directories>
+ <Directories Name="PackageDCPOutputDir"></Directories>
+ <Directories Name="SearchPath"></Directories>
+ <Directories Name="Packages"></Directories>
+ <Directories Name="Conditionals"></Directories>
+ <Directories Name="DebugSourceDirs"></Directories>
+ <Directories Name="UsePackages">False</Directories>
+ </Directories>
+ <Parameters>
+ <Parameters Name="RunParams"></Parameters>
+ <Parameters Name="HostApplication"></Parameters>
+ <Parameters Name="Launcher"></Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="DebugCWD"></Parameters>
+ <Parameters Name="Debug Symbols Search Path"></Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Language>
+ <Language Name="ActiveLang"></Language>
+ <Language Name="ProjectLang">$00000000</Language>
+ <Language Name="RootDir"></Language>
+ </Language>
+ <VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+ <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+ <VersionInfo Name="MajorVer">1</VersionInfo>
+ <VersionInfo Name="MinorVer">0</VersionInfo>
+ <VersionInfo Name="Release">0</VersionInfo>
+ <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Debug">False</VersionInfo>
+ <VersionInfo Name="PreRelease">False</VersionInfo>
+ <VersionInfo Name="Special">False</VersionInfo>
+ <VersionInfo Name="Private">False</VersionInfo>
+ <VersionInfo Name="DLL">False</VersionInfo>
+ <VersionInfo Name="Locale">1040</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+ </VersionInfoKeys>
+ </Delphi.Personality>
</BorlandProject>
Modified: trunk/Source/Brokers/BDE/D2006/DclIOBDE.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/BDE/D2007
___________________________________________________________________
Name: svn:ignore
- __history
*.dcu
*.local
+ __history
*.dcu
*.local
*.identcache
Modified: trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj
===================================================================
--- trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_DependencyCheckOutputName>C:\Documents and Settings\nandod\Documenti\RAD Studio\5.0\Bpl\DclIOBDE_D11.bpl</DCC_DependencyCheckOutputName>
+ <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\DclIOBDE_D11.bpl</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
@@ -30,11 +30,11 @@
<DelphiCompile Include="DclIOBDE.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
- <DCCReference Include="..\..\..\PackageGroups\D2007\bdertl.dcp" />
- <DCCReference Include="..\..\..\PackageGroups\D2007\IOBDE.dcp" />
- <DCCReference Include="..\..\..\PackageGroups\D2007\IOCore.dcp" />
- <DCCReference Include="..\..\..\PackageGroups\D2007\vcl.dcp" />
- <DCCReference Include="..\..\..\PackageGroups\D2007\vcldb.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\bdertl.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\IOBDE.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\IOCore.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\vcl.dcp" />
+ <DCCReference Include="$(SystemRoot)\system32\vcldb.dcp" />
<DCCReference Include="..\InstantBDE.dcr" />
<DCCReference Include="..\InstantBDE.dcr" />
<DCCReference Include="..\InstantBDEReg.pas" />
Modified: trunk/Source/Brokers/DBX/D2006/DclIODBX.bdsproj
===================================================================
--- trunk/Source/Brokers/DBX/D2006/DclIODBX.bdsproj 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Source/Brokers/DBX/D2006/DclIODBX.bdsproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
<PersonalityInfo>
<Option>
@@ -15,5 +15,161 @@
<FileVersion>
<FileVersion Name="Version">7.0</FileVersion>
</FileVersion>
- </Delphi.Personality>
+ <Compiler>
+ <Compiler Name="A">8</Compiler>
+ <Compiler Name="B">0</Compiler>
+ <Compiler Name="C">1</Compiler>
+ <Compiler Name="D">1</Compiler>
+ <Compiler Name="E">0</Compiler>
+ <Compiler Name="F">0</Compiler>
+ <Compiler Name="G">1</Compiler>
+ <Compiler Name="H">1</Compiler>
+ <Compiler Name="I">1</Compiler>
+ <Compiler Name="J">0</Compiler>
+ <Compiler Name="K">0</Compiler>
+ <Compiler Name="L">1</Compiler>
+ <Compiler Name="M">0</Compiler>
+ <Compiler Name="N">1</Compiler>
+ <Compiler Name="O">1</Compiler>
+ <Compiler Name="P">1</Compiler>
+ <Compiler Name="Q">0</Compiler>
+ <Compiler Name="R">0</Compiler>
+ <Compiler Name="S">0</Compiler>
+ <Compiler Name="T">1</Compiler>
+ <Compiler Name="U">0</Compiler>
+ <Compiler Name="V">1</Compiler>
+ <Compiler Name="W">0</Compiler>
+ <Compiler Name="X">1</Compiler>
+ <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Z">1</Compiler>
+ <Compiler Name="ShowHints">True</Compiler>
+ <Compiler Name="ShowWarnings">True</Compiler>
+ <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+ <Compiler Name="NamespacePrefix"></Compiler>
+ <Compiler Name="GenerateDocumentation">False</Compiler>
+ <Compiler Name="DefaultNamespace"></Compiler>
+ <Compiler Name="SymbolDeprecated">True</Compiler>
+ <Compiler Name="SymbolLibrary">True</Compiler>
+ <Compiler Name="SymbolPlatform">True</Compiler>
+ <Compiler Name="SymbolExperimental">True</Compiler>
+ <Compiler Name="UnitLibrary">True</Compiler>
+ <Compiler Name="UnitPlatform">True</Compiler>
+ <Compiler Name="UnitDeprecated">True</Compiler>
+ <Compiler Name="UnitExperimental">True</Compiler>
+ <Compiler Name="HResultCompat">True</Compiler>
+ <Compiler Name="HidingMember">True</Compiler>
+ <Compiler Name="HiddenVirtual">True</Compiler>
+ <Compiler Name="Garbage">True</Compiler>
+ <Compiler Name="BoundsError">True</Compiler>
+ <Compiler Name="ZeroNilCompat">True</Compiler>
+ <Compiler Name="StringConstTruncated">True</Compiler>
+ <Compiler Name="ForLoopVarVarPar">True</Compiler>
+ <Compiler Name="TypedConstVarPar">True</Compiler>
+ <Compiler Name="AsgToTypedConst">True</Compiler>
+ <Compiler Name="CaseLabelRange">True</Compiler>
+ <Compiler Name="ForVariable">True</Compiler>
+ <Compiler Name="ConstructingAbstract">True</Compiler>
+ <Compiler Name="ComparisonFalse">True</Compiler>
+ <Compiler Name="ComparisonTrue">True</Compiler>
+ <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+ <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+ <Compiler Name="UnsupportedConstruct">True</Compiler>
+ <Compiler Name="FileOpen">True</Compiler>
+ <Compiler Name="FileOpenUnitSrc">True</Compiler>
+ <Compiler Name="BadGlobalSymbol">True</Compiler>
+ <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+ <Compiler Name="InvalidDirective">True</Compiler>
+ <Compiler Name="PackageNoLink">True</Compiler>
+ <Compiler Name="PackageThreadVar">True</Compiler>
+ <Compiler Name="ImplicitImport">True</Compiler>
+ <Compiler Name="HPPEMITIgnored">True</Compiler>
+ <Compiler Name="NoRetVal">True</Compiler>
+ <Compiler Name="UseBeforeDef">True</Compiler>
+ <Compiler Name="ForLoopVarUndef">True</Compiler>
+ <Compiler Name="UnitNameMismatch">True</Compiler>
+ <Compiler Name="NoCFGFileFound">True</Compiler>
+ <Compiler Name="ImplicitVariants">True</Compiler>
+ <Compiler Name="UnicodeToLocale">True</Compiler>
+ <Compiler Name="LocaleToUnicode">True</Compiler>
+ <Compiler Name="ImagebaseMultiple">True</Compiler>
+ <Compiler Name="SuspiciousTypecast">True</Compiler>
+ <Compiler Name="PrivatePropAccessor">True</Compiler>
+ <Compiler Name="UnsafeType">False</Compiler>
+ <Compiler Name="UnsafeCode">False</Compiler>
+ <Compiler Name="UnsafeCast">False</Compiler>
+ <Compiler Name="OptionTruncated">True</Compiler>
+ <Compiler Name="WideCharReduced">True</Compiler>
+ <Compiler Name="DuplicatesIgnored">True</Compiler>
+ <Compiler Name="UnitInitSeq">True</Compiler>
+ <Compiler Name="LocalPInvoke">True</Compiler>
+ <Compiler Name="MessageDirective">True</Compiler>
+ <Compiler Name="CodePage"></Compiler>
+ </Compiler>
+ <Linker>
+ <Linker Name="MapFile">0</Linker>
+ <Linker Name="OutputObjs">0</Linker>
+ <Linker Name="GenerateHpps">False</Linker>
+ <Linker Name="ConsoleApp">1</Linker>
+ <Linker Name="DebugInfo">False</Linker>
+ <Linker Name="RemoteSymbols">False</Linker>
+ <Linker Name="GenerateDRC">False</Linker>
+ <Linker Name="MinStackSize">16384</Linker>
+ <Linker Name="MaxStackSize">1048576</Linker>
+ <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ExeDescription">InstantObjects dbExpress Design-Time Support (Delphi 2006)</Linker>
+ </Linker>
+ <Directories>
+ <Directories Name="OutputDir"></Directories>
+ <Directories Name="UnitOutputDir"></Directories>
+ <Directories Name="PackageDLLOutputDir"></Directories>
+ <Directories Name="PackageDCPOutputDir"></Directories>
+ <Directories Name="SearchPath"></Directories>
+ <Directories Name="Packages"></Directories>
+ <Directories Name="Conditionals"></Directories>
+ <Directories Name="DebugSourceDirs"></Directories>
+ <Directories Name="UsePackages">False</Directories>
+ </Directories>
+ <Parameters>
+ <Parameters Name="RunParams"></Parameters>
+ <Parameters Name="HostApplication"></Parameters>
+ <Parameters Name="Launcher"></Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="DebugCWD"></Parameters>
+ <Parameters Name="Debug Symbols Search Path"></Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Language>
+ <Language Name="ActiveLang"></Language>
+ <Language Name="ProjectLang">$00000000</Language>
+ <Language Name="RootDir"></Language>
+ </Language>
+ <VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+ <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+ <VersionInfo Name="MajorVer">1</VersionInfo>
+ <VersionInfo Name="MinorVer">0</VersionInfo>
+ <VersionInfo Name="Release">0</VersionInfo>
+ <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Debug">False</VersionInfo>
+ <VersionInfo Name="PreRelease">False</VersionInfo>
+ <VersionInfo Name="Special">False</VersionInfo>
+ <VersionInfo Name="Private">False</VersionInfo>
+ <VersionInfo Name="DLL">False</VersionInfo>
+ <VersionInfo Name="Locale">1040</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+ </VersionInfoKeys>
+ </Delphi.Personality>
</BorlandProject>
Modified: trunk/Source/Brokers/DBX/D2006/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2006/IODBX.bdsproj
===================================================================
--- trunk/Source/Brokers/DBX/D2006/IODBX.bdsproj 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Source/Brokers/DBX/D2006/IODBX.bdsproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -1,19 +1,173 @@
<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
- <PersonalityInfo>
- <Option>
- <Option Name="Personality">Delphi.Personality</Option>
- <Option Name="ProjectType"></Option>
- <Option Name="Version">1.0</Option>
- <Option Name="GUID">{5E1C2DC7-B6DF-47CD-A70E-892C50703C49}</Option>
- </Option>
- </PersonalityInfo>
- <Delphi.Personality>
- <Source>
- <Source Name="MainSource">IODBX.dpk</Source>
- </Source>
- <FileVersion>
- <FileVersion Name="Version">7.0</FileVersion>
- </FileVersion>
+ <PersonalityInfo>
+ <Option>
+ <Option Name="Personality">Delphi.Personality</Option>
+ <Option Name="ProjectType"></Option>
+ <Option Name="Version">1.0</Option>
+ <Option Name="GUID">{5E1C2DC7-B6DF-47CD-A70E-892C50703C49}</Option>
+ </Option>
+ </PersonalityInfo>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">IODBX.dpk</Source>
+ </Source>
+ <FileVersion>
+ <FileVersion Name="Version">7.0</FileVersion>
+ </FileVersion> <Compiler>
+ <Compiler Name="A">8</Compiler>
+ <Compiler Name="B">0</Compiler>
+ <Compiler Name="C">1</Compiler>
+ <Compiler Name="D">1</Compiler>
+ <Compiler Name="E">0</Compiler>
+ <Compiler Name="F">0</Compiler>
+ <Compiler Name="G">1</Compiler>
+ <Compiler Name="H">1</Compiler>
+ <Compiler Name="I">1</Compiler>
+ <Compiler Name="J">0</Compiler>
+ <Compiler Name="K">0</Compiler>
+ <Compiler Name="L">1</Compiler>
+ <Compiler Name="M">0</Compiler>
+ <Compiler Name="N">1</Compiler>
+ <Compiler Name="O">1</Compiler>
+ <Compiler Name="P">1</Compiler>
+ <Compiler Name="Q">0</Compiler>
+ <Compiler Name="R">0</Compiler>
+ <Compiler Name="S">0</Compiler>
+ <Compiler Name="T">0</Compiler>
+ <Compiler Name="U">0</Compiler>
+ <Compiler Name="V">1</Compiler>
+ <Compiler Name="W">0</Compiler>
+ <Compiler Name="X">1</Compiler>
+ <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Z">1</Compiler>
+ <Compiler Name="ShowHints">True</Compiler>
+ <Compiler Name="ShowWarnings">True</Compiler>
+ <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+ <Compiler Name="NamespacePrefix"></Compiler>
+ <Compiler Name="GenerateDocumentation">False</Compiler>
+ <Compiler Name="DefaultNamespace"></Compiler>
+ <Compiler Name="SymbolDeprecated">True</Compiler>
+ <Compiler Name="SymbolLibrary">True</Compiler>
+ <Compiler Name="SymbolPlatform">True</Compiler>
+ <Compiler Name="SymbolExperimental">True</Compiler>
+ <Compiler Name="UnitLibrary">True</Compiler>
+ <Compiler Name="UnitPlatform">True</Compiler>
+ <Compiler Name="UnitDeprecated">True</Compiler>
+ <Compiler Name="UnitExperimental">True</Compiler>
+ <Compiler Name="HResultCompat">True</Compiler>
+ <Compiler Name="HidingMember">True</Compiler>
+ <Compiler Name="HiddenVirtual">True</Compiler>
+ <Compiler Name="Garbage">True</Compiler>
+ <Compiler Name="BoundsError">True</Compiler>
+ <Compiler Name="ZeroNilCompat">True</Compiler>
+ <Compiler Name="StringConstTruncated">True</Compiler>
+ <Compiler Name="ForLoopVarVarPar">True</Compiler>
+ <Compiler Name="TypedConstVarPar">True</Compiler>
+ <Compiler Name="AsgToTypedConst">True</Compiler>
+ <Compiler Name="CaseLabelRange">True</Compiler>
+ <Compiler Name="ForVariable">True</Compiler>
+ <Compiler Name="ConstructingAbstract">True</Compiler>
+ <Compiler Name="ComparisonFalse">True</Compiler>
+ <Compiler Name="ComparisonTrue">True</Compiler>
+ <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+ <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+ <Compiler Name="UnsupportedConstruct">True</Compiler>
+ <Compiler Name="FileOpen">True</Compiler>
+ <Compiler Name="FileOpenUnitSrc">True</Compiler>
+ <Compiler Name="BadGlobalSymbol">True</Compiler>
+ <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+ <Compiler Name="InvalidDirective">True</Compiler>
+ <Compiler Name="PackageNoLink">True</Compiler>
+ <Compiler Name="PackageThreadVar">True</Compiler>
+ <Compiler Name="ImplicitImport">True</Compiler>
+ <Compiler Name="HPPEMITIgnored">True</Compiler>
+ <Compiler Name="NoRetVal">True</Compiler>
+ <Compiler Name="UseBeforeDef">True</Compiler>
+ <Compiler Name="ForLoopVarUndef">True</Compiler>
+ <Compiler Name="UnitNameMismatch">True</Compiler>
+ <Compiler Name="NoCFGFileFound">True</Compiler>
+ <Compiler Name="ImplicitVariants">True</Compiler>
+ <Compiler Name="UnicodeToLocale">True</Compiler>
+ <Compiler Name="LocaleToUnicode">True</Compiler>
+ <Compiler Name="ImagebaseMultiple">True</Compiler>
+ <Compiler Name="SuspiciousTypecast">True</Compiler>
+ <Compiler Name="PrivatePropAccessor">True</Compiler>
+ <Compiler Name="UnsafeType">False</Compiler>
+ <Compiler Name="UnsafeCode">False</Compiler>
+ <Compiler Name="UnsafeCast">False</Compiler>
+ <Compiler Name="OptionTruncated">True</Compiler>
+ <Compiler Name="WideCharReduced">True</Compiler>
+ <Compiler Name="DuplicatesIgnored">True</Compiler>
+ <Compiler Name="UnitInitSeq">True</Compiler>
+ <Compiler Name="LocalPInvoke">True</Compiler>
+ <Compiler Name="MessageDirective">True</Compiler>
+ <Compiler Name="CodePage"></Compiler>
+ </Compiler>
+ <Linker>
+ <Linker Name="MapFile">0</Linker>
+ <Linker Name="OutputObjs">0</Linker>
+ <Linker Name="GenerateHpps">False</Linker>
+ <Linker Name="ConsoleApp">1</Linker>
+ <Linker Name="DebugInfo">False</Linker>
+ <Linker Name="RemoteSymbols">False</Linker>
+ <Linker Name="GenerateDRC">False</Linker>
+ <Linker Name="MinStackSize">16384</Linker>
+ <Linker Name="MaxStackSize">1048576</Linker>
+ <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ExeDescription">InstantObjects dbExpress Run-Time Support (Delphi 2006)</Linker>
+ </Linker>
+ <Directories>
+ <Directories Name="OutputDir"></Directories>
+ <Directories Name="UnitOutputDir"></Directories>
+ <Directories Name="PackageDLLOutputDir"></Directories>
+ <Directories Name="PackageDCPOutputDir"></Directories>
+ <Directories Name="SearchPath"></Directories>
+ <Directories Name="Packages"></Directories>
+ <Directories Name="Conditionals"></Directories>
+ <Directories Name="DebugSourceDirs"></Directories>
+ <Directories Name="UsePackages">False</Directories>
+ </Directories>
+ <Parameters>
+ <Parameters Name="RunParams"></Parameters>
+ <Parameters Name="HostApplication"></Parameters>
+ <Parameters Name="Launcher"></Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="DebugCWD"></Parameters>
+ <Parameters Name="Debug Symbols Search Path"></Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Language>
+ <Language Name="ActiveLang"></Language>
+ <Language Name="ProjectLang">$00000000</Language>
+ <Language Name="RootDir"></Language>
+ </Language>
+ <VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+ <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+ <VersionInfo Name="MajorVer">2</VersionInfo>
+ <VersionInfo Name="MinorVer">1</VersionInfo>
+ <VersionInfo Name="Release">0</VersionInfo>
+ <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Debug">False</VersionInfo>
+ <VersionInfo Name="PreRelease">True</VersionInfo>
+ <VersionInfo Name="Special">False</VersionInfo>
+ <VersionInfo Name="Private">False</VersionInfo>
+ <VersionInfo Name="DLL">False</VersionInfo>
+ <VersionInfo Name="Locale">1040</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys>
+ </VersionInfoKeys>
</Delphi.Personality>
-</BorlandProject>
\ No newline at end of file
+</BorlandProject>
Modified: trunk/Source/Brokers/DBX/D2006/IODBX.dpk
===================================================================
--- trunk/Source/Brokers/DBX/D2006/IODBX.dpk 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Source/Brokers/DBX/D2006/IODBX.dpk 2008-02-25 17:55:07 UTC (rev 777)
@@ -1,7 +1,6 @@
package IODBX;
{$R *.res}
-
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
@@ -35,7 +34,8 @@
dbexpress,
IOCore,
IOIBFbCatalog,
- IOMSSqlCatalog;
+ IOMSSqlCatalog,
+ IOMySQLCatalog;
contains
InstantDBXConnectionDefEdit in '..\InstantDBXConnectionDefEdit.pas' {InstantDBXConnectionDefEditForm},
Modified: trunk/Source/Brokers/DBX/D2006/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj
===================================================================
--- trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj 2007-09-18 09:14:53 UTC (rev 776)
+++ trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj 2008-02-25 17:55:07 UTC (rev 777)
@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Cond...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X