[Instantobjects-cvscommit] SF.net SVN: instantobjects:[872] trunk/Source/Brokers/AnyDAC

[<dav...@us...>]

Revision: 872
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=872&view=rev
Author:   davidvtaylor
Date:     2009-10-11 05:30:38 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
* Update AnyDAC broker to support RemObjects Fall 2009 release
* Change usage of Connected property to Open and Close to address Delphi 7 compiler bug
* Add _D14 suffix to AnyDAC package references
* Changes tested with D7, D2007, D2009 and D2010

Modified Paths:
--------------
    trunk/Source/Brokers/AnyDAC/D2010/DclIOAnyDAC.dproj
    trunk/Source/Brokers/AnyDAC/D2010/IOAnyDAC.dpk
    trunk/Source/Brokers/AnyDAC/D2010/IOAnyDAC.dproj
    trunk/Source/Brokers/AnyDAC/InstantAnyDAC.pas
    trunk/Source/Brokers/AnyDAC/InstantAnyDACCatalog.pas

Modified: trunk/Source/Brokers/AnyDAC/D2010/DclIOAnyDAC.dproj
===================================================================
--- trunk/Source/Brokers/AnyDAC/D2010/DclIOAnyDAC.dproj	2009-09-04 01:42:48 UTC (rev 871)
+++ trunk/Source/Brokers/AnyDAC/D2010/DclIOAnyDAC.dproj	2009-10-11 05:30:38 UTC (rev 872)
@@ -1,6 +1,6 @@
 	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 		<PropertyGroup>
-			<ProjectGuid>{A2BC22CD-E13F-451F-B150-873A254827A7}</ProjectGuid>
+			<ProjectGuid>{059CEAC8-4093-4818-83AE-1FC4E6F35177}</ProjectGuid>
 			<MainSource>DclIOAnyDAC.dpk</MainSource>
 			<Config Condition="'$(Config)'==''">Debug</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>

Modified: trunk/Source/Brokers/AnyDAC/D2010/IOAnyDAC.dpk
===================================================================
--- trunk/Source/Brokers/AnyDAC/D2010/IOAnyDAC.dpk	2009-09-04 01:42:48 UTC (rev 871)
+++ trunk/Source/Brokers/AnyDAC/D2010/IOAnyDAC.dpk	2009-10-11 05:30:38 UTC (rev 872)
@@ -30,9 +30,9 @@
 requires
   IOCore,
   xmlrtl,
-  AnyDAC_Phys,
-  AnyDAC_ComI,
-  AnyDAC_Comp;
+  AnyDAC_Phys_D14,
+  AnyDAC_ComI_D14,
+  AnyDAC_Comp_D14;
 
 contains
   InstantAnyDAC in '..\InstantAnyDAC.pas',

Modified: trunk/Source/Brokers/AnyDAC/D2010/IOAnyDAC.dproj
===================================================================
--- trunk/Source/Brokers/AnyDAC/D2010/IOAnyDAC.dproj	2009-09-04 01:42:48 UTC (rev 871)
+++ trunk/Source/Brokers/AnyDAC/D2010/IOAnyDAC.dproj	2009-10-11 05:30:38 UTC (rev 872)
@@ -1,6 +1,6 @@
 	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 		<PropertyGroup>
-			<ProjectGuid>{B2FCAE40-1DA4-401B-878A-1D0C9AB45191}</ProjectGuid>
+			<ProjectGuid>{CD800962-5B25-4949-8D83-1261EE4A4203}</ProjectGuid>
 			<MainSource>IOAnyDAC.dpk</MainSource>
 			<Config Condition="'$(Config)'==''">Debug</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
@@ -48,9 +48,9 @@
 			</DelphiCompile>
 			<DCCReference Include="IOCore.dcp"/>
 			<DCCReference Include="xmlrtl.dcp"/>
-			<DCCReference Include="AnyDAC_Phys.dcp"/>
-			<DCCReference Include="AnyDAC_ComI.dcp"/>
-			<DCCReference Include="AnyDAC_Comp.dcp"/>
+			<DCCReference Include="AnyDAC_Phys_D14.dcp"/>
+			<DCCReference Include="AnyDAC_ComI_D14.dcp"/>
+			<DCCReference Include="AnyDAC_Comp_D14.dcp"/>
 			<DCCReference Include="..\InstantAnyDAC.pas"/>
 			<DCCReference Include="..\InstantAnyDACCatalog.pas"/>
 			<DCCReference Include="..\InstantAnyDACConnectionDefEdit.pas">

Modified: trunk/Source/Brokers/AnyDAC/InstantAnyDAC.pas
===================================================================
--- trunk/Source/Brokers/AnyDAC/InstantAnyDAC.pas	2009-09-04 01:42:48 UTC (rev 871)
+++ trunk/Source/Brokers/AnyDAC/InstantAnyDAC.pas	2009-10-11 05:30:38 UTC (rev 872)
@@ -430,7 +430,7 @@
 begin
   if (HasConnection) then
     begin
-      FConnection.Connected := False;
+      FConnection.Close;
       FConnection.TxOptions.AutoCommit := true;
       FConnection.TxOptions.Isolation := xiReadCommitted;
       FConnection.OnLogin := DoLogin;
@@ -558,9 +558,9 @@
 begin
   AssignLoginOptions;
   try
-    Connection.Connected := True;
+    Connection.Open;
     Result := True;
-    Connection.Connected := False;
+    Connection.Close;
   except
 // TODO Fixup database detection logic for AnyDAC - Exception approach may not work well
 //    on E : EZSQLException do
@@ -607,7 +607,7 @@
 procedure TInstantAnyDACConnector.InternalConnect;
 begin
   CheckConnection;
-  FConnection.Connected := true;
+  FConnection.Open;
 end;
 
 procedure TInstantAnyDACConnector.InternalCreateDatabase;
@@ -620,7 +620,7 @@
 procedure TInstantAnyDACConnector.InternalDisconnect;
 begin
   if (HasConnection) then
-    FConnection.Connected := false;
+    FConnection.Close;
 end;
 
 procedure TInstantAnyDACConnector.InternalRollbackTransaction;

Modified: trunk/Source/Brokers/AnyDAC/InstantAnyDACCatalog.pas
===================================================================
--- trunk/Source/Brokers/AnyDAC/InstantAnyDACCatalog.pas	2009-09-04 01:42:48 UTC (rev 871)
+++ trunk/Source/Brokers/AnyDAC/InstantAnyDACCatalog.pas	2009-10-11 05:30:38 UTC (rev 872)
@@ -230,7 +230,7 @@
     with Connector.Connection do
       begin
         if not Connected then
-          Connected := true;
+          Open;
         RefreshMetadataCache;
         GetTableNames('','','',Tables,[osMy],[tkTable]);
       end;