Menu
▾
▴
instantobjects-cvscommit — Generates a message for every commit made on CVS
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(25) |
Oct
(10) |
Nov
(19) |
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(206) |
Mar
(43) |
Apr
(25) |
May
(20) |
Jun
(69) |
Jul
(121) |
Aug
(95) |
Sep
(122) |
Oct
(213) |
Nov
(46) |
Dec
(39) |
| 2006 |
Jan
(28) |
Feb
(57) |
Mar
(21) |
Apr
(7) |
May
(11) |
Jun
(2) |
Jul
(8) |
Aug
(13) |
Sep
(2) |
Oct
(2) |
Nov
(20) |
Dec
(16) |
| 2007 |
Jan
(9) |
Feb
(15) |
Mar
|
Apr
(4) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
(9) |
Oct
|
Nov
(1) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(8) |
Apr
(1) |
May
|
Jun
|
Jul
(11) |
Aug
(57) |
Sep
(2) |
Oct
(6) |
Nov
|
Dec
(7) |
| 2010 |
Jan
(11) |
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(27) |
Oct
(3) |
Nov
(7) |
Dec
(1) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(10) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(8) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
(4) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
|
Nov
(4) |
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <Dav...@us...> - 2009-03-21 19:12:50
|
Revision: 793
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=793&view=rev
Author: DavidVTaylor
Date: 2009-03-21 19:12:47 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Branch for porting of IO to Delphi 2009
Added Paths:
-----------
branches/Delphi2009/
|
|
From: <and...@us...> - 2008-11-20 09:43:52
|
Revision: 792
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=792&view=rev
Author: andreavaccari
Date: 2008-11-20 09:43:47 +0000 (Thu, 20 Nov 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/Source/Core/InstantPersistence.pas
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2008-09-26 15:57:21 UTC (rev 791)
+++ trunk/Source/Core/InstantPersistence.pas 2008-11-20 09:43:47 UTC (rev 792)
@@ -7197,10 +7197,10 @@
var
ANode, Delete, Child: TInstantCacheNode;
begin
+ ANode := FindNode(AObject.PersistentId);
if ANode = Leaf then
Exit;
- ANode := FindNode(AObject.PersistentId);
if (ANode.Left = Leaf) or (ANode.Right = Leaf) then
Delete := ANode
else
|
|
From: <and...@us...> - 2008-09-26 15:57:32
|
Revision: 791
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=791&view=rev
Author: andreavaccari
Date: 2008-09-26 15:57:21 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/Source/Core/InstantPersistence.pas
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2008-09-05 09:11:38 UTC (rev 790)
+++ trunk/Source/Core/InstantPersistence.pas 2008-09-26 15:57:21 UTC (rev 791)
@@ -7197,6 +7197,9 @@
var
ANode, Delete, Child: TInstantCacheNode;
begin
+ if ANode = Leaf then
+ Exit;
+
ANode := FindNode(AObject.PersistentId);
if (ANode.Left = Leaf) or (ANode.Right = Leaf) then
Delete := ANode
|
|
From: <car...@us...> - 2008-09-05 09:11:28
|
Revision: 790
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=790&view=rev
Author: carlobar
Date: 2008-09-05 09:11:38 +0000 (Fri, 05 Sep 2008)
Log Message:
-----------
New Fix for the bug for EXISTS/USING clause of IQL when a broker uses quoted identifiers.
Modified Paths:
--------------
trunk/Source/Core/InstantBrokers.pas
trunk/Source/Core/InstantCommand.pas
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2008-09-03 10:46:34 UTC (rev 789)
+++ trunk/Source/Core/InstantBrokers.pas 2008-09-05 09:11:38 UTC (rev 790)
@@ -847,7 +847,6 @@
function IndexOfChildContext(const AChildContext: TInstantTranslationContext): Integer;
function Qualify(const TablePath, FieldName: string): string;
function QualifyPath(const PathText: string): string;
- function QualifyClassPath(const PathText: string): string;
function WriteCriterias(Writer: TInstantIQLWriter; IncludeWhere: Boolean): Boolean;
procedure WriteTables(Writer: TInstantIQLWriter);
@@ -6485,14 +6484,6 @@
Result := Qualify(TablePath, FieldName);
end;
-function TInstantTranslationContext.QualifyClassPath(const PathText: string): string;
-var
- TablePath, FieldName: string;
-begin
- PathToTarget(PathText, TablePath, FieldName);
- Result := Qualify(TablePath, FieldName+InstantClassFieldName);
-end;
-
function TInstantTranslationContext.QuoteString(const Str: string): string;
begin
Result := InstantQuote(Str, Quote);
Modified: trunk/Source/Core/InstantCommand.pas
===================================================================
--- trunk/Source/Core/InstantCommand.pas 2008-09-03 10:46:34 UTC (rev 789)
+++ trunk/Source/Core/InstantCommand.pas 2008-09-05 09:11:38 UTC (rev 790)
@@ -1991,9 +1991,8 @@
WriteString('((');
- WriteString( LSubContext.QualifyClassPath(LAttributeMetadata.FieldName));
- WriteString(' = ');
- WriteString(InstantQuote(LParentContext.ClassRef.ObjectClassName, LParentContext.Quote));
+ WriteString(LSubContext.Qualify(LSubContext.TableName, LAttributeMetadata.FieldName + InstantClassFieldName) +
+ ' = ' + InstantQuote(LParentContext.ClassRef.ObjectClassName, LParentContext.Quote));
WriteString(') AND (');
@@ -2003,7 +2002,7 @@
WriteString('))');
end;
-
+
end;
end;
|
|
From: <car...@us...> - 2008-09-03 10:46:26
|
Revision: 789
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=789&view=rev
Author: carlobar
Date: 2008-09-03 10:46:34 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
little fixes to show the entire examples for IQL queries and the SQL translated command.
Modified Paths:
--------------
trunk/Demos/PrimerCross/QueryView.dfm
trunk/Demos/PrimerCross/QueryView.pas
Modified: trunk/Demos/PrimerCross/QueryView.dfm
===================================================================
--- trunk/Demos/PrimerCross/QueryView.dfm 2008-09-03 10:43:07 UTC (rev 788)
+++ trunk/Demos/PrimerCross/QueryView.dfm 2008-09-03 10:46:34 UTC (rev 789)
@@ -72,7 +72,7 @@
Width = 461
Height = 21
Style = csDropDownList
- DropDownCount = 11
+ DropDownCount = 12
ItemHeight = 13
TabOrder = 1
OnClick = ExampleComboBoxClick
Modified: trunk/Demos/PrimerCross/QueryView.pas
===================================================================
--- trunk/Demos/PrimerCross/QueryView.pas 2008-09-03 10:43:07 UTC (rev 788)
+++ trunk/Demos/PrimerCross/QueryView.pas 2008-09-03 10:46:34 UTC (rev 789)
@@ -114,6 +114,9 @@
procedure TQueryViewForm.ExecuteActionExecute(Sender: TObject);
begin
+{$IFDEF IO_STATEMENT_LOGGING}
+ TranslatedQueryMemo.Clear;
+{$ENDIF}
with TestSelector do
begin
Close;
@@ -193,7 +196,9 @@
procedure TQueryViewForm.TestSelectorAfterClose(DataSet: TDataSet);
begin
inherited;
+{$IFDEF IO_STATEMENT_LOGGING}
TranslatedQueryMemo.Clear;
+{$ENDIF}
end;
end.
|
|
From: <car...@us...> - 2008-09-03 10:42:57
|
Revision: 788
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=788&view=rev
Author: carlobar
Date: 2008-09-03 10:43:07 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
Fixed a bug for EXISTS/USING clause of IQL when a broker uses quoted identifiers.
Modified Paths:
--------------
trunk/Source/Core/InstantBrokers.pas
trunk/Source/Core/InstantCommand.pas
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2008-09-02 14:00:30 UTC (rev 787)
+++ trunk/Source/Core/InstantBrokers.pas 2008-09-03 10:43:07 UTC (rev 788)
@@ -847,6 +847,7 @@
function IndexOfChildContext(const AChildContext: TInstantTranslationContext): Integer;
function Qualify(const TablePath, FieldName: string): string;
function QualifyPath(const PathText: string): string;
+ function QualifyClassPath(const PathText: string): string;
function WriteCriterias(Writer: TInstantIQLWriter; IncludeWhere: Boolean): Boolean;
procedure WriteTables(Writer: TInstantIQLWriter);
@@ -6484,6 +6485,14 @@
Result := Qualify(TablePath, FieldName);
end;
+function TInstantTranslationContext.QualifyClassPath(const PathText: string): string;
+var
+ TablePath, FieldName: string;
+begin
+ PathToTarget(PathText, TablePath, FieldName);
+ Result := Qualify(TablePath, FieldName+InstantClassFieldName);
+end;
+
function TInstantTranslationContext.QuoteString(const Str: string): string;
begin
Result := InstantQuote(Str, Quote);
Modified: trunk/Source/Core/InstantCommand.pas
===================================================================
--- trunk/Source/Core/InstantCommand.pas 2008-09-02 14:00:30 UTC (rev 787)
+++ trunk/Source/Core/InstantCommand.pas 2008-09-03 10:43:07 UTC (rev 788)
@@ -1991,8 +1991,9 @@
WriteString('((');
- WriteString(LSubContext.QualifyPath(LAttributeMetadata.FieldName ) + InstantClassFieldName +
- ' = ' + InstantQuote(LParentContext.ClassRef.ObjectClassName, LParentContext.Quote));
+ WriteString( LSubContext.QualifyClassPath(LAttributeMetadata.FieldName));
+ WriteString(' = ');
+ WriteString(InstantQuote(LParentContext.ClassRef.ObjectClassName, LParentContext.Quote));
WriteString(') AND (');
|
|
From: <car...@us...> - 2008-09-02 14:00:20
|
Revision: 787
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=787&view=rev
Author: carlobar
Date: 2008-09-02 14:00:30 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
Updated MySQL Catalog:
minor fix: removed unused variable.
Modified Paths:
--------------
trunk/Source/Catalogs/MySQL/InstantMySQLCatalog.pas
Property Changed:
----------------
trunk/Source/Catalogs/MySQL/
Property changes on: trunk/Source/Catalogs/MySQL
___________________________________________________________________
Modified: svn:ignore
- *.dcu
+ *.dcu
*.~pas
Modified: trunk/Source/Catalogs/MySQL/InstantMySQLCatalog.pas
===================================================================
--- trunk/Source/Catalogs/MySQL/InstantMySQLCatalog.pas 2008-09-02 13:59:05 UTC (rev 786)
+++ trunk/Source/Catalogs/MySQL/InstantMySQLCatalog.pas 2008-09-02 14:00:30 UTC (rev 787)
@@ -132,7 +132,6 @@
FieldMetadata: TInstantFieldMetadata;
AlternateDataTypes: TInstantDataTypes;
FieldMetaDataType: TInstantDataType;
- FieldTypeName: string;
begin
Fields := Broker.AcquireDataSet(GetSelectFieldsSQL(TableMetadata.Name));
try
|
|
From: <car...@us...> - 2008-09-02 13:58:56
|
Revision: 786
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=786&view=rev
Author: carlobar
Date: 2008-09-02 13:59:05 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
Updated Test suite:
fixed bug for compiling (added path and correct location for InstantDefines.inc
Modified Paths:
--------------
trunk/Tests/TestIO.cfg
trunk/Tests/TestIO.dof
trunk/Tests/TestIO.dpr
trunk/Tests/TestIO.mdr
trunk/Tests/ubmock/src/testdecorator.pas
Property Changed:
----------------
trunk/Tests/
trunk/Tests/ubmock/src/
Property changes on: trunk/Tests
___________________________________________________________________
Modified: svn:ignore
- __history
*.dcu
*.local
*.exe
*.identcache
+ __history
*.dcu
*.local
*.exe
*.identcache
*.~dpr
*.dsk
Modified: trunk/Tests/TestIO.cfg
===================================================================
--- trunk/Tests/TestIO.cfg 2008-09-02 13:57:34 UTC (rev 785)
+++ trunk/Tests/TestIO.cfg 2008-09-02 13:59:05 UTC (rev 786)
@@ -31,12 +31,12 @@
-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"
+-LE"c:\program files\borland\delphi7\Projects\Bpl"
+-LN"c:\program files\borland\delphi7\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
Modified: trunk/Tests/TestIO.dof
===================================================================
--- trunk/Tests/TestIO.dof 2008-09-02 13:57:34 UTC (rev 785)
+++ trunk/Tests/TestIO.dof 2008-09-02 13:59:05 UTC (rev 786)
@@ -94,7 +94,7 @@
UnitOutputDir=
PackageDLLOutputDir=
PackageDCPOutputDir=
-SearchPath=..\core
+SearchPath=..\Source\core;.\ubmock\src
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
Modified: trunk/Tests/TestIO.dpr
===================================================================
--- trunk/Tests/TestIO.dpr 2008-09-02 13:57:34 UTC (rev 785)
+++ trunk/Tests/TestIO.dpr 2008-09-02 13:59:05 UTC (rev 786)
@@ -1,6 +1,6 @@
program TestIO;
-{$I '..\InstantDefines.inc'}
+{$I '..\Source\InstantDefines.inc'}
{$IFDEF FPC}
{$mode objfpc}{$H+}
Property changes on: trunk/Tests/ubmock/src
___________________________________________________________________
Modified: svn:ignore
- *.rst
*.dcu
+ *.rst
*.dcu
*.~pas
Modified: trunk/Tests/ubmock/src/testdecorator.pas
===================================================================
--- trunk/Tests/ubmock/src/testdecorator.pas 2008-09-02 13:57:34 UTC (rev 785)
+++ trunk/Tests/ubmock/src/testdecorator.pas 2008-09-02 13:59:05 UTC (rev 786)
@@ -28,9 +28,10 @@
TTestDecorator = class(TAssert)
private
FTest: TTest;
+ protected
+ procedure SetTestSuiteName(const aName: string); override;
function GetTestName: string; override;
function GetTestSuiteName: string; override;
- procedure SetTestSuiteName(const aName: string); override;
public
function CountTestCases: integer; override;
constructor Create(aTest: TTest); reintroduce; overload;
|
|
From: <car...@us...> - 2008-09-02 13:57:24
|
Revision: 785
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=785&view=rev
Author: carlobar
Date: 2008-09-02 13:57:34 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
Updated PrimerCross Demo:
Fixed a bug for compilation (added path for MySQL Catalog)
Added IO_STATEMENT_LOGGING compiler directive
Fixed a bug of QueryView (wrong size of example array)
Modified Paths:
--------------
trunk/Demos/PrimerCross/Primer.cfg
trunk/Demos/PrimerCross/Primer.dof
trunk/Demos/PrimerCross/QueryView.pas
Property Changed:
----------------
trunk/Demos/PrimerCross/
trunk/Demos/PrimerCross/ParadoxDB/
Property changes on: trunk/Demos/PrimerCross
___________________________________________________________________
Modified: svn:ignore
- *.dcu
*.~*
*.ddp
*.exe
__history
*.identcache
*.local
*.dsk
+ *.dcu
*.~*
*.ddp
*.exe
__history
*.identcache
*.local
*.dsk
*.MB
Property changes on: trunk/Demos/PrimerCross/ParadoxDB
___________________________________________________________________
Added: svn:ignore
+ *.DB
*.PX
*.VAL
*.MB
*.X07
*.X08
*.Y07
*.Y08
Modified: trunk/Demos/PrimerCross/Primer.cfg
===================================================================
--- trunk/Demos/PrimerCross/Primer.cfg 2008-09-02 13:53:53 UTC (rev 784)
+++ trunk/Demos/PrimerCross/Primer.cfg 2008-09-02 13:57:34 UTC (rev 785)
@@ -37,6 +37,7 @@
-O"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB;..\..\Source\Brokers\ZeosDBO;..\..\Source\Catalogs\MsSql;..\..\Source\Catalogs\IbFb"
-I"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB;..\..\Source\Brokers\ZeosDBO;..\..\Source\Catalogs\MsSql;..\..\Source\Catalogs\IbFb"
-R"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB;..\..\Source\Brokers\ZeosDBO;..\..\Source\Catalogs\MsSql;..\..\Source\Catalogs\IbFb"
+-DIO_STATEMENT_LOGGING
-w-UNIT_PLATFORM
-w-UNSAFE_TYPE
-w-UNSAFE_CODE
Modified: trunk/Demos/PrimerCross/Primer.dof
===================================================================
--- trunk/Demos/PrimerCross/Primer.dof 2008-09-02 13:53:53 UTC (rev 784)
+++ trunk/Demos/PrimerCross/Primer.dof 2008-09-02 13:57:34 UTC (rev 785)
@@ -94,9 +94,9 @@
UnitOutputDir=
PackageDLLOutputDir=
PackageDCPOutputDir=
-SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB;..\..\Source\Brokers\ZeosDBO;..\..\Source\Catalogs\BDE;..\..\Source\Catalogs\MsSql;..\..\Source\Catalogs\IbFb;..\..\Source\Catalogs\XML
+SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB;..\..\Source\Brokers\ZeosDBO;..\..\Source\Catalogs\MySQL;..\..\Source\Catalogs\MsSql;..\..\Source\Catalogs\IbFb
Packages=
-Conditionals=
+Conditionals=IO_STATEMENT_LOGGING
DebugSourceDirs=
UsePackages=0
[Parameters]
Modified: trunk/Demos/PrimerCross/QueryView.pas
===================================================================
--- trunk/Demos/PrimerCross/QueryView.pas 2008-09-02 13:53:53 UTC (rev 784)
+++ trunk/Demos/PrimerCross/QueryView.pas 2008-09-02 13:57:34 UTC (rev 785)
@@ -66,7 +66,7 @@
InstantPersistence, InstantBrokers, InstantConsts;
const
- Examples: array[0..10, 0..1] of string = (
+ Examples: array[0..11, 0..1] of string = (
('All contacts',
'SELECT * FROM ANY TContact'),
('All companies',
|
|
From: <car...@us...> - 2008-09-02 13:53:42
|
Revision: 784
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=784&view=rev
Author: carlobar
Date: 2008-09-02 13:53:53 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
Added "default" False to UseNull property of TInstantAttributeMetadata
Modified Paths:
--------------
trunk/Source/Core/InstantMetadata.pas
Modified: trunk/Source/Core/InstantMetadata.pas
===================================================================
--- trunk/Source/Core/InstantMetadata.pas 2008-09-02 13:52:26 UTC (rev 783)
+++ trunk/Source/Core/InstantMetadata.pas 2008-09-02 13:53:53 UTC (rev 784)
@@ -498,7 +498,7 @@
write SetAttributeTypeName stored False;
property ClassMetadata: TInstantClassMetadata read GetClassMetadata;
property DefaultValue: string read FDefaultValue write FDefaultValue;
- property UseNull: Boolean read FUseNull write FUseNull;
+ property UseNull: Boolean read FUseNull write FUseNull default False;
property DisplayWidth: Integer read FDisplayWidth write FDisplayWidth
default 0;
property EditMask: string read FEditMask write FEditMask;
|
|
From: <car...@us...> - 2008-09-02 13:52:15
|
Revision: 783
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=783&view=rev
Author: carlobar
Date: 2008-09-02 13:52:26 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
fixed a bug in TInstantNavigationalResolver.WriteCurrency
Modified Paths:
--------------
trunk/Source/Core/InstantBrokers.pas
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2008-08-25 13:28:15 UTC (rev 782)
+++ trunk/Source/Core/InstantBrokers.pas 2008-09-02 13:52:26 UTC (rev 783)
@@ -2549,9 +2549,9 @@
Clear
else
{$IFDEF FPC}
- AsFloat := Value;
+ AsFloat := Attribute.Value;
{$ELSE}
- AsCurrency := Value;
+ AsCurrency := Attribute.Value;
{$ENDIF}
end;
|
|
From: <na...@us...> - 2008-08-25 13:28:10
|
Revision: 782
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=782&view=rev
Author: nandod
Date: 2008-08-25 13:28:15 +0000 (Mon, 25 Aug 2008)
Log Message:
-----------
+ new IQL function EXISTS().
Modified Paths:
--------------
trunk/Demos/PrimerCross/Primer.dproj
trunk/Demos/PrimerCross/PrimerExternal.dpr
trunk/Demos/PrimerCross/PrimerExternal.dproj
trunk/Demos/PrimerCross/QueryView.dfm
trunk/Demos/PrimerCross/QueryView.pas
trunk/Source/Brokers/XML/InstantXML.pas
trunk/Source/Core/InstantBrokers.pas
trunk/Source/Core/InstantCommand.pas
trunk/Source/Core/InstantConsts.pas
trunk/Source/Core/InstantPersistence.pas
trunk/Source/Core/InstantPresentation.pas
trunk/Source/Core/InstantUtils.pas
trunk/Source/PackageGroups/D2007/AllPackages.groupproj
Modified: trunk/Demos/PrimerCross/Primer.dproj
===================================================================
--- trunk/Demos/PrimerCross/Primer.dproj 2008-07-08 07:01:41 UTC (rev 781)
+++ trunk/Demos/PrimerCross/Primer.dproj 2008-08-25 13:28:15 UTC (rev 782)
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid>
<MainSource>Primer.dpr</MainSource>
@@ -20,7 +21,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<Version>7.0</Version>
- <DCC_Define>DEBUG</DCC_Define>
+ <DCC_Define>DEBUG;IO_STATEMENT_LOGGING</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;..\..\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>
@@ -30,7 +31,8 @@
<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">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>
+<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> <ModelSupport>False</ModelSupport>
+</BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
Modified: trunk/Demos/PrimerCross/PrimerExternal.dpr
===================================================================
--- trunk/Demos/PrimerCross/PrimerExternal.dpr 2008-07-08 07:01:41 UTC (rev 781)
+++ trunk/Demos/PrimerCross/PrimerExternal.dpr 2008-08-25 13:28:15 UTC (rev 782)
@@ -62,10 +62,10 @@
ContactSort in 'ContactSort.pas' {ContactSortForm},
CategoryBrowse in 'CategoryBrowse.pas' {CategoryBrowseForm},
HelpView in 'HelpView.pas' {HelpViewForm: TFrame},
- QueryView in 'QueryView.pas' {QueryViewForm: TFrame},
RandomData in 'RandomData.pas',
Stopwatch in 'Stopwatch.pas',
- Utility in 'Utility.pas';
+ Utility in 'Utility.pas',
+ QueryView in 'QueryView.pas' {QueryViewForm: TFrame};
{$R *.res}
{$R *.mdr} {Model}
Modified: trunk/Demos/PrimerCross/PrimerExternal.dproj
===================================================================
--- trunk/Demos/PrimerCross/PrimerExternal.dproj 2008-07-08 07:01:41 UTC (rev 781)
+++ trunk/Demos/PrimerCross/PrimerExternal.dproj 2008-08-25 13:28:15 UTC (rev 782)
@@ -3,7 +3,7 @@
<PropertyGroup>
<ProjectGuid>{0d607f9b-9c2b-445d-84fd-7072bc53deff}</ProjectGuid>
<MainSource>PrimerExternal.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>PrimerExternal.exe</DCC_DependencyCheckOutputName>
@@ -13,25 +13,25 @@
<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>
+ <DCC_Define>RELEASE;IO_STATEMENT_LOGGING</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;..\..\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_Define>DEBUG;IO_STATEMENT_LOGGING</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;..\..\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><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>
+<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">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">PrimerExternal.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
@@ -46,6 +46,7 @@
</DCCReference>
<DCCReference Include="BasicView.pas">
<Form>BasicViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="CategoryBrowse.pas">
<Form>CategoryBrowseForm</Form>
@@ -70,6 +71,7 @@
</DCCReference>
<DCCReference Include="ContactView.pas">
<Form>ContactViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="CountryBrowse.pas">
<Form>CountryBrowseForm</Form>
@@ -80,16 +82,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="ModelExternal\Model.pas" />
<DCCReference Include="PerformanceView.pas">
<Form>PerformanceViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="PersonBrowse.pas">
<Form>PersonBrowseForm</Form>
@@ -99,6 +104,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/QueryView.dfm
===================================================================
--- trunk/Demos/PrimerCross/QueryView.dfm 2008-07-08 07:01:41 UTC (rev 781)
+++ trunk/Demos/PrimerCross/QueryView.dfm 2008-08-25 13:28:15 UTC (rev 782)
@@ -1,10 +1,10 @@
inherited QueryViewForm: TQueryViewForm
- Width = 600
+ Width = 772
Height = 320
object Splitter: TSplitter
Left = 0
Top = 147
- Width = 600
+ Width = 772
Height = 6
Cursor = crVSplit
Align = alTop
@@ -12,7 +12,7 @@
object CommandPanel: TPanel
Left = 0
Top = 0
- Width = 600
+ Width = 772
Height = 147
Align = alTop
BevelOuter = bvNone
@@ -35,7 +35,7 @@
FocusControl = ExampleComboBox
end
object NumberLabel: TLabel
- Left = 443
+ Left = 614
Top = 126
Width = 77
Height = 13
@@ -47,7 +47,7 @@
object CommandEdit: TMemo
Left = 30
Top = 30
- Width = 540
+ Width = 712
Height = 87
Align = alClient
Font.Charset = ANSI_CHARSET
@@ -69,15 +69,16 @@
object ExampleComboBox: TComboBox
Left = 168
Top = 121
- Width = 281
+ Width = 461
Height = 21
Style = csDropDownList
+ DropDownCount = 11
ItemHeight = 13
TabOrder = 1
OnClick = ExampleComboBoxClick
end
object MaxCountEdit: TMaskEdit
- Left = 524
+ Left = 695
Top = 122
Width = 44
Height = 21
@@ -87,31 +88,53 @@
Text = '0 '
end
end
- object ResultPanel: TPanel
+ object ResultPageControl: TPageControl
Left = 0
Top = 153
- Width = 600
+ Width = 772
Height = 167
+ ActivePage = ResultTabSheet
Align = alClient
- BevelOuter = bvNone
TabOrder = 1
- object ResultGrid: TDBGrid
- Left = 0
- Top = 0
- Width = 600
- Height = 167
- Align = alClient
- DataSource = TestSource
- TabOrder = 0
- TitleFont.Charset = DEFAULT_CHARSET
- TitleFont.Color = clWindowText
- TitleFont.Height = -11
- TitleFont.Name = 'MS Sans Serif'
- TitleFont.Style = []
+ object ResultTabSheet: TTabSheet
+ Caption = 'Result'
+ object ResultGrid: TDBGrid
+ Left = 0
+ Top = 0
+ Width = 764
+ Height = 139
+ Align = alClient
+ DataSource = TestSource
+ TabOrder = 0
+ TitleFont.Charset = DEFAULT_CHARSET
+ TitleFont.Color = clWindowText
+ TitleFont.Height = -11
+ TitleFont.Name = 'MS Sans Serif'
+ TitleFont.Style = []
+ end
end
+ object TranslatedQueryTabSheet: TTabSheet
+ Caption = 'Translated Query'
+ ImageIndex = 1
+ object TranslatedQueryMemo: TMemo
+ Left = 0
+ Top = 0
+ Width = 764
+ Height = 139
+ Align = alClient
+ Font.Charset = ANSI_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -13
+ Font.Name = 'Courier New'
+ Font.Style = []
+ ParentFont = False
+ TabOrder = 0
+ end
+ end
end
object TestSelector: TInstantSelector
AfterScroll = TestSelectorAfterScroll
+ AfterClose = TestSelectorAfterClose
Left = 32
Top = 192
end
Modified: trunk/Demos/PrimerCross/QueryView.pas
===================================================================
--- trunk/Demos/PrimerCross/QueryView.pas 2008-07-08 07:01:41 UTC (rev 781)
+++ trunk/Demos/PrimerCross/QueryView.pas 2008-08-25 13:28:15 UTC (rev 782)
@@ -18,7 +18,7 @@
QGraphics, QControls, QForms, QDialogs, QMask,
QGrids, QDBGrids, QStdCtrls, QExtCtrls, QActnList, QMenus, QButtons,
{$ENDIF}
- BasicView, Db, InstantPresentation;
+ BasicView, Db, InstantPresentation, ComCtrls;
type
TQueryViewForm = class(TBasicViewForm)
@@ -31,29 +31,42 @@
ExecuteAction: TAction;
ExecuteButton: TButton;
ResultGrid: TDBGrid;
- ResultPanel: TPanel;
+ ResultPageControl: TPageControl;
Splitter: TSplitter;
TestSelector: TInstantSelector;
TestSource: TDataSource;
MaxCountEdit: TMaskEdit;
NumberLabel: TLabel;
+ ResultTabSheet: TTabSheet;
+ TranslatedQueryTabSheet: TTabSheet;
+ TranslatedQueryMemo: TMemo;
procedure ExecuteActionExecute(Sender: TObject);
procedure ExampleComboBoxClick(Sender: TObject);
procedure TestSelectorAfterScroll(DataSet: TDataSet);
procedure ActionsUpdate(Action: TBasicAction; var Handled: Boolean);
+ procedure TestSelectorAfterClose(DataSet: TDataSet);
+ private
+ procedure LogStatement(const AString: string);
+ procedure UpdateTabSheets;
protected
procedure LoadExamples;
public
procedure FormCreate(Sender: TObject); override;
+ procedure FormShow(Sender: TObject); override;
procedure Disconnect; override;
+ procedure Connect; override;
+ destructor Destroy; override;
end;
implementation
{$R *.dfm}
+uses
+ InstantPersistence, InstantBrokers, InstantConsts;
+
const
- Examples: array[0..9, 0..1] of string = (
+ Examples: array[0..10, 0..1] of string = (
('All contacts',
'SELECT * FROM ANY TContact'),
('All companies',
@@ -73,9 +86,19 @@
('Corporations ordered descending by city',
'SELECT * FROM TCompany WHERE Name LIKE "%Corp%" ORDER BY City DESC'),
('Employees from same city as their employer',
- 'SELECT * FROM TPerson WHERE City = Employer.City')
+ 'SELECT * FROM TPerson WHERE City = Employer.City'),
+ ('Categories of contacts in cities with names starting by A',
+ 'SELECT DISTINCT * FROM TCategory WHERE EXISTS(SELECT * FROM ANY TContact WHERE City LIKE ''A%'' USING Category)'),
+ ('Companies with at least one employee living in San Diego',
+ 'SELECT * FROM TCompany WHERE EXISTS(SELECT * FROM TPerson WHERE City = ''San Diego'' USING Employer)')
);
+destructor TQueryViewForm.Destroy;
+begin
+ InstantLogProc := nil;
+ inherited;
+end;
+
procedure TQueryViewForm.Disconnect;
begin
TestSelector.Close;
@@ -104,8 +127,17 @@
begin
Caption := 'Query';
LoadExamples;
+ ResultPageControl.ActivePage := ResultTabSheet;
end;
+procedure TQueryViewForm.LogStatement(const AString: string);
+begin
+ //Log only first statement
+ if TranslatedQueryMemo.Lines.Count = 0 then
+ TranslatedQueryMemo.Lines.Text :=
+ Copy(AString, Length(InstantLogStatementBefore) + 1, MaxInt);
+end;
+
procedure TQueryViewForm.LoadExamples;
var
I: Integer;
@@ -135,4 +167,33 @@
ExecuteAction.Enabled := IsConnected and (CommandEdit.Text <> '') and Visible;
end;
+procedure TQueryViewForm.FormShow(Sender: TObject);
+begin
+ inherited;
+ UpdateTabSheets;
+end;
+
+procedure TQueryViewForm.UpdateTabSheets;
+begin
+{$IFDEF IO_STATEMENT_LOGGING}
+ TranslatedQueryTabSheet.TabVisible := Assigned(Connector) and (Connector.Broker is TInstantSQLBroker);
+ InstantLogProc := LogStatement;
+{$ELSE}
+ TranslatedQueryTabSheet.TabVisible := False;
+ InstantLogProc := nil;
+{$ENDIF}
+end;
+
+procedure TQueryViewForm.Connect;
+begin
+ inherited;
+ UpdateTabSheets;
+end;
+
+procedure TQueryViewForm.TestSelectorAfterClose(DataSet: TDataSet);
+begin
+ inherited;
+ TranslatedQueryMemo.Clear;
+end;
+
end.
Modified: trunk/Source/Brokers/XML/InstantXML.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXML.pas 2008-07-08 07:01:41 UTC (rev 781)
+++ trunk/Source/Brokers/XML/InstantXML.pas 2008-08-25 13:28:15 UTC (rev 782)
@@ -22,7 +22,7 @@
*
* Contributor(s):
* Carlo Barazzetta, Adrea Petrelli, Nando Dessena, Marco Cant\xF9,
- * Steven Mitchell
+ * Steven Mitchell, Andrea Magni
*
* ***** END LICENSE BLOCK ***** *)
@@ -63,11 +63,11 @@
FConnected: Boolean;
FRootFolder: string;
FXMLFileFormat: TXMLFileFormat;
- procedure CreateStorageDir(const AStorageName: string);
function GetRootFolder: string;
procedure SetRootFolder(const AValue: string);
function ObjectUpdateCountFromFileName(const AFileName: string): Integer;
protected
+ procedure CreateStorageDir(const AStorageName: string);
procedure DoConnect; override;
procedure DoDisconnect; override;
function GetConnected: Boolean; override;
@@ -109,7 +109,7 @@
function CheckConflict(AObject: TInstantObject;
const AStorageName, AObjectId: string): Boolean;
procedure LoadFileList(const AFileList: TStringList;
- const AStorageNames: TStrings);
+ const AStorageNames: TStrings); virtual;
published
property RootFolder: string read GetRootFolder write SetRootFolder;
property XMLFileFormat: TXMLFileFormat
@@ -259,6 +259,7 @@
procedure SetParams(Value: TParams); override;
function ObjectFetched(Index: Integer): Boolean; override;
procedure SetStatement(const Value: string); override;
+ function InternalGetObjectReferenceId(Index: Integer) : string; override;
property ObjectReferenceCount: Integer read GetObjectReferenceCount;
property ObjectReferenceList: TObjectList read GetObjectReferenceList;
property ObjectReferences[Index: Integer]: TInstantObjectReference read
@@ -312,6 +313,8 @@
property TableMetadata: TInstantTableMetadata read GetTableMetadata;
end;
+procedure GlobalLoadFileList(const Path: string; FileList: TStringList);
+
implementation
uses
@@ -922,6 +925,13 @@
Result := ObjectReferenceCount;
end;
+function TInstantXMLQuery.InternalGetObjectReferenceId(
+ Index: Integer): string;
+begin
+ Result := inherited InternalGetObjectReferenceId(Index)+
+ '['+TInstantObjectReference(ObjectReferenceList[Index]).ObjectId+']';
+end;
+
function TInstantXMLQuery.InternalGetObjects(Index: Integer): TObject;
begin
Result := ObjectReferences[Index].Dereference(Connector);
@@ -1245,9 +1255,9 @@
I: Integer;
begin
Result := inherited TranslateClassRef(ClassRef, Writer);
- if TablePathCount > 0 then
+ if Context.TablePathCount > 0 then
begin
- (Query as TInstantXMLQuery).StorageNames.Text := TablePaths[0];
+ (Query as TInstantXMLQuery).StorageNames.Text := Context.TablePaths[0];
(Query as TInstantXMLQuery).ObjectClassNames.Text := ClassRef.ObjectClassName;
if ClassRef.Any then
begin
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2008-07-08 07:01:41 UTC (rev 781)
+++ trunk/Source/Core/InstantBrokers.pas 2008-08-25 13:28:15 UTC (rev 782)
@@ -26,7 +26,7 @@
* Contributor(s):
* Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Steven Mitchell,
* Joao Morais, Cesar Coll, Uberto Barbini, David Taylor, Hanedi Salas,
- * Riceball Lee, David Moorhouse
+ * Riceball Lee, David Moorhouse, Andrea Magni
*
* ***** END LICENSE BLOCK ***** *)
@@ -778,60 +778,126 @@
property Query: TInstantQuery read GetQuery;
end;
- TInstantRelationalTranslator = class(TInstantQueryTranslator)
+ // Holds all information pertaining to a class used in a command. A command
+ // may use several classes (because of subqueries), and a relational translator
+ // has a tree of class context objects.
+ TInstantTranslationContext = class
private
+ FChildContexts: TObjectList;
+ FClassRef: TInstantIQLClassRef;
FCriteriaList: TStringList;
+ FDelimiters: string;
+ FObjectClassName: string;
+ FObjectClassMetadata: TInstantClassMetadata;
+ FQuote: Char;
+ FSpecifier: TInstantIQLSpecifier;
+ FStatement: TInstantIQLObject;
FTablePathList: TStringList;
+ FParentContext: TInstantTranslationContext;
+
procedure AddJoin(const FromPath, FromField, ToPath, ToField: string);
- function ConcatPath(const APathText, AttribName: string): string;
- procedure DestroyCriteriaList;
- procedure DestroyTablePathList;
- function ExtractTarget(const PathStr: string): string;
- function RootAttribToFieldName(const AttribName: string): string;
function GetClassTablePath: string;
+ function GetChildContext(const AIndex: Integer): TInstantTranslationContext;
+ function GetChildContextCount: Integer;
function GetCriteriaCount: Integer;
function GetCriteriaList: TStringList;
function GetCriterias(Index: Integer): string;
function GetObjectClassMetadata: TInstantClassMetadata;
- function GetQuery: TInstantCustomRelationalQuery;
+ function GetTableAlias: string;
+ function GetTableName: string;
function GetTablePathAliases(Index: Integer): string;
function GetTablePathCount: Integer;
function GetTablePathList: TStringList;
function GetTablePaths(Index: Integer): string;
function PathToTablePath(const PathText: string): string;
function PathToTarget(const PathText: string;
- out TablePath, FieldName: string): TInstantAttributeMetadata;
+ out TablePath, FieldName: string; const AClassMetadata: TInstantClassMetadata = nil): TInstantAttributeMetadata;
+ procedure SetClassRef(const Value: TInstantIQLClassRef);
+ procedure SetObjectClassName(const Value: string);
+ procedure SetSpecifier(const Value: TInstantIQLSpecifier);
+ function TablePathToAlias(const TablePath: string): string;
+ function GetChildContextIndex: Integer;
+ function GetChildContextLevel: Integer;
+ protected
+ function AddCriteria(const Criteria: string): Integer;
+ function AddTablePath(const TablePath: string): Integer;
+ procedure CollectPaths(AObject: TInstantIQLObject; APathList: TList);
+ function IndexOfCriteria(const Criteria: string): Integer;
+ function IndexOfTablePath(const TablePath: string): Integer;
+ procedure Initialize;
+ procedure MakeJoins(Path: TInstantIQLPath);
+ procedure MakeTablePaths(Path: TInstantIQLPath);
+ function QuoteString(const Str: string): string;
+
+ property CriteriaList: TStringList read GetCriteriaList;
+ property TablePathList: TStringList read GetTablePathList;
+ public
+ constructor Create(const AStatement: TInstantIQLObject; const AQuote: Char;
+ const ADelimiters: string; const AParentContext: TInstantTranslationContext = nil);
+ destructor Destroy; override;
+
+ procedure AfterConstruction; override;
+ procedure Clear;
+ function AddChildContext(const AContext: TInstantTranslationContext): Integer;
+ function CreateChildContext(const AStatement: TInstantIQLObject): TInstantTranslationContext;
+ function FindAttributeMetadata(const PathText: string): TInstantAttributeMetadata;
+ function GetTablePathAlias(const ATablePath: string): string;
+ function GetSubqueryContext(const ASubQuery: TInstantIQLSubquery): TInstantTranslationContext;
+ function HasParentContext: Boolean;
+ function IndexOfChildContext(const AChildContext: TInstantTranslationContext): Integer;
function Qualify(const TablePath, FieldName: string): string;
function QualifyPath(const PathText: string): string;
+ function WriteCriterias(Writer: TInstantIQLWriter; IncludeWhere: Boolean): Boolean;
+ procedure WriteTables(Writer: TInstantIQLWriter);
+
+ property ChildContext[const AIndex: Integer]: TInstantTranslationContext read GetChildContext;
+ property ChildContextCount: Integer read GetChildContextCount;
+ property ChildContextIndex: Integer read GetChildContextIndex;
+ property ChildContextLevel: Integer read GetChildContextLevel;
+ property ClassRef: TInstantIQLClassRef read FClassRef write SetClassRef;
+ property ClassTablePath: string read GetClassTablePath;
+ property CriteriaCount: Integer read GetCriteriaCount;
+ property Criterias[Index: Integer]: string read GetCriterias;
+ property Delimiters: string read FDelimiters;
+ property ObjectClassName: string read FObjectClassName write SetObjectClassName;
+ property ObjectClassMetadata: TInstantClassMetadata read GetObjectClassMetadata;
+ property ParentContext: TInstantTranslationContext read FParentContext;
+ property Quote: Char read FQuote;
+ property Specifier: TInstantIQLSpecifier read FSpecifier write SetSpecifier;
+ property Statement: TInstantIQLObject read FStatement;
+ property TableName: string read GetTableName;
+ property TableAlias: string read GetTableAlias;
+ property TablePathAliases[Index: Integer]: string read GetTablePathAliases;
+ property TablePathCount: Integer read GetTablePathCount;
+ property TablePaths[Index: Integer]: string read GetTablePaths;
+ end;
+
+
+ TInstantRelationalTranslator = class(TInstantQueryTranslator)
+ private
+ FContext: TInstantTranslationContext;
+ function GetQuery: TInstantCustomRelationalQuery;
function ReplaceWildcard(const Str: string): string;
- function TablePathToAlias(const TablePath: string): string;
- procedure WriteAnd(Writer: TInstantIQLWriter);
- function WriteCriterias(Writer: TInstantIQLWriter; IncludeWhere: Boolean):
- Boolean;
- procedure WriteTables(Writer: TInstantIQLWriter);
- property CriteriaList: TStringList read GetCriteriaList;
- property TablePathList: TStringList read GetTablePathList;
function GetConnector: TInstantRelationalConnector;
protected
- function AddCriteria(const Criteria: string): Integer;
- function AddTablePath(const TablePath: string): Integer;
procedure BeforeTranslate; override;
procedure Clear; override;
procedure CollectObjects(AObject: TInstantIQLObject;
- AClassType: TInstantIQLObjectClass; AList: TList);
- procedure CollectPaths(AObject: TInstantIQLObject; APathList: TList);
+ AClassType: TInstantIQLObjectClass; AList: TList;
+ const AStopClassTypes: array of TInstantIQLObjectClass);
function GetDelimiters: string; virtual;
function GetQuote: Char; virtual;
function GetWildcard: string; virtual;
function HasConnector: Boolean;
function IncludeOrderFields: Boolean; virtual;
- function IndexOfCriteria(const Criteria: string): Integer;
- function IndexOfTablePath(const TablePath: string): Integer;
function InternalGetObjectClassMetadata: TInstantClassMetadata; virtual;
- function IsRootAttribute(const AttributeName: string): Boolean;
+ function InSubquery(const AObject: TInstantIQLObject; out ASubQuery: TInstantIQLSubquery): Boolean;
+ // Returns True if the given attribute is a "root" attribute. Root
+ // attributes are Class and Id.
+ function IsRootAttribute(const AttributeName: string): Boolean; // funzione non membro
function IsPrimary(AObject: TInstantIQLObject): Boolean;
- procedure MakeJoins(Path: TInstantIQLPath);
- procedure MakeTablePaths(Path: TInstantIQLPath);
+ function TranslateObject(AObject: TInstantIQLObject;
+ Writer: TInstantIQLWriter): Boolean; override;
function TranslateClassRef(ClassRef: TInstantIQLClassRef;
Writer: TInstantIQLWriter): Boolean; virtual;
function TranslateClause(Clause: TInstantIQLClause;
@@ -840,31 +906,26 @@
Writer: TInstantIQLWriter): Boolean; virtual;
function TranslateFunction(AFunction: TInstantIQLFunction;
Writer: TInstantIQLWriter): Boolean; virtual;
+ function TranslateSubqueryFunction(ASubqueryFunction: TInstantIQLSubqueryFunction;
+ Writer: TInstantIQLWriter): Boolean; virtual;
function TranslateFunctionName(const FunctionName: string;
Writer: TInstantIQLWriter): Boolean; virtual;
+ function TranslateSubqueryFunctionName(const ASubqueryFunctionName: string;
+ Writer: TInstantIQLWriter): Boolean; virtual;
function TranslateKeyword(const Keyword: string; Writer: TInstantIQLWriter):
Boolean; override;
- function TranslateObject(AObject: TInstantIQLObject;
- Writer: TInstantIQLWriter): Boolean; override;
function TranslatePath(Path: TInstantIQLPath; Writer: TInstantIQLWriter):
Boolean; virtual;
function TranslateSpecifier(Specifier: TInstantIQLSpecifier;
Writer: TInstantIQLWriter): Boolean; virtual;
- property ClassTablePath: string read GetClassTablePath;
property Connector: TInstantRelationalConnector read GetConnector;
- property CriteriaCount: Integer read GetCriteriaCount;
- property Criterias[Index: Integer]: string read GetCriterias;
property Delimiters: string read GetDelimiters;
- property ObjectClassMetadata: TInstantClassMetadata
- read GetObjectClassMetadata;
property Quote: Char read GetQuote;
- property TablePathAliases[Index: Integer]: string read GetTablePathAliases;
- property TablePathCount: Integer read GetTablePathCount;
- property TablePaths[Index: Integer]: string read GetTablePaths;
property Wildcard: string read GetWildcard;
public
+ property Context: TInstantTranslationContext read FContext;
destructor Destroy; override;
- function QuoteString(const Str: string): string;
+ function QuoteString(const Str: string): string; // funzione non membro
property Query: TInstantCustomRelationalQuery read GetQuery;
end;
@@ -967,9 +1028,18 @@
default True;
end;
+ function ConcatPath(const APathText, AttribName: string): string;
+ function ExtractTarget(const PathStr: string): string;
+ function RootAttribToFieldName(const AttribName: string): string;
+ function IsRootAttribute(const AttributeName: string): Boolean;
+ procedure CollectObjects(
+ AObject: TInstantIQLObject; AClassType: TInstantIQLObjectClass; AList: TList;
+ const AStopClassTypes: array of TInstantIQLObjectClass);
+ procedure WriteAnd(Writer: TInstantIQLWriter);
+
var
InstantLogProc: procedure (const AString: string) of object;
-
+
implementation
uses
@@ -1033,6 +1103,71 @@
end;
end;
+
+function ConcatPath(const APathText, AttribName: string): string;
+begin
+ Result := Format('%s%s%s', [APathText, InstantDot, AttribName]);
+end;
+
+function ExtractTarget(const PathStr: string): string;
+var
+ I: Integer;
+begin
+ I := InstantRightPos(InstantDot, PathStr);
+ Result := Copy(PathStr, I + 1, Length(PathStr) - I)
+end;
+
+function RootAttribToFieldName(const AttribName: string): string;
+begin
+ if SameText(AttribName, InstantClassFieldName) then
+ Result := InstantClassFieldName
+ else if SameText(AttribName, InstantIdFieldName) then
+ Result := InstantIdFieldName;
+end;
+
+function IsRootAttribute(const AttributeName: string): Boolean;
+begin
+ Result := SameText(AttributeName, InstantClassFieldName) or
+ SameText(AttributeName, InstantIdFieldName);
+end;
+
+procedure CollectObjects(
+ AObject: TInstantIQLObject; AClassType: TInstantIQLObjectClass; AList: TList;
+ const AStopClassTypes: array of TInstantIQLObjectClass);
+var
+ I: Integer;
+ LObject: TInstantIQLObject;
+
+ function IsStopClassType(const AClassType: TClass): Boolean;
+ var
+ LClassTypeIndex: Integer;
+ begin
+ Result := True;
+ for LClassTypeIndex := Low(AStopClassTypes) to High(AStopClassTypes) do
+ if AClassType = AStopClassTypes[LClassTypeIndex] then
+ Exit;
+ Result := False;
+ end;
+
+begin
+ if not (Assigned(AObject) and Assigned(AList)) then
+ Exit;
+ for I := 0 to Pred(AObject.ObjectCount) do
+ begin
+ LObject := AObject[I];
+ if IsStopClassType(LObject.ClassType) then
+ Continue;
+ if LObject is AClassType then
+ AList.Add(LObject);
+ CollectObjects(LObject, AClassType, AList, AStopClassTypes)
+ end;
+end;
+
+procedure WriteAnd(Writer: TInstantIQLWriter);
+begin
+ Writer.WriteString(' AND ');
+end;
+
{ TInstantCustomRelationalBroker }
constructor TInstantCustomRelationalBroker.Create(AConnector: TInstantConnector);
@@ -1295,7 +1430,7 @@
CachedStatement: TInstantStatement;
begin
{$IFDEF IO_STATEMENT_LOGGING}
- InstantLogStatement('Before: ', AStatement, AParams);
+ InstantLogStatement(InstantLogStatementBefore, AStatement, AParams);
{$ENDIF}
Result := nil;
if FStatementCacheCapacity <> 0 then
@@ -4925,164 +5060,59 @@
destructor TInstantRelationalTranslator.Destroy;
begin
- DestroyTablePathList;
- DestroyCriteriaList;
+ FreeAndNil(FContext);
inherited;
end;
{ TInstantRelationalTranslator }
-function TInstantRelationalTranslator.AddCriteria(
- const Criteria: string): Integer;
-begin
- if IndexOfCriteria(Criteria) = -1 then
- Result := CriteriaList.Add(Criteria)
- else
- Result := -1;
-end;
-
-procedure TInstantRelationalTranslator.AddJoin(const FromPath, FromField,
- ToPath, ToField: string);
-begin
- AddCriteria(Format('%s = %s', [Qualify(FromPath, FromField),
- Qualify(ToPath, ToField)]));
-end;
-
-function TInstantRelationalTranslator.AddTablePath(
- const TablePath: string): Integer;
-begin
- if IndexOfTablePath(TablePath) = -1 then
- Result := TablePathList.Add(TablePath)
- else
- Result := -1;
-end;
-
procedure TInstantRelationalTranslator.BeforeTranslate;
-
- procedure InitClassTablePath(List: TList);
-
- function FindAttributePath: TInstantIQLPath;
- var
- I: Integer;
- begin
- for I := 0 to Pred(List.Count) do
- begin
- Result := List[I];
- if not IsRootAttribute(Result.Text) then
- Exit;
- end;
- Result := nil;
- end;
-
- var
- TablePath: string;
- Path: TInstantIQLPath;
- begin
- if Command.ClassRef.Any then
- TablePath := ObjectClassMetadata.TableName
- else begin
- Path := FindAttributePath;
- if Assigned(Path) then
- TablePath := PathToTablePath(Path.Attributes[0])
- else
- TablePath := ObjectClassMetadata.TableName;
- end;
- AddTablePath(TablePath);
- end;
-
- procedure InitCommandCriterias;
- begin
- if not Command.ClassRef.Any then
- AddCriteria(Format('%s = %s',
- [Qualify(ClassTablePath, InstantClassFieldName),
- QuoteString(Command.ClassRef.ObjectClassName)]));
- if Command.Specifier.IsPath then
- AddCriteria(Format('%s <> %s%s',
- [QualifyPath(ConcatPath(Command.Specifier.Text, InstantIdFieldName)),
- Quote, Quote]));
- end;
-
-var
- I: Integer;
- PathList: TList;
begin
if not Assigned(Command.ClassRef) then
Exit;
- PathList := TList.Create;
- try
- CollectPaths(Command, PathList);
- InitClassTablePath(PathList);
- for I := 0 to Pred(PathList.Count) do
- begin
- MakeTablePaths(PathList[I]);
- MakeJoins(PathList[I]);
- end;
- InitCommandCriterias;
- finally
- PathList.Free;
- end;
+
+ FContext := TInstantTranslationContext.Create(Command, Quote, Delimiters);
end;
procedure TInstantRelationalTranslator.Clear;
begin
inherited;
- DestroyTablePathList;
- DestroyCriteriaList;
+ if Assigned(Context) then
+ Context.Clear;
end;
procedure TInstantRelationalTranslator.CollectObjects(
- AObject: TInstantIQLObject; AClassType: TInstantIQLObjectClass; AList: TList);
+ AObject: TInstantIQLObject; AClassType: TInstantIQLObjectClass; AList: TList;
+ const AStopClassTypes: array of TInstantIQLObjectClass);
var
I: Integer;
- Obj: TInstantIQLObject;
+ LObject: TInstantIQLObject;
+
+ function IsStopClassType(const AClassType: TClass): Boolean;
+ var
+ LClassTypeIndex: Integer;
+ begin
+ Result := True;
+ for LClassTypeIndex := Low(AStopClassTypes) to High(AStopClassTypes) do
+ if AClassType = AStopClassTypes[LClassTypeIndex] then
+ Exit;
+ Result := False;
+ end;
+
begin
if not (Assigned(AObject) and Assigned(AList)) then
Exit;
for I := 0 to Pred(AObject.ObjectCount) do
begin
- Obj := AObject[I];
- if Obj is AClassType then
- AList.Add(Obj);
- CollectObjects(Obj, AClassType, AList)
+ LObject := AObject[I];
+ if IsStopClassType(LObject.ClassType) then
+ Continue;
+ if LObject is AClassType then
+ AList.Add(LObject);
+ CollectObjects(LObject, AClassType, AList, AStopClassTypes)
end;
end;
-procedure TInstantRelationalTranslator.CollectPaths(
- AObject: TInstantIQLObject; APathList: TList);
-begin
- CollectObjects(AObject, TInstantIQLPath, APathList);
-end;
-
-function TInstantRelationalTranslator.ConcatPath(const APathText,
- AttribName: string): string;
-begin
- Result := Format('%s%s%s', [APathText, InstantDot, AttribName]);
-end;
-
-procedure TInstantRelationalTranslator.DestroyCriteriaList;
-begin
- FreeAndNil(FCriteriaList);
-end;
-
-procedure TInstantRelationalTranslator.DestroyTablePathList;
-begin
- FreeAndNil(FTablePathList)
-end;
-
-function TInstantRelationalTranslator.ExtractTarget(
- const PathStr: string): string;
-var
- I: Integer;
-begin
- I := InstantRightPos(InstantDot, PathStr);
- Result := Copy(PathStr, I + 1, Length(PathStr) - I)
-end;
-
-function TInstantRelationalTranslator.GetClassTablePath: string;
-begin
- Result := TablePaths[0];
-end;
-
function TInstantRelationalTranslator.GetConnector: TInstantRelationalConnector;
begin
if HasConnector then
@@ -5091,23 +5121,6 @@
Result := nil;
end;
-function TInstantRelationalTranslator.GetCriteriaCount: Integer;
-begin
- Result := CriteriaList.Count;
-end;
-
-function TInstantRelationalTranslator.GetCriteriaList: TStringList;
-begin
- if not Assigned(FCriteriaList) then
- FCriteriaList := TStringList.Create;
- Result := FCriteriaList;
-end;
-
-function TInstantRelationalTranslator.GetCriterias(Index: Integer): string;
-begin
- Result := CriteriaList.Strings[Index];
-end;
-
function TInstantRelationalTranslator.GetDelimiters: string;
begin
if HasConnector then
@@ -5116,14 +5129,6 @@
Result := '';
end;
-function TInstantRelationalTranslator.GetObjectClassMetadata: TInstantClassMetadata;
-begin
- Result := InternalGetObjectClassMetadata;
- if not Assigned(Result) then
- raise EInstantError.CreateFmt(SUnassignedClassMetadata,
- [Command.ObjectClassName]);
-end;
-
function TInstantRelationalTranslator.GetQuery: TInstantCustomRelationalQuery;
begin
Result := inherited Query as TInstantCustomRelationalQuery;
@@ -5137,33 +5142,6 @@
Result := '"';
end;
-function TInstantRelationalTranslator.GetTablePathAliases(
- Index: Integer): string;
-begin
- if Index < TablePathList.Count then
- Result := Format('t%d', [Succ(Index)])
- else
- Result := '';
-end;
-
-function TInstantRelationalTranslator.GetTablePathCount: Integer;
-begin
- Result := TablePathList.Count;
-end;
-
-function TInstantRelationalTranslator.GetTablePathList: TStringList;
-begin
- if not Assigned(FTablePathList) then
- FTablePathList := TStringList.Create;
- Result := FTablePathList;
-end;
-
-function TInstantRelationalTranslator.GetTablePaths(
- Index: Integer): string;
-begin
- Result := TablePathList[Index];
-end;
-
function TInstantRelationalTranslator.GetWildcard: string;
begin
if HasConnector then
@@ -5182,16 +5160,19 @@
Result := False;
end;
-function TInstantRelationalTranslator.IndexOfCriteria(
- const Criteria: string): Integer;
+function TInstantRelationalTranslator.InSubquery(
+ const AObject: TInstantIQLObject;
+ out ASubQuery: TInstantIQLSubquery): Boolean;
begin
- Result := CriteriaList.IndexOf(Criteria);
-end;
+ if AObject is TInstantIQLSubquery then begin
+ Result := True;
+ ASubQuery := TInstantIQLSubquery(AObject);
+ end
+ else
+ Result := False;
-function TInstantRelationalTranslator.IndexOfTablePath(
- const TablePath: string): Integer;
-begin
- Result := TablePathList.IndexOf(TablePath);
+ if not Result and Assigned(AObject.Owner) then
+ Result := InSubquery(AObject.Owner, ASubQuery);
end;
function TInstantRelationalTranslator.InternalGetObjectClassMetadata: TInstantClassMetadata;
@@ -5216,160 +5197,6 @@
SameText(AttributeName, InstantIdFieldName);
end;
-procedure TInstantRelationalTranslator.MakeJoins(Path: TInstantIQLPath);
-
- procedure MakePathJoins(Path: TInstantIQLPath);
- var
- I: Integer;
- PathText, FromPath, ToPath, FromField, ToField: string;
- begin
- if Path.AttributeCount > 1 then
- begin
- PathToTarget(Path.SubPath[0], FromPath, FromField);
- for I := 1 to Pred(Path.AttributeCount) do
- begin
- PathText := Path.SubPath[I];
- if not IsRootAttribute(ExtractTarget(PathText)) then
- begin
- PathToTarget(PathText, ToPath, ToField);
- AddJoin(FromPath, FromField + InstantClassFieldName, ToPath,
- InstantClassFieldName);
- AddJoin(FromPath, FromField + InstantIdFieldName, ToPath,
- InstantIdFieldName);
- FromPath := ToPath;
- FromField := ToField;
- end;
- end;
- end;
- end;
-
- procedure MakeClassJoin(Path: TInstantIQLPath);
- var
- TablePath: string;
- begin
- if Path.HasAttributes then
- begin
- TablePath := PathToTablePath(Path.SubPath[0]);
- if TablePath <> ClassTablePath then
- begin
- AddJoin(ClassTablePath, InstantClassFieldName,
- TablePath, InstantClassFieldName);
- AddJoin(ClassTablePath, InstantIdFieldName,
- TablePath, InstantIdFieldName);
- end;
- end;
- end;
-
-begin
- if not Assigned(Path) then
- Exit;
- MakeClassJoin(Path);
- MakePathJoins(Path);
-end;
-
-procedure TInstantRelationalTranslator.MakeTablePaths(Path: TInstantIQLPath);
-var
- I: Integer;
- TablePath: string;
-begin
- if not Assigned(Path) or IsRootAttribute(Path.Text) then
- Exit;
- for I := 0 to Pred(Path.AttributeCount) do
- begin
- TablePath := PathToTablePath(Path.SubPath[I]);
- if IndexOfTablePath(TablePath) = -1 then
- AddTablePath(TablePath);
- end;
-end;
-
-function TInstantRelationalTranslator.PathToTablePath(
- const PathText: string): string;
-var
- FieldName: string;
-begin
- PathToTarget(Pathtext, Result, FieldName);
-end;
-
-function TInstantRelationalTranslator.PathToTarget(const PathText: string;
- out TablePath, FieldName: string): TInstantAttributeMetadata;
-var
- I: Integer;
- AttribList: TStringList;
- ClassMeta: TInstantClassMetadata;
- AttribName: string;
- Map: TInstantAttributeMap;
-begin
- Result := nil;
- if IsRootAttribute(PathText) then
- begin
- TablePath := ClassTablePath;
- FieldName := RootAttribToFieldName(PathText);
- end else
- begin
- ClassMeta := ObjectClassMetadata;
- AttribList := TStringList.Create;
- try
- InstantStrToList(PathText, AttribList, [InstantDot]);
- for I := 0 to Pred(AttribList.Count) do
- begin
- AttribName := AttribList[I];
- if IsRootAttribute(AttribName) then
- begin
- if Assigned(Result) and
- not Result.IsAttributeClass(TInstantReference) then
- raise EInstantError.CreateFmt(SUnableToQueryAttribute,
- [Result.ClassMetadataName, Result.Name]);
- FieldName := FieldName + RootAttribToFieldName(AttribName);
- end else
- begin
- Result := ClassMeta.MemberMap.Find(AttribName);
- if Assigned(Result) then
- begin
- while Assigned(ClassMeta) and not ClassMeta.IsStored do
- ClassMeta := ClassMeta.Parent;
- if Assigned(ClassMeta) then
- begin
- Map := ClassMeta.StorageMaps.FindMap(AttribName);
- if Assigned(Map) then
- begin
- if I > 0 then
- TablePath := TablePath + InstantDot;
- TablePath := TablePath + Map.Name;
- FieldName := Result.FieldName;
- ClassMeta := Result.ObjectClassMetadata;
- end else
- raise EInstantError.CreateFmt(SAttributeNotQueryable,
- [Result.ClassName, Result.Name, Result.ClassMetadataName]);
- end else
- raise EInstantError.CreateFmt(SClassNotQueryable,
- [Result.ClassMetadataName]);
- end else
- raise EInstantError.CreateFmt(SAttributeNotFound,
- [AttribName, ClassMeta.Name]);
- end;
- end;
- finally
- AttribList.Free;
- end;
- end;
-end;
-
-function TInstantRelationalTranslator.Qualify(const TablePath,
- FieldName: string): string;
-begin
- Result := Format('%s.%s', [TablePathToAlias(TablePath),
- InstantEmbrace(FieldName, Delimiters)]);
-end;
-
-function TInstantRelationalTranslator.QualifyPath(const
- PathText: string): string;
-var
- TablePath, FieldName: string;
-begin
- PathToTarget(PathText, TablePath, FieldName);
- Result := Qualify(TablePath, FieldName);
-end;
-
function TInstantRelationalTranslator.QuoteString(const Str: string): string;
begin
Result := InstantQuote(Str, Quote);
@@ -5389,51 +5216,70 @@
Result := Str;
end;
-function TInstantRelationalTranslator.RootAttribToFieldName(
- const AttribName: string): string;
-begin
- if SameText(AttribName, InstantClassFieldName) then
- Result := InstantClassFieldName
- else if SameText(AttribName, InstantIdFieldName) then
- Result := InstantIdFieldName;
-end;
-
-function TInstantRelationalTranslator.TablePathToAlias(
- const TablePath: string): string;
-begin
- Result := TablePathAliases[IndexOfTablePath(TablePath)];
-end;
-
function TInstantRelationalTranslator.TranslateClassRef(
ClassRef: TInstantIQLClassRef; Writer: TInstantIQLWriter): Boolean;
+var
+ LSubContext: TInstantTranslationContext;
+ LSubQuery: TInstantIQLSubquery;
begin
- Result := Assigned(ClassRef) and IsPrimary(ClassRef) and Assigned(Writer);
+ Result := Assigned(ClassRef) and Assigned(Writer);
if Result then
- begin
- WriteTables(Writer);
- if not Assigned(Command.Clause) then
- WriteCriterias(Writer, True);
- end;
+ if IsPrimary(ClassRef) then
+ begin
+ Context.WriteTables(Writer);
+ if not Assigned(Command.Clause) then
+ Context.WriteCriterias(Writer, True);
+ end
+ else if Assigned(ClassRef.Owner) and (ClassRef.Owner is TInstantIQLSubquery) then
+ begin
+ LSubQuery := TInstantIQLSubQuery(ClassRef.Owner);
+ LSubContext := Context.GetSubqueryContext(LSubQuery);
+
+ LSubContext.WriteTables(Writer);
+ if not Assigned(LSubQuery.Clause) then
+ LSubContext.WriteCriterias(Writer, True);
+ end
+ else
+ Result := False;
end;
function TInstantRelationalTranslator.TranslateClause(
Clause: TInstantIQLClause; Writer: TInstantIQLWriter): Boolean;
+var
+ LSubQuery: TInstantIQLSubquery;
+ LSubContext: TInstantTranslationContext;
begin
- Result := Assigned(Clause) and IsPrimary(Clause) and Assigned(Writer);
+ Result := Assigned(Clause) and Assigned(Writer);
if Result then
begin
- if WriteCriterias(Writer, False) then
- WriteAnd(Writer);
- Writer.WriteString('(');
- WriteObject(Clause, Writer);
- Writer.WriteString(')');
- end
+ if IsPrimary(Clause) then begin
+ if Context.WriteCriterias(Writer, False) then
+ WriteAnd(Writer);
+ Writer.WriteString('(');
+ WriteObject(Clause, Writer);
+ Writer.WriteString(')');
+ end
+ else if Assigned(Clause.Owner) and (Clause.Owner is TInstantIQLSubquery) then begin
+ LSubQuery := TInstantIQLSubQuery(Clause.Owner);
+ LSubContext := Context.GetSubqueryContext(LSubQuery);
+
+ if LSubContext.WriteCriterias(Writer, False) then
+ WriteAnd(Writer);
+ Writer.WriteString('(');
+ WriteObject(Clause, Writer);
+ Writer.WriteString(')');
+ end
+ else
+ Result := False;
+ end;
end;
function TInstantRelationalTranslator.TranslateConstant(
Constant: TInstantIQLConstant; Writer: TInstantIQLWriter): Boolean;
var
S: string;
+ LSubContext: TInstantTranslationContext;
+ LSubQuery: TInstantIQLSubquery;
begin
if Assigned(Constant) and Assigned(Writer) then
begin
@@ -5444,8 +5290,18 @@
Result := True;
end else if SameText(S, 'SELF') then
begin
- Writer.WriteString(Qualify(ClassTablePath, InstantIdFieldName));
- Result := True;
+ if InSubquery(Constant, LSubQuery) then
+ begin
+ LSubContext := Context.GetSubqueryContext(LSubQuery);
+ Writer.WriteString(LSubContext.Qualify(LSubContext.ClassTablePath, InstantIdFieldName));
+ Result := True;
+ end
+ else
+ begin
+ Writer.WriteString(Context.Qualify(Context.ClassTablePath, InstantIdFieldName));
+ Result := True;
+ end
+
end else if (Length(S) > 0) and (S[1] = '"') then
begin
S := InstantUnquote(S, S[1]);
@@ -5498,6 +5354,10 @@
Result := TranslatePath(TInstantIQLPath(AObject), Writer)
else if AObject is TInstantIQLConstant then
Result := TranslateConstant(TInstantIQLConstant(AObject), Writer)
+{ else if AObject is TInstantIQLSubquery then
+ Result := TranslateSubquery(TInstantIQLSubquery(AObject), Writer)}
+ else if AObject is TInstantIQLSubqueryFunction then
+ Result := TranslateSubqueryFunction(TInstantIQLSubqueryFunction(AObject), Writer)
else if AObject is TInstantIQLFunction then
Result := TranslateFunction(TInstantIQLFunction(AObject), Writer)
else
@@ -5509,16 +5369,24 @@
var
PathText, TablePath, FieldName: string;
AttribMeta: TInstantAttributeMetadata;
+ LSubQuery: TInstantIQLSubquery;
+ LContext: TInstantTranslationContext;
begin
Result := Assigned(Path) and Assigned(Writer);
if Result then
begin
PathText := Path.Text;
- AttribMeta := PathToTarget(PathText, TablePath, FieldName);
+ if InSubquery(Path, LSubQuery) then
+ LContext := Context.GetSubqueryContext(LSubQuery)
+ else
+ LContext := Context;
+
+ AttribMeta := LContext.PathToTarget(PathText, TablePath, FieldName);
+
if Assigned(AttribMeta) and (AttribMeta.Category = acElement) and
not IsRootAttribute(ExtractTarget(PathText)) then
FieldName := FieldName + InstantIdFieldName;
- Writer.WriteString(Qualify(TablePath, FieldName));
+ Writer.WriteString(LContext.Qualify(TablePath, FieldName));
end;
end;
@@ -5547,7 +5415,7 @@
begin
PathList := TList.Create;
try
- CollectObjects(Command.Order, TInstantIQLOperand, PathList);
+ CollectObjects(Command.Order, TInstantIQLOperand, PathList, [TInstantIQLSubquery]);
for I := 0 to Pred(PathList.Count) do
begin
Operand := PathList[I];
@@ -5567,19 +5435,28 @@
var
ClassQual, IdQual, PathText: string;
+ LContext: TInstantTranslationContext;
+ LSubQuery: TInstantIQLSubquery;
begin
- Result := Assigned(Specifier) and IsPrimary(Specifier) and Assigned(Writer);
+ Result := Assigned(Specifier) and Assigned(Writer);
if Result then
begin
+ LContext := Context;
+ if (not IsPrimary(Specifier)) and Assigned(Specifier.Owner) and (Specifier.Owner is TInstantIQLSubquery) then
+ begin
+ LSubQuery := TInstantIQLSubQuery(Specifier.Owner);
+ LContext := Context.GetSubqueryContext(LSubQuery);
+ end;
+
if Specifier.Operand is TInstantIQLPath then
begin
PathText := TInstantIQLPath(Specifier.Operand).Text;
- ClassQual := QualifyPath(ConcatPath(PathText, InstantClassFieldName));
- IdQual := QualifyPath(ConcatPath(PathText, InstantIdFieldName));
+ ClassQual := LContext.QualifyPath(ConcatPath(PathText, InstantClassFieldName));
+ IdQual := LContext.QualifyPath(ConcatPath(PathText, InstantIdFieldName));
end else
begin
- ClassQual := QualifyPath(InstantClassFieldName);
- IdQual := QualifyPath(InstantIdFieldName);
+ ClassQual := LContext.Qual...
[truncated message content] |
|
From: <and...@us...> - 2008-07-08 07:54:11
|
Revision: 781
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=781&view=rev
Author: andreavaccari
Date: 2008-07-08 00:01:41 -0700 (Tue, 08 Jul 2008)
Log Message:
-----------
Modified the TInstantDBXOracleBroker.AssignParam method
Modified Paths:
--------------
trunk/Source/Brokers/DBX/InstantDBX.pas
Modified: trunk/Source/Brokers/DBX/InstantDBX.pas
===================================================================
--- trunk/Source/Brokers/DBX/InstantDBX.pas 2008-07-07 22:04:57 UTC (rev 780)
+++ trunk/Source/Brokers/DBX/InstantDBX.pas 2008-07-08 07:01:41 UTC (rev 781)
@@ -669,6 +669,10 @@
TargetParam.AsString := IntToStr(Integer(SourceParam.AsBoolean));
ftInteger:
TargetParam.AsString := IntToStr(SourceParam.AsInteger);
+ ftCurrency:
+ TargetParam.AsString := CurrToStr(SourceParam.AsCurrency);
+ ftFloat:
+ TargetParam.AsString := CurrToStr(SourceParam.AsFloat);
else
inherited;
end;
|
|
From: <jcm...@us...> - 2008-07-07 22:04:50
|
Revision: 780
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=780&view=rev
Author: jcmoraisjr
Date: 2008-07-07 15:04:57 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
Fixed Connector.GenerateId call.
Modified Paths:
--------------
trunk/Source/Core/InstantPersistence.pas
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2008-07-01 12:34:20 UTC (rev 779)
+++ trunk/Source/Core/InstantPersistence.pas 2008-07-07 22:04:57 UTC (rev 780)
@@ -6194,7 +6194,7 @@
if IsAbandoned then
Result := InstantGenerateId
else
- Result := Connector.GenerateId;
+ Result := Connector.GenerateId(Self);
end;
function TInstantObject.GetCaption: string;
|
|
From: <jcm...@us...> - 2008-07-01 12:34:11
|
Revision: 779
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=779&view=rev
Author: jcmoraisjr
Date: 2008-07-01 05:34:20 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Fixed storage of container attributes.
Modified Paths:
--------------
trunk/Source/Core/InstantBrokers.pas
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2008-02-27 09:03:37 UTC (rev 778)
+++ trunk/Source/Core/InstantBrokers.pas 2008-07-01 12:34:20 UTC (rev 779)
@@ -3308,7 +3308,11 @@
begin
Attribute := TInstantContainer(AObject.AttributeByName(
AttributeMetadata.Name));
- if Attribute.IsChanged and
+
+ { TODO : Attribute.Owner.IsPersistent is used (below) because Dispose
+ doesn't change the state of changed attributes to IsChanged.
+ Perhaps ObjStore.DisposeObject is the right place to fix (JM) }
+ if (Attribute.IsChanged or not Attribute.Owner.IsPersistent) and
(AttributeMetadata.StorageKind = skExternal) then
begin
LinkResolver := TInstantSQLLinkResolver.Create(Self,
|
|
From: <na...@us...> - 2008-02-27 09:03:34
|
Revision: 778
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=778&view=rev
Author: nandod
Date: 2008-02-27 01:03:37 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
+ New "usenull" attribute parameter to have a zero value stored as null in DBs that support it (especially useful for dates) (WIP - design time support still not finished).
Modified Paths:
--------------
trunk/Source/Core/InstantBrokers.pas
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantMetadata.pas
trunk/Source/Core/InstantPersistence.pas
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2008-02-25 17:55:07 UTC (rev 777)
+++ trunk/Source/Core/InstantBrokers.pas 2008-02-27 09:03:37 UTC (rev 778)
@@ -417,9 +417,9 @@
FSelectExternalPartSQL: string;
FDeleteExternalSQL: string;
FInsertExternalSQL: string;
- procedure AddIntegerParam(Params: TParams; const ParamName: string;
- Value: Integer);
- procedure AddStringParam(Params: TParams; const ParamName, Value: string);
+ function AddIntegerParam(Params: TParams; const ParamName: string;
+ Value: Integer): TParam;
+ function AddStringParam(Params: TParams; const ParamName, Value: string): TParam;
// Adds an "Id" param, whose data type and size depends on connector
// settings.
procedure AddIdParam(Params: TParams; const ParamName, Value: string);
@@ -2391,57 +2391,81 @@
procedure TInstantNavigationalResolver.WriteBlob(Attribute: TInstantBlob);
begin
- with Attribute do
- FieldByName(Metadata.FieldName).AsString := Value;
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
+ AsString := Attribute.Value;
end;
procedure TInstantNavigationalResolver.WriteBoolean(Attribute: TInstantBoolean);
begin
- with Attribute do
- FieldByName(Metadata.FieldName).AsBoolean := Value;
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
+ AsBoolean := Attribute.Value;
end;
procedure TInstantNavigationalResolver.WriteCurrency(Attribute: TInstantCurrency);
begin
- with Attribute do
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
{$IFDEF FPC}
- FieldByName(Metadata.FieldName).AsFloat := Value;
+ AsFloat := Value;
{$ELSE}
- FieldByName(Metadata.FieldName).AsCurrency := Value;
+ AsCurrency := Value;
{$ENDIF}
end;
procedure TInstantNavigationalResolver.WriteDateTime(
Attribute: TInstantDateTime);
begin
- with Attribute do
- FieldByName(Metadata.FieldName).AsDateTime := Value;
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
+ AsDateTime := Attribute.Value;
end;
procedure TInstantNavigationalResolver.WriteDate(
Attribute: TInstantDate);
begin
- with Attribute do
- FieldByName(Metadata.FieldName).AsDateTime := Value;
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
+ AsDateTime := Attribute.Value;
end;
procedure TInstantNavigationalResolver.WriteTime(
Attribute: TInstantTime);
begin
- with Attribute do
- FieldByName(Metadata.FieldName).AsDateTime := Value;
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
+ AsDateTime := Attribute.Value;
end;
procedure TInstantNavigationalResolver.WriteFloat(Attribute: TInstantFloat);
begin
- with Attribute do
- FieldByName(Metadata.FieldName).AsFloat := Value;
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
+ AsFloat := Attribute.Value;
end;
procedure TInstantNavigationalResolver.WriteInteger(Attribute: TInstantInteger);
begin
- with Attribute do
- FieldByName(Metadata.FieldName).AsInteger := Value;
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
+ AsInteger := Attribute.Value;
end;
procedure TInstantNavigationalResolver.WriteMemo(Attribute: TInstantMemo);
@@ -2563,8 +2587,11 @@
procedure TInstantNavigationalResolver.WriteString(Attribute: TInstantString);
begin
- with Attribute do
- FieldByName(Metadata.FieldName).AsString := Value;
+ with FieldByName(Attribute.Metadata.FieldName) do
+ if Attribute.IsNull then
+ Clear
+ else
+ AsString := Attribute.Value;
end;
constructor TInstantSQLResolver.Create(ABroker: TInstantSQLBroker;
@@ -2602,60 +2629,102 @@
end;
procedure AddBlobAttributeParam;
+ var
+ LParam: TParam;
begin
- AddBlobParam(FieldName, (Attribute as TInstantBlob).Value);
+ LParam := AddParam(Params, FieldName, ftBlob);
+ if Attribute.IsNull then
+ LParam.Clear
+ else
+ LParam.AsBlob := (Attribute as TInstantBlob).Value;
end;
procedure AddBooleanAttributeParam;
+ var
+ LParam: TParam;
begin
- AddParam(Params, FieldName, ftBoolean).AsBoolean :=
- (Attribute as TInstantBoolean).Value;
+ LParam := AddParam(Params, FieldName, ftBoolean);
+ if Attribute.IsNull then
+ LParam.Clear
+ else
+ LParam.AsBoolean := (Attribute as TInstantBoolean).Value;
end;
procedure AddDateTimeAttributeParam;
+ var
+ LParam: TParam;
begin
- AddParam(Params, FieldName, ftDateTime).AsDateTime :=
- (Attribute as TInstantDateTime).Value;
+ LParam := AddParam(Params, FieldName, ftDateTime);
+ if Attribute.IsNull then
+ LParam.Clear
+ else
+ LParam.AsDateTime := (Attribute as TInstantDateTime).Value;
end;
procedure AddDateAttributeParam;
+ var
+ LParam: TParam;
begin
- AddParam(Params, FieldName, ftDate).AsDateTime :=
- (Attribute as TInstantDate).Value;
+ LParam := AddParam(Params, FieldName, ftDate);
+ if Attribute.IsNull then
+ LParam.Clear
+ else
+ LParam.AsDateTime := (Attribute as TInstantDate).Value;
end;
procedure AddTimeAttributeParam;
+ var
+ LParam: TParam;
begin
- AddParam(Params, FieldName, ftTime).AsDateTime :=
- (Attribute as TInstantTime).Value;
+ LParam := AddParam(Params, FieldName, ftTime);
+ if Attribute.IsNull then
+ LParam.Clear
+ else
+ LParam.AsDateTime := (Attribute as TInstantTime).Value;
end;
procedure AddFloatAttributeParam;
+ var
+ LParam: TParam;
begin
- AddParam(Params, FieldName, ftFloat).AsFloat :=
- (Attribute as TInstantFloat).Value;
+ LParam := AddParam(Params, FieldName, ftFloat);
+ if Attribute.IsNull then
+ LParam.Clear
+ else
+ LParam.AsFloat := (Attribute as TInstantFloat).Value;
end;
procedure AddCurrencyAttributeParam;
+ var
+ LParam: TParam;
begin
- AddParam(Params, FieldName, ftBCD).AsCurrency :=
- (Attribute as TInstantCurrency).Value;
+ LParam := AddParam(Params, FieldName, ftBCD);
+ if Attribute.IsNull then
+ LParam.Clear
+ else
+ LParam.AsCurrency := (Attribute as TInstantCurrency).Value;
end;
procedure AddIntegerAttributeParam;
+ var
+ LParam: TParam;
begin
- AddIntegerParam(Params, FieldName, (Attribute as TInstantInteger).Value);
+ LParam := AddIntegerParam(Params, FieldName, (Attribute as TInstantInteger).Value);
+ if Attribute.IsNull then
+ LParam.Clear;
end;
procedure AddMemoAttributeParam;
var
- Param: TParam;
+ LParam: TParam;
MemoAttrib: TInstantMemo;
begin
- Param := AddParam(Params, FieldName, ftMemo);
+ LParam := AddParam(Params, FieldName, ftMemo);
MemoAttrib := (Attribute as TInstantMemo);
- if MemoAttrib.Size <> 0 then
- Param.AsMemo := MemoAttrib.Value;
+ if (MemoAttrib.Size = 0) or Attribute.IsNull then
+ LParam.Clear
+ else
+ LParam.AsMemo := MemoAttrib.Value;
end;
procedure AddPartAttributeParam;
@@ -2728,8 +2797,12 @@
end;
procedure AddStringAttributeParam;
+ var
+ LParam: TParam;
begin
- AddStringParam(Params, FieldName, (Attribute as TInstantString).Value);
+ LParam := AddStringParam(Params, FieldName, (Attribute as TInstantString).Value);
+ if Attribute.IsNull then
+ LParam.Clear;
end;
begin
@@ -2810,10 +2883,11 @@
Param.Value := Value;
end;
-procedure TInstantSQLResolver.AddIntegerParam(Params: TParams;
- const ParamName: string; Value: Integer);
+function TInstantSQLResolver.AddIntegerParam(Params: TParams;
+ const ParamName: string; Value: Integer): TParam;
begin
- AddParam(Params, ParamName, ftInteger).AsInteger := Value;
+ Result := AddParam(Params, ParamName, ftInteger);
+ Result.AsInteger := Value;
end;
function TInstantSQLResolver.AddParam(Params: TParams;
@@ -2830,18 +2904,12 @@
AddIdParam(Params, PersistentIdParamName, APersistentId);
end;
-procedure TInstantSQLResolver.AddStringParam(Params: TParams;
- const ParamName, Value: string);
-var
- Param: TParam;
+function TInstantSQLResolver.AddStringParam(Params: TParams;
+ const ParamName, Value: string): TParam;
begin
- Param := AddParam(Params, ParamName, ftString);
+ Result := AddParam(Params, ParamName, ftString);
if Value <> '' then
- begin
- Param.AsString := Value;
- // Update the length string to avoid the MBCS Bug.
-// Param.Size := Length(Value);
- end;
+ Result.AsString := Value;
end;
procedure TInstantSQLResolver.CheckConflict(Info: PInstantOperationInfo;
Modified: trunk/Source/Core/InstantCode.pas
===================================================================
--- trunk/Source/Core/InstantCode.pas 2008-02-25 17:55:07 UTC (rev 777)
+++ trunk/Source/Core/InstantCode.pas 2008-02-27 09:03:37 UTC (rev 778)
@@ -625,6 +625,8 @@
procedure SetStorageKind(const Value: TInstantStorageKind);
function GetCanHaveStorageName: boolean;
function GetCanBeExternal: boolean;
+ function GetUseNull: Boolean;
+ procedure SetUseNull(const Value: Boolean);
protected
function GetIsDefault: Boolean; virtual;
function GetMethodName(MethodType: TInstantCodeContainerMethodType): string;
@@ -692,6 +694,7 @@
property IncludeRemoveMethod: Boolean read GetIncludeRemoveMethod
write SetIncludeRemoveMethod;
property IsDefault: Boolean read GetIsDefault write SetIsDefault;
+ property UseNull: Boolean read GetUseNull write SetUseNull;
property StorageKind: TInstantStorageKind read GetStorageKind
write SetStorageKind;
property IsIndexed: Boolean read GetIsIndexed write SetIsIndexed;
@@ -1548,6 +1551,7 @@
MetadataInfoID = 'IOMETADATA';
MetaKeyDefault = 'default';
+ MetaKeyUseNull = 'usenull';
MetaKeyExternal = 'external';
MetaKeyFormat = 'format';
MetaKeyIndex = 'index';
@@ -3949,6 +3953,11 @@
Result := FTailor;
end;
+function TInstantCodeAttribute.GetUseNull: Boolean;
+begin
+ Result := Metadata.UseNull;
+end;
+
function TInstantCodeAttribute.GetValueGetterCode: string;
begin
Result := Tailor.ValueGetterCode;
@@ -4002,6 +4011,8 @@
Metadata.StorageName := Reader.ReadStringValue
else if Token = MetaKeyDefault then
Metadata.DefaultValue := Reader.ReadStringValue
+ else if Token = MetaKeyUseNull then
+ Metadata.UseNull := True
else if Token = MetaKeyIndex then
IsIndexed := True
else if Token = MetaKeyRequired then
@@ -4055,6 +4066,8 @@
Writer.Write(' ' + MetaKeyIndex);
if IsRequired then
Writer.Write(' ' + MetaKeyRequired);
+ if Metadata.UseNull then
+ Writer.Write(' ' + MetaKeyUseNull);
if IsDefault then
Writer.Write(' ' + MetaKeyDefault);
Writer.Write(';');
@@ -4205,6 +4218,11 @@
Metadata.FieldName := Value;
end;
+procedure TInstantCodeAttribute.SetUseNull(const Value: Boolean);
+begin
+ Metadata.UseNull := Value;
+end;
+
procedure TInstantCodeAttribute.SetVisibility(
Value: TInstantCodeVisibility);
begin
Modified: trunk/Source/Core/InstantMetadata.pas
===================================================================
--- trunk/Source/Core/InstantMetadata.pas 2008-02-25 17:55:07 UTC (rev 777)
+++ trunk/Source/Core/InstantMetadata.pas 2008-02-27 09:03:37 UTC (rev 778)
@@ -434,6 +434,7 @@
private
FAttributeType: TInstantAttributeType;
FDefaultValue: string;
+ FUseNull: Boolean;
FDisplayWidth: Integer;
FEditMask: string;
FIsIndexed: Boolean;
@@ -497,6 +498,7 @@
write SetAttributeTypeName stored False;
property ClassMetadata: TInstantClassMetadata read GetClassMetadata;
property DefaultValue: string read FDefaultValue write FDefaultValue;
+ property UseNull: Boolean read FUseNull write FUseNull;
property DisplayWidth: Integer read FDisplayWidth write FDisplayWidth
default 0;
property EditMask: string read FEditMask write FEditMask;
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2008-02-25 17:55:07 UTC (rev 777)
+++ trunk/Source/Core/InstantPersistence.pas 2008-02-27 09:03:37 UTC (rev 778)
@@ -179,6 +179,7 @@
function GetDisplayText: string; virtual;
function GetIsChanged: Boolean; virtual;
function GetIsDefault: Boolean; virtual;
+ function GetIsNull: Boolean; virtual;
function GetIsMandatory: Boolean; virtual;
function GetOwner: TInstantObject; reintroduce; virtual;
procedure Initialize; override;
@@ -220,6 +221,7 @@
property IsIndexed: Boolean read GetIsIndexed;
property IsMandatory: Boolean read GetIsMandatory;
property IsRequired: Boolean read GetIsRequired;
+ property IsNull: Boolean read GetIsNull;
property Name: string read GetName;
property Metadata: TInstantAttributeMetadata read GetMetadata write SetMetadata;
property Owner: TInstantObject read GetOwner;
@@ -239,6 +241,7 @@
function GetAsDateTime: TDateTime; override;
function GetDisplayText: string; override;
function GetIsDefault: Boolean; override;
+ function GetIsNull: Boolean; override;
procedure SetAsBoolean(AValue: Boolean); override;
procedure SetAsDateTime(AValue: TDateTime); override;
end;
@@ -335,6 +338,7 @@
function GetAsString: string; override;
function GetAsVariant: Variant; override;
function GetIsDefault: Boolean; override;
+ function GetIsNull: Boolean; override;
function GetValue: Boolean; virtual;
procedure Initialize; override;
procedure ReadObject(Reader: TInstantReader); override;
@@ -393,6 +397,7 @@
function GetAsVariant: Variant; override;
function GetDisplayText: string; override;
function GetIsDefault: Boolean; override;
+ function GetIsNull: Boolean; override;
function GetValue: TDateTime; virtual;
procedure Initialize; override;
procedure ReadObject(Reader: TInstantReader); override;
@@ -507,6 +512,7 @@
function GetValue: TInstantObject; virtual; abstract;
procedure SetAsObject(AValue: TInstantObject); override;
procedure SetValue(AValue: TInstantObject); virtual;
+ function GetIsNull: Boolean; override;
public
function AttachObject(AObject: TInstantObject): Boolean; override;
function DetachObject(AObject: TInstantObject): Boolean; override;
@@ -2389,7 +2395,8 @@
//Result := CompareMem(@DefaultStr[1], @ValueStr[1], L);
Result := CompareStr(DefaultStr, ValueStr) = 0;
end;
- end else
+ end
+ else
Result := L = 0;
end;
@@ -2403,6 +2410,13 @@
Result := IsRequired or IsIndexed;
end;
+function TInstantAttribute.GetIsNull: Boolean;
+begin
+ Result := False;
+ if Assigned(Metadata) then
+ Result := Metadata.UseNull and (AsString = '');
+end;
+
function TInstantAttribute.GetIsRequired: Boolean;
begin
Result := Assigned(Metadata) and Metadata.IsRequired;
@@ -2568,12 +2582,20 @@
function TInstantNumeric.GetIsDefault: Boolean;
begin
- if Assigned(Metadata) and (Metadata.Defaultvalue <> '') then
+ if Assigned(Metadata) and (Metadata.DefaultValue <> '') then
Result := inherited GetIsDefault
else
Result := AsFloat = 0;
end;
+function TInstantNumeric.GetIsNull: Boolean;
+begin
+ if Assigned(Metadata) and (Metadata.UseNull) then
+ Result := AsFloat = 0
+ else
+ Result := inherited GetIsNull;
+end;
+
procedure TInstantNumeric.SetAsBoolean(AValue: Boolean);
begin
AsInteger := Integer(AValue);
@@ -3005,6 +3027,14 @@
Result := False;
end;
+function TInstantBoolean.GetIsNull: Boolean;
+begin
+ if Assigned(Metadata) and Metadata.UseNull then
+ Result := AsBoolean = False
+ else
+ Result := inherited GetIsNull;
+end;
+
function TInstantBoolean.GetValue: Boolean;
begin
Result := FValue;
@@ -3305,6 +3335,14 @@
Result := Value = DefaultValue;
end;
+function TInstantCustomDateTime.GetIsNull: Boolean;
+begin
+ if Assigned(Metadata) and Metadata.UseNull then
+ Result := AsDateTime = 0
+ else
+ Result := inherited GetIsNull;
+end;
+
function TInstantCustomDateTime.GetValue: TDateTime;
begin
Result := FValue;
@@ -3734,6 +3772,14 @@
Result := Value;
end;
+function TInstantElement.GetIsNull: Boolean;
+begin
+ if Assigned(Metadata) and Metadata.UseNull then
+ Result := not HasValue
+ else
+ Result := inherited GetIsNull;
+end;
+
function TInstantElement.HasValue: Boolean;
begin
Result := False;
|
|
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] |
|
From: <car...@us...> - 2007-09-18 09:14:51
|
Revision: 776
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=776&view=rev
Author: carlobar
Date: 2007-09-18 02:14:53 -0700 (Tue, 18 Sep 2007)
Log Message:
-----------
Fixed a bug into NexusDb broker to obtain correct information from ConnectionDef to connector (eg.BlobStreamFormat).
Modified Paths:
--------------
trunk/Source/Brokers/NexusDb/InstantNexusDB.pas
Modified: trunk/Source/Brokers/NexusDb/InstantNexusDB.pas
===================================================================
--- trunk/Source/Brokers/NexusDb/InstantNexusDB.pas 2007-05-13 21:20:15 UTC (rev 775)
+++ trunk/Source/Brokers/NexusDb/InstantNexusDB.pas 2007-09-18 09:14:53 UTC (rev 776)
@@ -368,6 +368,7 @@
Session: TnxSession;
Database: TnxDatabase;
begin
+ inherited;
SavedCursor := Screen.Cursor;
try
Screen.Cursor := crHourGlass;
|
|
From: <fas...@us...> - 2007-05-13 21:20:18
|
Revision: 775
http://svn.sourceforge.net/instantobjects/revision/?rev=775&view=rev
Author: fastbike2
Date: 2007-05-13 14:20:15 -0700 (Sun, 13 May 2007)
Log Message:
-----------
Added new MySQL Catalog
Added Paths:
-----------
trunk/Source/Catalogs/MySQL/
trunk/Source/Catalogs/MySQL/D2007/
trunk/Source/Catalogs/MySQL/D2007/IOMySQLCatalog.dpk
trunk/Source/Catalogs/MySQL/D7/
trunk/Source/Catalogs/MySQL/D7/IOMySQLCatalog.dpk
trunk/Source/Catalogs/MySQL/InstantMySQLCatalog.pas
Added: trunk/Source/Catalogs/MySQL/D2007/IOMySQLCatalog.dpk
===================================================================
--- trunk/Source/Catalogs/MySQL/D2007/IOMySQLCatalog.dpk (rev 0)
+++ trunk/Source/Catalogs/MySQL/D2007/IOMySQLCatalog.dpk 2007-05-13 21:20:15 UTC (rev 775)
@@ -0,0 +1,37 @@
+package IOMySQLCatalog;
+
+{$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 Catalog for MySQL (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ rtl,
+ IOCore;
+
+contains
+ InstantMySQLCatalog in '..\InstantMySQLCatalog.pas';
+
+end.
Added: trunk/Source/Catalogs/MySQL/D7/IOMySQLCatalog.dpk
===================================================================
--- trunk/Source/Catalogs/MySQL/D7/IOMySQLCatalog.dpk (rev 0)
+++ trunk/Source/Catalogs/MySQL/D7/IOMySQLCatalog.dpk 2007-05-13 21:20:15 UTC (rev 775)
@@ -0,0 +1,37 @@
+package IOMySQLCatalog;
+
+{$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 Catalog for MySQL'}
+{$LIBSUFFIX '_D7'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ rtl,
+ IOCore;
+
+contains
+ InstantMySQLCatalog in '..\InstantMySQLCatalog.pas';
+
+end.
Added: trunk/Source/Catalogs/MySQL/InstantMySQLCatalog.pas
===================================================================
--- trunk/Source/Catalogs/MySQL/InstantMySQLCatalog.pas (rev 0)
+++ trunk/Source/Catalogs/MySQL/InstantMySQLCatalog.pas 2007-05-13 21:20:15 UTC (rev 775)
@@ -0,0 +1,342 @@
+(*
+ * InstantObjects DBEvolver Support
+ * MySQL Catalog
+ *)
+
+(* ***** 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 DBEvolver Support
+ *
+ * The Initial Developer of the Original Code is: David Moorhouse
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+ // TODO: separate out the MysQL4.x and MYSQl 5.x
+ // TODO: not sure if different features need supporting for different db engine options e.g. MyISAM, InnoDB, etc
+
+unit InstantMySQLCatalog;
+
+{$IFDEF LINUX}
+{$I '../../InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\InstantDefines.inc'}
+{$ENDIF}
+
+interface
+
+uses
+ InstantPersistence, InstantBrokers, InstantMetadata, InstantTypes;
+
+type
+ // A TInstantCatalog that reads catalog information from a MySQL
+ // database. Can be used with a SQL broker that accesses MySQL databases.
+ TInstantMySQLCatalog = class(TInstantSQLBrokerCatalog)
+ private
+ procedure AddFieldMetadatas(TableMetadata: TInstantTableMetadata);
+ procedure AddIndexMetadatas(TableMetadata: TInstantTableMetadata);
+ procedure AddTableMetadatas(TableMetadatas: TInstantTableMetadatas);
+ // Returns True if the TInstantDataType value that matches the supplied
+ // ColumnType. If more than one datatypes apply, alternate data types are
+ // returned in AlternateDataTypes, otherwise AlternateDataTypes is [] on exit.
+ function ColumnTypeToDataType(const ColumnType: string; out DataType:
+ TInstantDataType; out AlternateDataTypes: TInstantDataTypes): Boolean;
+ function GetSelectFieldsSQL(const ATableName: string): string;
+ function GetSelectIndexesSQL(const ATableName: string): string;
+ function GetSelectTablesSQL: string;
+ public
+ procedure InitTableMetadatas(ATableMetadatas: TInstantTableMetadatas);
+ override;
+ end;
+
+implementation
+
+uses
+ SysUtils, Classes, DB, InstantConsts, StrUtils;
+
+{ TInstantMySQLCatalog }
+
+procedure TInstantMySQLCatalog.AddIndexMetadatas(TableMetadata: TInstantTableMetadata);
+var
+ Indexes: TDataSet;
+ IndexMetadata: TInstantIndexMetadata;
+ IndexFieldList: TStrings;
+ KeyName: string;
+begin
+ IndexFieldList := TStringList.Create;
+ Indexes := Broker.AcquireDataSet(GetSelectIndexesSQL(TableMetadata.Name));
+ try
+ Indexes.Open;
+ try
+ while not Indexes.Eof do
+ begin
+ IndexMetadata := TableMetadata.IndexMetadatas.Add;
+ IndexMetadata.Name := Trim(Indexes.FieldByName('Key_name').AsString);
+ IndexMetadata.Options := [];
+ if Pos('PRIMARY', Indexes.FieldByName('Key_name').AsString) = 1 then
+ IndexMetadata.Options := IndexMetadata.Options + [ixPrimary, ixUnique]
+ else if Indexes.FieldByName('Non_unique').AsInteger = 0 then
+ IndexMetadata.Options := IndexMetadata.Options + [ixUnique];
+ { TODO : support other Options? e.g partial indexes, descending}
+ IndexFieldList.Clear;
+ KeyName := Indexes.FieldByName('Key_name').AsString;
+ while (not Indexes.Eof) and (KeyName = Indexes.FieldByName('Key_name').AsString) do
+ begin
+ IndexFieldList.Add(Trim(Indexes.FieldByName('Column_name').AsString));
+ Indexes.Next;
+ end;
+ IndexMetadata.Fields := StringReplace(IndexFieldList.CommaText, ',', ';', [rfReplaceAll]);
+ end;
+ finally
+ Indexes.Close;
+ end;
+ finally
+ IndexFieldList.Free;
+ Broker.ReleaseDataSet(Indexes);
+ end;
+end;
+
+procedure TInstantMySQLCatalog.AddFieldMetadatas(TableMetadata: TInstantTableMetadata);
+ function GetFieldSize(AFieldType: string): Integer;
+ var
+ I, J: Integer;
+ begin
+ Result := 0;
+ I := Pos('(', AFieldType);
+ if I > 0 then begin
+ J := PosEx(',', AFieldType, I);
+ if J = 0 then
+ J := Pos(')', AFieldType);
+ Result := StrToIntDef(Copy(AFieldType, I + 1, J -I - 1), 0);
+ end;
+ end;
+
+var
+ Fields: TDataSet;
+ FieldMetadata: TInstantFieldMetadata;
+ AlternateDataTypes: TInstantDataTypes;
+ FieldMetaDataType: TInstantDataType;
+ FieldTypeName: string;
+begin
+ Fields := Broker.AcquireDataSet(GetSelectFieldsSQL(TableMetadata.Name));
+ try
+ Fields.Open;
+ try
+ while not Fields.Eof do
+ begin
+ FieldMetadata := TableMetadata.FieldMetadatas.Add;
+ FieldMetadata.Name := Trim(Fields.FieldByName('Field').AsString);
+ if ColumnTypeToDataType(
+ Fields.FieldByName('Type').AsString,
+ FieldMetaDataType, AlternateDataTypes) then
+ begin
+ FieldMetadata.DataType := FieldMetaDataType;
+ FieldMetadata.AlternateDataTypes := AlternateDataTypes;
+ FieldMetadata.Options := [];
+ if Fields.FieldByName('Null').AsString <> 'YES' then
+ FieldMetadata.Options := FieldMetadata.Options + [foRequired];
+ if TableMetadata.IndexMetadatas.IsFieldIndexed(FieldMetadata) then
+ FieldMetadata.Options := FieldMetadata.Options + [foIndexed];
+ if FieldMetadata.DataType = dtString then
+ FieldMetadata.Size := GetFieldSize(Fields.FieldByName('Type').AsString);
+ end
+ else
+ DoWarning(Format(SUnsupportedColumnSkipped, [
+ TableMetadata.Name, Fields.FieldByName('Field').AsString,
+ Fields.FieldByName('Type').AsString]));
+ Fields.Next;
+ end;
+ finally
+ Fields.Close;
+ end;
+ finally
+ Broker.ReleaseDataSet(Fields);
+ end;
+end;
+
+procedure TInstantMySQLCatalog.AddTableMetadatas(TableMetadatas: TInstantTableMetadatas);
+// NB: unresolved error
+// MySQL and dbx raise a "Commands out of sync" error when using 2 simultaneous datasets
+// store table names in stringlist to work around this
+var
+ Tables: TDataSet;
+ TableMetadata: TInstantTableMetadata;
+ TableList: TStringList;
+ i: Integer;
+begin
+ TableList := TStringList.Create;
+ Tables := Broker.AcquireDataSet(GetSelectTablesSQL());
+ try
+ Tables.Open;
+ try
+ while not Tables.Eof do
+ begin
+ TableList.Add(Trim(Tables.FieldByName('tables_in_' + Broker.Connector.DatabaseName).AsString));
+ Tables.Next;
+ end;
+ finally
+ Tables.Close;
+ end;
+ for i := 0 to TableList.Count - 1 do
+ begin
+ TableMetadata := TableMetadatas.Add;
+ TableMetadata.Name := TableList[i];
+ // Call AddIndexMetadatas first, so that AddFieldMetadatas can see what
+ // indexes are defined to correctly set the foIndexed option.
+ AddIndexMetadatas(TableMetadata);
+ AddFieldMetadatas(TableMetadata);
+ end;
+ finally
+ Broker.ReleaseDataSet(Tables);
+ TableList.Free;
+ end;
+end;
+
+function TInstantMySQLCatalog.ColumnTypeToDataType(const ColumnType: string;
+ out DataType: TInstantDataType; out AlternateDataTypes: TInstantDataTypes):
+ Boolean;
+begin
+// NB: datatypes at http://dev.mysql.com/doc/refman/4.1/en/data-types.html
+ AlternateDataTypes := [];
+ Result := True;
+
+ if Pos('bool', ColumnType) = 1 then
+ DataType := dtBoolean
+ else if Pos('tinyint', ColumnType) = 1 then begin
+ DataType := dtBoolean;
+ Include(AlternateDataTypes, dtInteger);
+ end
+ else if Pos('bigint', ColumnType) = 1 then // prevent "bigint" from matching "int" i.e Int64
+ Result := False
+ else if Pos('int', ColumnType) > 0 then // covers SMALLINT, MEDINT, INT and INTEGER
+ DataType := dtInteger
+ else if Pos('float', ColumnType) = 1 then
+ DataType := dtFloat
+ else if Pos('decimal', ColumnType) = 1 then
+ DataType := dtCurrency
+ else if Pos('char', ColumnType) = 1 then // MySQL stores varchar(3) or smaller as char
+ DataType := dtString
+ else if Pos('varchar', ColumnType) = 1 then
+ DataType := dtString
+ else if Pos('text', ColumnType) > 0 then begin // i.e. text, tinytext, mediumtext or longtext
+ DataType := dtMemo;
+ Include(AlternateDataTypes, dtString); // IO strings longer than 255 stored as MySQL TEXT
+ end
+ else if Pos('blob', ColumnType) > 0 then // blob, tinyblob, mediumblob, longblob
+ DataType := dtBlob
+ else if Pos('datetime', ColumnType) = 1 then
+ DataType := dtDateTime
+ else if Pos('date', ColumnType) = 1 then
+ DataType := dtDate
+ // need the following to prevent "timestamp" from matching with "time"
+ else if Pos('timestamp', ColumnType) = 1 then // seconds since UNIX epoch - not valid for IO
+ Result := False
+ else if Pos('time', ColumnType) = 1 then
+ DataType := dtTime
+ else
+ Result := False;
+end;
+
+function TInstantMySQLCatalog.GetSelectFieldsSQL(
+ const ATableName: string): string;
+begin
+ Result := 'DESCRIBE ' + ATableName; // synonym for MySQL "SHOW COLUMNS FROM"
+end;
+
+function TInstantMySQLCatalog.GetSelectIndexesSQL(const ATableName: string): string;
+begin
+ Result := 'SHOW INDEX FROM ' + ATableName;
+end;
+
+function TInstantMySQLCatalog.GetSelectTablesSQL: string;
+begin
+ Result := 'SHOW TABLES';
+end;
+
+procedure TInstantMySQLCatalog.InitTableMetadatas(ATableMetadatas: TInstantTableMetadatas);
+begin
+ ATableMetadatas.Clear;
+ AddTableMetadatas(ATableMetadatas);
+end;
+
+
+{ A. test table definition
+
+
+CREATE TABLE Test
+(
+ Class VARCHAR(32) NOT NULL,
+ Id VARCHAR(32) NOT NULL,
+ UpdateCount INTEGER,
+ StringAttr VARCHAR(255),
+ StringAttr2 VARCHAR(3), // MySQL stores this as CHAR(3) !!
+ StringAttr3 VARCHAR(256), // MySQL stores this as TEXT
+ BlobAttr BLOB,
+ BooleanAttr SMALLINT,
+ CurrencyAttr DECIMAL(14,4),
+ DateTimeAttr TIMESTAMP,
+ FloatAttr FLOAT,
+ GraphicAttr BLOB,
+ IntegerAttr INTEGER,
+ MemoAttr TEXT,
+ ReferenceAttributeClass VARCHAR(32),
+ ReferenceAttributeId VARCHAR(32),
+ EmbeddedPartsAtttribute BLOB,
+ EmbeddedPartAttribute BLOB,
+ ExternalPartAttributeClass VARCHAR(32),
+ ExternalPartAttributeId VARCHAR(32),
+ EmbeddedReferencesAtttribute BLOB,
+ DateAttr DATE,
+ TimeAttr TIME,
+ PRIMARY KEY (Class, Id)
+);
+
+
+B. Result of "GetSelectFieldsSQL" method - run against Win32 MySQL 4.1.14 with InnoDB engine
+
+Field Type Null Key Default Extra
+===== ==== ==== === ======= =====
+Class varchar(32) PRI
+Id varchar(32) PRI
+UpdateCount int(11) YES
+StringAttr varchar(255) YES
+StringAttr2 char(3) YES
+StringAttr3 text YES
+BlobAttr blob YES
+BooleanAttr smallint(6) YES
+CurrencyAttr decimal(14,4) YES
+DateTimeAttr datetime YES
+FloatAttr double YES
+GraphicAttr blob YES
+IntegerAttr int(11) YES
+MemoAttr text YES
+ReferenceAttributeClass varchar(32) YES
+ReferenceAttributeId varchar(32) YES
+EmbeddedPartsAtttribute blob YES
+EmbeddedPartAttribute blob YES
+ExternalPartAttributeClass varchar(32) YES
+ExternalPartAttributeId varchar(32) YES
+EmbeddedReferencesAtttribute blob YES
+DateAttr date YES
+TimeAttr time YES
+
+}
+
+
+end.
|
|
From: <fas...@us...> - 2007-04-24 10:40:26
|
Revision: 774
http://svn.sourceforge.net/instantobjects/revision/?rev=774&view=rev
Author: fastbike2
Date: 2007-04-24 03:40:25 -0700 (Tue, 24 Apr 2007)
Log Message:
-----------
Added new MySQL Catalog
Included ZEOS Broker in D7 and D2007 packages
Modified ZEOS code for compatibility with D2006+
Updated ZEOS code to reflect previous refactoring (MetaData, Types)
Modified Paths:
--------------
trunk/Source/Brokers/DBX/D7/IODBX.dpk
trunk/Source/Brokers/DBX/InstantDBX.pas
trunk/Source/Brokers/ZeosDBO/InstantZeosDBO.pas
trunk/Source/Brokers/ZeosDBO/InstantZeosDBOCatalog.pas
trunk/Source/Brokers/ZeosDBO/InstantZeosDBOConnectionDefEdit.pas
trunk/Source/PackageGroups/D2007/AllPackages.groupproj
trunk/Source/PackageGroups/D2007/DesignTimePackages.groupproj
trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj
trunk/Source/PackageGroups/D7/DesignTimePackages.bpg
trunk/Source/PackageGroups/D7/RunTimePackages.bpg
Modified: trunk/Source/Brokers/DBX/D7/IODBX.dpk
===================================================================
--- trunk/Source/Brokers/DBX/D7/IODBX.dpk 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/Brokers/DBX/D7/IODBX.dpk 2007-04-24 10:40:25 UTC (rev 774)
@@ -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/InstantDBX.pas
===================================================================
--- trunk/Source/Brokers/DBX/InstantDBX.pas 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/Brokers/DBX/InstantDBX.pas 2007-04-24 10:40:25 UTC (rev 774)
@@ -216,13 +216,16 @@
function ColumnTypeByDataType(DataType: TInstantDataType): string; override;
function GetDBMSName: string; override;
function GetSQLQuote: Char; override;
+ function CreateCatalog(const AScheme: TInstantScheme): TInstantCatalog; override;
+ public
+ function DataTypeToColumnType(DataType: TInstantDataType; Size: Integer): string; override;
end;
implementation
uses
SysUtils, InstantDBXConnectionDefEdit, InstantUtils, InstantConsts, Math,
- InstantDBBuild, InstantIBFbCatalog, InstantMSSqlCatalog;
+ InstantDBBuild, InstantIBFbCatalog, InstantMSSqlCatalog, InstantMySQLCatalog;
{ TInstantDBXConnector }
@@ -285,7 +288,14 @@
procedure TInstantDBXConnector.InternalBuildDatabase(Scheme: TInstantScheme);
begin
- inherited;
+ StartTransaction;
+ try
+ inherited;
+ CommitTransaction;
+ except
+ RollbackTransaction;
+ raise;
+ end;
end;
procedure TInstantDBXConnector.InternalCommitTransaction;
@@ -755,6 +765,20 @@
Result := Types[DataType];
end;
+function TInstantDBXMySQLBroker.CreateCatalog(
+ const AScheme: TInstantScheme): TInstantCatalog;
+begin
+ Result := TInstantMySQLCatalog.Create(AScheme, Self);
+end;
+
+function TInstantDBXMySQLBroker.DataTypeToColumnType(DataType: TInstantDataType;
+ Size: Integer): string;
+begin
+ if (DataType = dtString) and (Size > 255) then
+ DataType := dtMemo;
+ Result := inherited DataTypeToColumnType(DataType, Size);
+end;
+
function TInstantDBXMySQLBroker.GetDBMSName: string;
begin
Result := 'MySQL';
Modified: trunk/Source/Brokers/ZeosDBO/InstantZeosDBO.pas
===================================================================
--- trunk/Source/Brokers/ZeosDBO/InstantZeosDBO.pas 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/Brokers/ZeosDBO/InstantZeosDBO.pas 2007-04-24 10:40:25 UTC (rev 774)
@@ -49,7 +49,9 @@
interface
uses
- Classes, Db, InstantPersistence, InstantCommand, InstantDBBuild, ZConnection;
+ Classes, Db, InstantPersistence, InstantCommand, InstantDBBuild, InstantBrokers,
+ InstantMetadata, InstantTypes, ZConnection
+ {$IFDEF D10+}, DBCommonTypes{$ENDIF};
type
TInstantZeosDBOConnectionDef = class(TInstantRelationalConnectionDef)
@@ -907,7 +909,9 @@
'VARCHAR',
'TEXT',
'DATETIME',
- 'IMAGE');
+ 'IMAGE',
+ 'DATETIME',
+ 'DATETIME');
begin
Result := Types[DataType];
end;
@@ -932,7 +936,9 @@
'VARCHAR',
'TEXT',
'DATETIME',
- 'IMAGE');
+ 'IMAGE',
+ 'DATETIME',
+ 'DATETIME');
begin
Result := Types[DataType];
end;
@@ -982,7 +988,9 @@
'VARCHAR',
'BLOB SUB_TYPE 1',
'TIMESTAMP',
- 'BLOB');
+ 'BLOB',
+ 'TIMESTAMP',
+ 'TIMESTAMP');
begin
Result := Types[DataType];
end;
@@ -1012,7 +1020,9 @@
'VARCHAR2',
'CLOB',
'DATE',
- 'BLOB');
+ 'BLOB',
+ 'DATE',
+ 'DATE');
begin
Result := Types[DataType];
end;
@@ -1037,7 +1047,9 @@
'VARCHAR',
'TEXT',
'TIMESTAMP',
- 'BYTEA');
+ 'BYTEA',
+ 'TIMESTAMP',
+ 'TIMESTAMP');
begin
Result := Types[DataType];
end;
@@ -1105,7 +1117,9 @@
'VARCHAR',
'TEXT',
'DATETIME',
- 'BLOB');
+ 'BLOB',
+ 'DATE',
+ 'TIME');
begin
Result := Types[DataType];
end;
@@ -1342,7 +1356,9 @@
'VARCHAR',
'TEXT',
'TIMESTAMP',
- 'BLOB');
+ 'BLOB',
+ 'TIMESTAMP',
+ 'TIMESTAMP');
begin
Result := Types[DataType];
end;
Modified: trunk/Source/Brokers/ZeosDBO/InstantZeosDBOCatalog.pas
===================================================================
--- trunk/Source/Brokers/ZeosDBO/InstantZeosDBOCatalog.pas 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/Brokers/ZeosDBO/InstantZeosDBOCatalog.pas 2007-04-24 10:40:25 UTC (rev 774)
@@ -39,7 +39,8 @@
interface
uses
- DB, ZDbcIntfs, InstantPersistence, InstantZeosDBO;
+ DB, ZDbcIntfs, InstantPersistence, InstantZeosDBO, InstantBrokers,
+ InstantMetadata, InstantTypes;
type
// A TInstantCatalog that reads catalog information from a ZeosDBO
Modified: trunk/Source/Brokers/ZeosDBO/InstantZeosDBOConnectionDefEdit.pas
===================================================================
--- trunk/Source/Brokers/ZeosDBO/InstantZeosDBOConnectionDefEdit.pas 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/Brokers/ZeosDBO/InstantZeosDBOConnectionDefEdit.pas 2007-04-24 10:40:25 UTC (rev 774)
@@ -89,7 +89,7 @@
{$R *.dfm}
uses
- InstantPersistence, InstantClasses;
+ InstantPersistence, InstantClasses, InstantTypes;
{ TInstantZeosDBOConnectionDefEditForm }
Modified: trunk/Source/PackageGroups/D2007/AllPackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/D2007/AllPackages.groupproj 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/PackageGroups/D2007/AllPackages.groupproj 2007-04-24 10:40:25 UTC (rev 774)
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{b0beaee6-5b6a-420d-a1e5-7be9568cd5a2}</ProjectGuid>
</PropertyGroup>
@@ -12,179 +12,164 @@
</ProjectExtensions>
<Target Name="IOCore">
<MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="" />
- <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="" />
</Target>
<Target Name="IOCore:Clean">
<MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Clean" />
</Target>
- <Target Name="IOCore:Rebuild">
- <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Rebuild" />
+ <Target Name="IOCore:Make">
+ <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Make" />
</Target>
<Target Name="IOIBFbCatalog">
<MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="" />
- <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="" />
</Target>
<Target Name="IOIBFbCatalog:Clean">
<MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Clean" />
</Target>
- <Target Name="IOIBFbCatalog:Rebuild">
- <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Rebuild" />
+ <Target Name="IOIBFbCatalog:Make">
+ <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Make" />
</Target>
<Target Name="IOMSSqlCatalog">
<MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="" />
- <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="" />
</Target>
<Target Name="IOMSSqlCatalog:Clean">
<MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Clean" />
</Target>
- <Target Name="IOMSSqlCatalog:Rebuild">
- <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Rebuild" />
+ <Target Name="IOMSSqlCatalog:Make">
+ <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Make" />
</Target>
+ <Target Name="IOMySQLCatalog">
+ <MSBuild Projects="..\..\Catalogs\MySQL\D2007\IOMySQLCatalog.dproj" Targets="" />
+ </Target>
+ <Target Name="IOMySQLCatalog:Clean">
+ <MSBuild Projects="..\..\Catalogs\MySQL\D2007\IOMySQLCatalog.dproj" Targets="Clean" />
+ </Target>
+ <Target Name="IOMySQLCatalog:Make">
+ <MSBuild Projects="..\..\Catalogs\MySQL\D2007\IOMySQLCatalog.dproj" Targets="Make" />
+ </Target>
<Target Name="IOADO">
<MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="" />
</Target>
<Target Name="IOADO:Clean">
<MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Clean" />
</Target>
- <Target Name="IOADO:Rebuild">
- <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Rebuild" />
+ <Target Name="IOADO:Make">
+ <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Make" />
</Target>
<Target Name="IOBDE">
<MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="" />
</Target>
<Target Name="IOBDE:Clean">
<MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Clean" />
</Target>
- <Target Name="IOBDE:Rebuild">
- <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Rebuild" />
+ <Target Name="IOBDE:Make">
+ <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Make" />
</Target>
<Target Name="IODBX">
<MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="" />
</Target>
<Target Name="IODBX:Clean">
<MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Clean" />
</Target>
- <Target Name="IODBX:Rebuild">
- <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Rebuild" />
+ <Target Name="IODBX:Make">
+ <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Make" />
</Target>
<Target Name="IOIBX">
<MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="" />
</Target>
<Target Name="IOIBX:Clean">
<MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Clean" />
</Target>
- <Target Name="IOIBX:Rebuild">
- <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Rebuild" />
+ <Target Name="IOIBX:Make">
+ <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Make" />
</Target>
<Target Name="IOXML">
<MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="" />
</Target>
<Target Name="IOXML:Clean">
<MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Clean" />
</Target>
- <Target Name="IOXML:Rebuild">
- <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Rebuild" />
+ <Target Name="IOXML:Make">
+ <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Make" />
</Target>
+ <Target Name="IOZeosDBO">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="" />
+ </Target>
+ <Target Name="IOZeosDBO:Clean">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="Clean" />
+ </Target>
+ <Target Name="IOZeosDBO:Make">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="Make" />
+ </Target>
<Target Name="DclIOCore">
<MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="" />
- <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="" />
</Target>
<Target Name="DclIOCore:Clean">
<MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOCore:Rebuild">
- <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Rebuild" />
+ <Target Name="DclIOCore:Make">
+ <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Make" />
</Target>
<Target Name="DclIOADO">
<MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="" />
</Target>
<Target Name="DclIOADO:Clean">
<MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOADO:Rebuild">
- <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Rebuild" />
+ <Target Name="DclIOADO:Make">
+ <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Make" />
</Target>
<Target Name="DclIOBDE">
<MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="" />
</Target>
<Target Name="DclIOBDE:Clean">
<MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOBDE:Rebuild">
- <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Rebuild" />
+ <Target Name="DclIOBDE:Make">
+ <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Make" />
</Target>
<Target Name="DclIODBX">
<MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="" />
</Target>
<Target Name="DclIODBX:Clean">
<MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIODBX:Rebuild">
- <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Rebuild" />
+ <Target Name="DclIODBX:Make">
+ <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Make" />
</Target>
<Target Name="DclIOIBX">
<MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="" />
</Target>
<Target Name="DclIOIBX:Clean">
<MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOIBX:Rebuild">
- <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Rebuild" />
+ <Target Name="DclIOIBX:Make">
+ <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Make" />
</Target>
<Target Name="DclIOXML">
<MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="" />
</Target>
<Target Name="DclIOXML:Clean">
<MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOXML:Rebuild">
- <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Rebuild" />
+ <Target Name="DclIOXML:Make">
+ <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Make" />
</Target>
+ <Target Name="DclIOZeosDBO">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\DclIOZeosDBO.dproj" Targets="" />
+ </Target>
+ <Target Name="DclIOZeosDBO:Clean">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\DclIOZeosDBO.dproj" Targets="Clean" />
+ </Target>
+ <Target Name="DclIOZeosDBO:Make">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\DclIOZeosDBO.dproj" Targets="Make" />
+ </Target>
<Target Name="Build">
- <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOADO;IOBDE;IODBX;IOIBX;IOXML;DclIOCore;DclIOADO;DclIOBDE;DclIODBX;DclIOIBX;DclIOXML" />
+ <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOMySQLCatalog;IOADO;IOBDE;IODBX;IOIBX;IOXML;IOZeosDBO;DclIOCore;DclIOADO;DclIOBDE;DclIODBX;DclIOIBX;DclIOXML;DclIOZeosDBO" />
</Target>
<Target Name="Clean">
- <CallTarget Targets="IOCore:Clean;IOIBFbCatalog:Clean;IOMSSqlCatalog:Clean;IOADO:Clean;IOBDE:Clean;IODBX:Clean;IOIBX:Clean;IOXML:Clean;DclIOCore:Clean;DclIOADO:Clean;DclIOBDE:Clean;DclIODBX:Clean;DclIOIBX:Clean;DclIOXML:Clean" />
+ <CallTarget Targets="IOCore:Clean;IOIBFbCatalog:Clean;IOMSSqlCatalog:Clean;IOMySQLCatalog:Clean;IOADO:Clean;IOBDE:Clean;IODBX:Clean;IOIBX:Clean;IOXML:Clean;IOZeosDBO:Clean;DclIOCore:Clean;DclIOADO:Clean;DclIOBDE:Clean;DclIODBX:Clean;DclIOIBX:Clean;DclIOXML:Clean;DclIOZeosDBO:Clean" />
</Target>
- <Target Name="Rebuild">
- <CallTarget Targets="IOCore:Rebuild;IOIBFbCatalog:Rebuild;IOMSSqlCatalog:Rebuild;IOADO:Rebuild;IOBDE:Rebuild;IODBX:Rebuild;IOIBX:Rebuild;IOXML:Rebuild;DclIOCore:Rebuild;DclIOADO:Rebuild;DclIOBDE:Rebuild;DclIODBX:Rebuild;DclIOIBX:Rebuild;DclIOXML:Rebuild" />
+ <Target Name="Make">
+ <CallTarget Targets="IOCore:Make;IOIBFbCatalog:Make;IOMSSqlCatalog:Make;IOMySQLCatalog:Make;IOADO:Make;IOBDE:Make;IODBX:Make;IOIBX:Make;IOXML:Make;IOZeosDBO:Make;DclIOCore:Make;DclIOADO:Make;DclIOBDE:Make;DclIODBX:Make;DclIOIBX:Make;DclIOXML:Make;DclIOZeosDBO:Make" />
</Target>
</Project>
\ No newline at end of file
Modified: trunk/Source/PackageGroups/D2007/DesignTimePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/D2007/DesignTimePackages.groupproj 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/PackageGroups/D2007/DesignTimePackages.groupproj 2007-04-24 10:40:25 UTC (rev 774)
@@ -12,83 +12,74 @@
</ProjectExtensions>
<Target Name="DclIOCore">
<MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="" />
- <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="" />
</Target>
<Target Name="DclIOCore:Clean">
<MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOCore:Rebuild">
- <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Rebuild" />
+ <Target Name="DclIOCore:Make">
+ <MSBuild Projects="..\..\Design\D2007\DclIOCore.dproj" Targets="Make" />
</Target>
<Target Name="DclIOADO">
<MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="" />
</Target>
<Target Name="DclIOADO:Clean">
<MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOADO:Rebuild">
- <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Rebuild" />
+ <Target Name="DclIOADO:Make">
+ <MSBuild Projects="..\..\Brokers\ADO\D2007\DclIOADO.dproj" Targets="Make" />
</Target>
<Target Name="DclIOBDE">
<MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="" />
</Target>
<Target Name="DclIOBDE:Clean">
<MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOBDE:Rebuild">
- <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Rebuild" />
+ <Target Name="DclIOBDE:Make">
+ <MSBuild Projects="..\..\Brokers\BDE\D2007\DclIOBDE.dproj" Targets="Make" />
</Target>
<Target Name="DclIODBX">
<MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="" />
</Target>
<Target Name="DclIODBX:Clean">
<MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIODBX:Rebuild">
- <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Rebuild" />
+ <Target Name="DclIODBX:Make">
+ <MSBuild Projects="..\..\Brokers\DBX\D2007\DclIODBX.dproj" Targets="Make" />
</Target>
<Target Name="DclIOIBX">
<MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="" />
</Target>
<Target Name="DclIOIBX:Clean">
<MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOIBX:Rebuild">
- <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Rebuild" />
+ <Target Name="DclIOIBX:Make">
+ <MSBuild Projects="..\..\Brokers\IBX\D2007\DclIOIBX.dproj" Targets="Make" />
</Target>
<Target Name="DclIOXML">
<MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="" />
</Target>
<Target Name="DclIOXML:Clean">
<MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Clean" />
</Target>
- <Target Name="DclIOXML:Rebuild">
- <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Rebuild" />
+ <Target Name="DclIOXML:Make">
+ <MSBuild Projects="..\..\Brokers\XML\D2007\DclIOXML.dproj" Targets="Make" />
</Target>
+ <Target Name="DclIOZeosDBO">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\DclIOZeosDBO.dproj" Targets="" />
+ </Target>
+ <Target Name="DclIOZeosDBO:Clean">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\DclIOZeosDBO.dproj" Targets="Clean" />
+ </Target>
+ <Target Name="DclIOZeosDBO:Make">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\DclIOZeosDBO.dproj" Targets="Make" />
+ </Target>
<Target Name="Build">
- <CallTarget Targets="DclIOCore;DclIOADO;DclIOBDE;DclIODBX;DclIOIBX;DclIOXML" />
+ <CallTarget Targets="DclIOCore;DclIOADO;DclIOBDE;DclIODBX;DclIOIBX;DclIOXML;DclIOZeosDBO" />
</Target>
<Target Name="Clean">
- <CallTarget Targets="DclIOCore:Clean;DclIOADO:Clean;DclIOBDE:Clean;DclIODBX:Clean;DclIOIBX:Clean;DclIOXML:Clean" />
+ <CallTarget Targets="DclIOCore:Clean;DclIOADO:Clean;DclIOBDE:Clean;DclIODBX:Clean;DclIOIBX:Clean;DclIOXML:Clean;DclIOZeosDBO:Clean" />
</Target>
- <Target Name="Rebuild">
- <CallTarget Targets="DclIOCore:Rebuild;DclIOADO:Rebuild;DclIOBDE:Rebuild;DclIODBX:Rebuild;DclIOIBX:Rebuild;DclIOXML:Rebuild" />
+ <Target Name="Make">
+ <CallTarget Targets="DclIOCore:Make;DclIOADO:Make;DclIOBDE:Make;DclIODBX:Make;DclIOIBX:Make;DclIOXML:Make;DclIOZeosDBO:Make" />
</Target>
</Project>
\ No newline at end of file
Modified: trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/PackageGroups/D2007/RunTimePackages.groupproj 2007-04-24 10:40:25 UTC (rev 774)
@@ -12,107 +12,101 @@
</ProjectExtensions>
<Target Name="IOCore">
<MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="" />
- <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="" />
</Target>
<Target Name="IOCore:Clean">
<MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Clean" />
</Target>
- <Target Name="IOCore:Rebuild">
- <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Rebuild" />
+ <Target Name="IOCore:Make">
+ <MSBuild Projects="..\..\Core\D2007\IOCore.dproj" Targets="Make" />
</Target>
<Target Name="IOIBFbCatalog">
<MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="" />
- <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="" />
</Target>
<Target Name="IOIBFbCatalog:Clean">
<MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Clean" />
</Target>
- <Target Name="IOIBFbCatalog:Rebuild">
- <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Rebuild" />
+ <Target Name="IOIBFbCatalog:Make">
+ <MSBuild Projects="..\..\Catalogs\IBFb\D2007\IOIBFbCatalog.dproj" Targets="Make" />
</Target>
<Target Name="IOMSSqlCatalog">
<MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="" />
- <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="" />
</Target>
<Target Name="IOMSSqlCatalog:Clean">
<MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Clean" />
</Target>
- <Target Name="IOMSSqlCatalog:Rebuild">
- <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Rebuild" />
+ <Target Name="IOMSSqlCatalog:Make">
+ <MSBuild Projects="..\..\Catalogs\MSSql\D2007\IOMSSqlCatalog.dproj" Targets="Make" />
</Target>
+ <Target Name="IOMySQLCatalog">
+ <MSBuild Projects="..\..\Catalogs\MySQL\D2007\IOMySQLCatalog.dproj" Targets="" />
+ </Target>
+ <Target Name="IOMySQLCatalog:Clean">
+ <MSBuild Projects="..\..\Catalogs\MySQL\D2007\IOMySQLCatalog.dproj" Targets="Clean" />
+ </Target>
+ <Target Name="IOMySQLCatalog:Make">
+ <MSBuild Projects="..\..\Catalogs\MySQL\D2007\IOMySQLCatalog.dproj" Targets="Make" />
+ </Target>
<Target Name="IOADO">
<MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="" />
</Target>
<Target Name="IOADO:Clean">
<MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Clean" />
</Target>
- <Target Name="IOADO:Rebuild">
- <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Rebuild" />
+ <Target Name="IOADO:Make">
+ <MSBuild Projects="..\..\Brokers\ADO\D2007\IOADO.dproj" Targets="Make" />
</Target>
<Target Name="IOBDE">
<MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="" />
</Target>
<Target Name="IOBDE:Clean">
<MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Clean" />
</Target>
- <Target Name="IOBDE:Rebuild">
- <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Rebuild" />
+ <Target Name="IOBDE:Make">
+ <MSBuild Projects="..\..\Brokers\BDE\D2007\IOBDE.dproj" Targets="Make" />
</Target>
<Target Name="IODBX">
<MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="" />
</Target>
<Target Name="IODBX:Clean">
<MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Clean" />
</Target>
- <Target Name="IODBX:Rebuild">
- <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Rebuild" />
+ <Target Name="IODBX:Make">
+ <MSBuild Projects="..\..\Brokers\DBX\D2007\IODBX.dproj" Targets="Make" />
</Target>
<Target Name="IOIBX">
<MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="" />
</Target>
<Target Name="IOIBX:Clean">
<MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Clean" />
</Target>
- <Target Name="IOIBX:Rebuild">
- <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Rebuild" />
+ <Target Name="IOIBX:Make">
+ <MSBuild Projects="..\..\Brokers\IBX\D2007\IOIBX.dproj" Targets="Make" />
</Target>
<Target Name="IOXML">
<MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="" />
</Target>
<Target Name="IOXML:Clean">
<MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Clean" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Clean" />
</Target>
- <Target Name="IOXML:Rebuild">
- <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Rebuild" />
- <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Rebuild" />
+ <Target Name="IOXML:Make">
+ <MSBuild Projects="..\..\Brokers\XML\D2007\IOXML.dproj" Targets="Make" />
</Target>
+ <Target Name="IOZeosDBO">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="" />
+ </Target>
+ <Target Name="IOZeosDBO:Clean">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="Clean" />
+ </Target>
+ <Target Name="IOZeosDBO:Make">
+ <MSBuild Projects="..\..\Brokers\ZeosDBO\D2007\IOZeosDBO.dproj" Targets="Make" />
+ </Target>
<Target Name="Build">
- <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOADO;IOBDE;IODBX;IOIBX;IOXML" />
+ <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOMySQLCatalog;IOADO;IOBDE;IODBX;IOIBX;IOXML;IOZeosDBO" />
</Target>
<Target Name="Clean">
- <CallTarget Targets="IOCore:Clean;IOIBFbCatalog:Clean;IOMSSqlCatalog:Clean;IOADO:Clean;IOBDE:Clean;IODBX:Clean;IOIBX:Clean;IOXML:Clean" />
+ <CallTarget Targets="IOCore:Clean;IOIBFbCatalog:Clean;IOMSSqlCatalog:Clean;IOMySQLCatalog:Clean;IOADO:Clean;IOBDE:Clean;IODBX:Clean;IOIBX:Clean;IOXML:Clean;IOZeosDBO:Clean" />
</Target>
- <Target Name="Rebuild">
- <CallTarget Targets="IOCore:Rebuild;IOIBFbCatalog:Rebuild;IOMSSqlCatalog:Rebuild;IOADO:Rebuild;IOBDE:Rebuild;IODBX:Rebuild;IOIBX:Rebuild;IOXML:Rebuild" />
+ <Target Name="Make">
+ <CallTarget Targets="IOCore:Make;IOIBFbCatalog:Make;IOMSSqlCatalog:Make;IOMySQLCatalog:Make;IOADO:Make;IOBDE:Make;IODBX:Make;IOIBX:Make;IOXML:Make;IOZeosDBO:Make" />
</Target>
</Project>
\ No newline at end of file
Modified: trunk/Source/PackageGroups/D7/DesignTimePackages.bpg
===================================================================
--- trunk/Source/PackageGroups/D7/DesignTimePackages.bpg 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/PackageGroups/D7/DesignTimePackages.bpg 2007-04-24 10:40:25 UTC (rev 774)
@@ -9,8 +9,8 @@
DCC = $(ROOT)\bin\dcc32.exe $**
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
-PROJECTS = dclIOCore_D7.bpl dclIOADO_D7.bpl dclIOBDE_D7.bpl dclIODBX_D7.bpl dclIOIBX_D7.bpl \
- dclIOXML_D7.bpl
+PROJECTS = dclIOCore_D7.bpl dclIOADO_D7.bpl dclIOBDE_D7.bpl dclIODBX_D7.bpl \
+ dclIOIBX_D7.bpl dclIOXML_D7.bpl DclIOZeosDBO_D7.bpl
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------
@@ -32,3 +32,8 @@
dclIOXML_D7.bpl: ..\..\Brokers\XML\D7\dclIOXML.dpk
$(DCC)
+
+DclIOZeosDBO_D7.bpl: ..\..\Brokers\ZeosDBO\D7\DclIOZeosDBO.dpk
+ $(DCC)
+
+
Modified: trunk/Source/PackageGroups/D7/RunTimePackages.bpg
===================================================================
--- trunk/Source/PackageGroups/D7/RunTimePackages.bpg 2007-04-03 08:27:44 UTC (rev 773)
+++ trunk/Source/PackageGroups/D7/RunTimePackages.bpg 2007-04-24 10:40:25 UTC (rev 774)
@@ -9,8 +9,9 @@
DCC = $(ROOT)\bin\dcc32.exe $**
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
-PROJECTS = IOCore_D7.bpl IOMSSqlCatalog_D7.bpl IOIBFbCatalog_D7.bpl IOADO_D7.bpl IOBDE_D7.bpl \
- IODBX_D7.bpl IOIBX_D7.bpl IOXML_D7.bpl
+PROJECTS = IOCore_D7.bpl IOMSSqlCatalog_D7.bpl IOIBFbCatalog_D7.bpl \
+ IOMySQLCatalog_D7.bpl IOADO_D7.bpl IOBDE_D7.bpl IODBX_D7.bpl IOIBX_D7.bpl \
+ IOXML_D7.bpl IOZeosDBO_D7.bpl
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------
@@ -39,4 +40,10 @@
IOIBFbCatalog_D7.bpl: ..\..\Catalogs\IBFb\D7\IOIBFbCatalog.dpk
$(DCC)
+IOMySQLCatalog_D7.bpl: ..\..\Catalogs\MySQL\D7\IOMySQLCatalog.dpk
+ $(DCC)
+IOZeosDBO_D7.bpl: ..\..\Brokers\ZeosDBO\D7\IOZeosDBO.dpk
+ $(DCC)
+
+
|
|
From: <na...@us...> - 2007-04-03 08:27:43
|
Revision: 773
http://svn.sourceforge.net/instantobjects/revision/?rev=773&view=rev
Author: nandod
Date: 2007-04-03 01:27:44 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
made a copy
Added Paths:
-----------
tags/IO21/
Copied: tags/IO21 (from rev 772, trunk)
|
|
From: <na...@us...> - 2007-04-03 08:01:52
|
Revision: 772
http://svn.sourceforge.net/instantobjects/revision/?rev=772&view=rev
Author: nandod
Date: 2007-04-03 01:01:14 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
* svn:ignore set.
Property Changed:
----------------
trunk/Source/Design/D2007/
Property changes on: trunk/Source/Design/D2007
___________________________________________________________________
Name: svn:ignore
- __history
*.local
*.identcache
+ __history
*.local
*.identcache
*.dcu
|
|
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...> - 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-02-25 15:49:47
|
Revision: 769
http://svn.sourceforge.net/instantobjects/revision/?rev=769&view=rev
Author: nandod
Date: 2007-02-25 07:49:44 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
* fixed two warnings.
Modified Paths:
--------------
trunk/Source/Core/InstantPersistence.pas
trunk/Source/Core/InstantPresentation.pas
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2007-02-25 15:46:50 UTC (rev 768)
+++ trunk/Source/Core/InstantPersistence.pas 2007-02-25 15:49:44 UTC (rev 769)
@@ -1113,7 +1113,6 @@
property Connector: TInstantConnector read GetConnector;
// Executes the database build step.
procedure Execute;
- published
property Enabled: Boolean read FEnabled write FEnabled;
end;
TInstantDBBuildCommandClass = class of TInstantDBBuildCommand;
Modified: trunk/Source/Core/InstantPresentation.pas
===================================================================
--- trunk/Source/Core/InstantPresentation.pas 2007-02-25 15:46:50 UTC (rev 768)
+++ trunk/Source/Core/InstantPresentation.pas 2007-02-25 15:49:44 UTC (rev 769)
@@ -367,7 +367,11 @@
protected
{ IProviderSupport }
procedure PSGetAttributes(List: TList); override;
+ {$IFDEF D10+}
+ function PSGetTableNameW: WideString; override;
+ {$ELSE}
function PSGetTableName: string; override;
+ {$ENDIF}
procedure PSReset; override;
protected
procedure AddClassFieldDefs(const FieldName: string; AClass: TClass); overload;
@@ -3748,7 +3752,11 @@
begin
end;
+{$IFDEF D10+}
+function TInstantCustomExposer.PSGetTableNameW: WideString;
+{$ELSE}
function TInstantCustomExposer.PSGetTableName: string;
+{$ENDIF}
begin
Result := ObjectClassName;
end;
|
