Thread: [Instantobjects-cvscommit] SF.net SVN: instantobjects:[963] trunk (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 963
          http://sourceforge.net/p/instantobjects/code/963
Author:   carlobar
Date:     2014-05-12 09:08:33 +0000 (Mon, 12 May 2014)
Log Message:
-----------
Version 2.2 (2.2.0.0) (2014-05-12)
- Full UNICODE support: based on UseUnicode flag of InstantConnection:
  Exposers uses TWideStringField or TWideMemoField mapping string attributes
  
- Virtual Containers (for SQL brokers):
  Master-Detail relationship using a contaier without storage  
  (read VirtualContainers.txt for more informations)

- Updated UnitTesting for Exposers and Unicode Support

Modified Paths:
--------------
    trunk/Demos/PrimerCross/Main.pas
    trunk/Demos/PrimerCross/Primer_D2010.xml
    trunk/Demos/PrimerCross/Primer_DXE3.xml
    trunk/Docs/Changes.txt
    trunk/Docs/Install.txt
    trunk/Readme1st.txt
    trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj
    trunk/Source/Brokers/ADO/D2010/IOADO.dproj
    trunk/Source/Brokers/ADO/DXE3/IOADO.dproj
    trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj
    trunk/Source/Brokers/DBX/D2010/IODBX.dproj
    trunk/Source/Brokers/DBX/DXE3/IODBX.dproj
    trunk/Source/Brokers/DBX/InstantDBX.pas
    trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.dfm
    trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.pas
    trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj
    trunk/Source/Brokers/IBX/D2010/IOIBX.dproj
    trunk/Source/Brokers/IBX/DXE3/IOIBX.dproj
    trunk/Source/Brokers/IBX/InstantIBX.pas
    trunk/Source/Brokers/XML/D2010/DclIOXML.dproj
    trunk/Source/Brokers/XML/D2010/IOXML.dproj
    trunk/Source/Brokers/XML/DXE3/IOXML.dproj
    trunk/Source/Brokers/XML/InstantXML.pas
    trunk/Source/Brokers/XML/InstantXMLCatalog.pas
    trunk/Source/Catalogs/IBFb/D2010/IOIBFbCatalog.dproj
    trunk/Source/Catalogs/IBFb/DXE3/IOIBFbCatalog.dproj
    trunk/Source/Core/D2010/IOCore.dproj
    trunk/Source/Core/DXE3/IOCore.dproj
    trunk/Source/Core/InstantBrokers.pas
    trunk/Source/Core/InstantCode.pas
    trunk/Source/Core/InstantCommand.pas
    trunk/Source/Core/InstantConnectionManagerFormUnit.pas
    trunk/Source/Core/InstantConsts.pas
    trunk/Source/Core/InstantExplorer.pas
    trunk/Source/Core/InstantPersistence.pas
    trunk/Source/Core/InstantPresentation.pas
    trunk/Source/Core/InstantTypes.pas
    trunk/Source/Design/D2010/DclIOCore.dproj
    trunk/Source/Design/DXE3/DclIOCore.dproj
    trunk/Source/InstantDefines.inc
    trunk/Source/PackageGroups/DXE3/DesignTimePackages.groupproj
    trunk/Source/PackageGroups/DXE3/RunTimePackages.groupproj
    trunk/Source/PackageGroups/Install.txt
    trunk/Tests/TestIO.dpr
    trunk/Tests/TestIO.dproj
    trunk/Tests/TestIO_DXE3.dpr
    trunk/Tests/TestIO_DXE3.dproj
    trunk/Tests/TestInstantObjectStore.pas
    trunk/Tests/TestInstantPresentation.pas
    trunk/Tests/TestModel.pas
    trunk/Tests/TestXMLBroker.pas
    trunk/Tests/ubmock/src/GuiTestRunner.dfm

Modified: trunk/Demos/PrimerCross/Main.pas
===================================================================

--- trunk/Demos/PrimerCross/Main.pas	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Demos/PrimerCross/Main.pas	2014-05-12 09:08:33 UTC (rev 963)
@@ -19,8 +19,9 @@
   QMenus, QExtCtrls, QComCtrls, QGrids, QDBGrids, QImgList, QActnList,
 {$ENDIF}
   InstantPersistence, BasicView, Stopwatch,
-  InstantConnectionManagerFormUnit, InstantConnectionManager
-  {$IFDEF D17+}, System.Actions{$ENDIF};
+  InstantConnectionManagerFormUnit, InstantConnectionManager,
+  {$IFDEF D17+}System.Actions,{$ENDIF}
+  WideStrings, SqlExpr;
 
 type
   TMainForm = class(TForm)
@@ -148,7 +149,10 @@
   {$IFNDEF VER130}
   InstantDBX,
   {$ENDIF}
-  InstantADO, InstantBDE, InstantIBX,
+  InstantADO, InstantIBX, InstantBDE,
+  {$IFDEF D19+}
+  InstantFireDAC,
+  {$ENDIF}
   {$IFDEF D14+}
     // These are required for DBExpress to load the drivers in newer
     // versions of Delphi. If you get a compilation error it means you

Modified: trunk/Demos/PrimerCross/Primer_D2010.xml
===================================================================
--- trunk/Demos/PrimerCross/Primer_D2010.xml	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Demos/PrimerCross/Primer_D2010.xml	2014-05-12 09:08:33 UTC (rev 963)
@@ -1,39 +1,41 @@
 <TInstantConnectionDefs>
-  <TInstantBDEConnectionDef>
-    <Name>ParadoxDB</Name>
+  <TInstantIBXConnectionDef>
+    <Name>IBX_Firebird</Name>
     <IsBuilt>TRUE</IsBuilt>
     <BlobStreamFormat>sfXML</BlobStreamFormat>
     <LoginPrompt>FALSE</LoginPrompt>
-    <DriverName>STANDARD</DriverName>
-    <Parameters>PATH=.\ParadoxDB
-DEFAULT DRIVER=PARADOX
-ENABLE BCD=TRUE
-</Parameters>
-  </TInstantBDEConnectionDef>
+    <ConnectionString>.\FirebirdDB\PRIMERDB.FDB</ConnectionString>
+    <Options></Options>
+    <Params>user_name=SYSDBA
+password=masterkey
+lc_ctype=ISO8859_1</Params>
+  </TInstantIBXConnectionDef>
+  <TInstantXMLConnectionDef>
+    <Name>XmlDB</Name>
+    <IsBuilt>TRUE</IsBuilt>
+    <RootFolder>.\XmlDB</RootFolder>
+  </TInstantXMLConnectionDef>
   <TInstantDBXConnectionDef>
-    <Name>FirebirdDB</Name>
+    <Name>DBX_Firebird</Name>
     <IsBuilt>TRUE</IsBuilt>
     <BlobStreamFormat>sfXML</BlobStreamFormat>
     <LoginPrompt>FALSE</LoginPrompt>
-    <ConnectionName>PrimerCrossISO</ConnectionName>
+    <ConnectionName>FBConnection</ConnectionName>
     <DriverName>Firebird</DriverName>
-    <GetDriverFunc>getSQLDriverINTERBASE</GetDriverFunc>
-    <LibraryName>dbxfb.dll</LibraryName>
-    <Params>drivername=Firebird
+    <Params>DriverName=Firebird
 Database=.\FirebirdDB\PRIMERDB.FDB
-User_Name=SYSDBA
+RoleName=RoleName
+User_Name=sysdba
 Password=masterkey
-blobsize=-1
-localecode=0000
-devartinterbase transisolation=ReadCommited
-productname=Interbase
-ServerCharSet=ISO8859_1
+ServerCharSet=
+SQLDialect=3
+ErrorResourceFile=
+LocaleCode=0000
+BlobSize=-1
+CommitRetain=False
+WaitOnLocks=True
+IsolationLevel=ReadCommitted
+Trim Char=False
 </Params>
-    <VendorLib>fbclient.dll</VendorLib>
   </TInstantDBXConnectionDef>
-  <TInstantXMLConnectionDef>
-    <Name>XmlDB</Name>
-    <IsBuilt>TRUE</IsBuilt>
-    <RootFolder>.\XmlDB</RootFolder>
-  </TInstantXMLConnectionDef>
 </TInstantConnectionDefs>

Modified: trunk/Demos/PrimerCross/Primer_DXE3.xml
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE3.xml	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Demos/PrimerCross/Primer_DXE3.xml	2014-05-12 09:08:33 UTC (rev 963)
@@ -11,19 +11,42 @@
 </Parameters>
   </TInstantBDEConnectionDef>
   <TInstantIBXConnectionDef>
-    <Name>FirebirdDB</Name>
+    <Name>IBX_Firebird</Name>
     <IsBuilt>TRUE</IsBuilt>
     <BlobStreamFormat>sfXML</BlobStreamFormat>
     <LoginPrompt>FALSE</LoginPrompt>
-    <ConnectionString>localhost:c:\db\primercrossutf8.fdb</ConnectionString>
+    <ConnectionString>.\FirebirdDB\PRIMERDB.FDB</ConnectionString>
     <Options></Options>
     <Params>user_name=SYSDBA
 password=masterkey
-lc_ctype=UTF8</Params>
+lc_ctype=ISO8859_1</Params>
   </TInstantIBXConnectionDef>
   <TInstantXMLConnectionDef>
     <Name>XmlDB</Name>
     <IsBuilt>TRUE</IsBuilt>
     <RootFolder>.\XmlDB</RootFolder>
   </TInstantXMLConnectionDef>
+  <TInstantDBXConnectionDef>
+    <Name>DBX_Firebird</Name>
+    <IsBuilt>TRUE</IsBuilt>
+    <BlobStreamFormat>sfXML</BlobStreamFormat>
+    <LoginPrompt>FALSE</LoginPrompt>
+    <ConnectionName>FBConnection</ConnectionName>
+    <DriverName>Firebird</DriverName>
+    <Params>DriverName=Firebird
+Database=.\FirebirdDB\PRIMERDB.FDB
+RoleName=RoleName
+User_Name=sysdba
+Password=masterkey
+ServerCharSet=
+SQLDialect=3
+ErrorResourceFile=
+LocaleCode=0000
+BlobSize=-1
+CommitRetain=False
+WaitOnLocks=True
+IsolationLevel=ReadCommitted
+Trim Char=False
+</Params>
+  </TInstantDBXConnectionDef>
 </TInstantConnectionDefs>

Modified: trunk/Docs/Changes.txt
===================================================================
--- trunk/Docs/Changes.txt	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Docs/Changes.txt	2014-05-12 09:08:33 UTC (rev 963)
@@ -1,6 +1,20 @@
 VERSION HISTORY
 ---------------
 
+Version 2.2 (2.2.0.0) (2014-05-12)
+- Full UNICODE support: based on UseUnicode flag of InstantConnection:
+  Exposers uses TWideStringField or TWideMemoField mapping string attributes
+  
+- Virtual Containers (for SQL brokers):
+  Master-Detail relationship using a contaier without storage  
+  (read VirtualContainers.txt for more informations)
+
+- Added Broker for Embarcadero FireDac
+
+- Added support for Delphi XE5 and XE6
+
+- Updated UnitTesting for Exposers and Unicode Support
+
 Version 2.1 (2.1.0.0) (2007-02-26)
 
 - Support for SQL Server 2005; catalog support for SQL Server 7;

Modified: trunk/Docs/Install.txt
===================================================================
--- trunk/Docs/Install.txt	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Docs/Install.txt	2014-05-12 09:08:33 UTC (rev 963)
@@ -1,6 +1,6 @@
 ------------------------------------------------------------------
 
-  InstantObjects for Delphi, Kylix, FPC
+  InstantObjects for Delphi
 
   Mozilla Public License 1.1
   Based on Seleqt InstantObjects.
@@ -60,8 +60,8 @@
    <installdir>/Source/Core/<version>/IOCore.dpk (build)
    <installdir>/Source/Design/<version>/DclIOCore.dpk (install)
    
-   Where <version> identifies your version of Delphi, Kylix or
-   FPC. Examples: D5, D6, D7, K3, D2005, D2006, etc.
+   Where <version> identifies your version of Delphi
+   Examples: D7, D2005, D2006, etc.
 
 
 4. Build and install the desired catalog and broker package(s):
@@ -79,11 +79,6 @@
    <installdir>/Source/Brokers/XML/<version>/DclIOXML.dpk (install)
    
    Please note that not all brokers are available in all versions
-   of Delphi/Kylix/FPC. If you think you can make a supplied broker
+   of Delphi. If you think you can make a supplied broker
    work in an unsupported version, or create a new broker from scratch
-   then please contact us.
-   
-   NOTE TO DELPHI 5 USERS:
-   dpk files in Delphi 5 have an additional suffix "_D5". This is
-   because Delphi 5 does not support the LIBSUFFIX compiler directive
-   that InstantObjects uses in newer versions of Delphi.
\ No newline at end of file
+   then please contact us.
\ No newline at end of file

Modified: trunk/Readme1st.txt
===================================================================
--- trunk/Readme1st.txt	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Readme1st.txt	2014-05-12 09:08:33 UTC (rev 963)
@@ -1,6 +1,6 @@
 ------------------------------------------------------------------
 
-  InstantObjects for Delphi, Kylix, FPC
+  InstantObjects for Delphi - Full Unicode version
 
   Mozilla Public License 1.1 Edition
   Based on Seleqt InstantObjects.

Modified: trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/ADO/D2010/DclIOADO.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -22,7 +22,6 @@
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<DesignOnlyPackage>true</DesignOnlyPackage>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 			<DllSuffix>_D14</DllSuffix>
 			<DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\7.0\Bpl\DclIOADO_D14.bpl</DCC_DependencyCheckOutputName>
 			<DCC_RangeChecking>true</DCC_RangeChecking>

Modified: trunk/Source/Brokers/ADO/D2010/IOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/D2010/IOADO.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/ADO/D2010/IOADO.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -2,7 +2,7 @@
 		<PropertyGroup>
 			<ProjectGuid>{BF5FCE65-8CE6-49DA-80A0-E55081BF9F72}</ProjectGuid>
 			<MainSource>IOADO.dpk</MainSource>
-			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Config Condition="'$(Config)'==''">Release</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
 			<ProjectVersion>12.0</ProjectVersion>
 		</PropertyGroup>
@@ -21,14 +21,13 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<DCC_ImageBase>00400000</DCC_ImageBase>
-			<DCC_DependencyCheckOutputName>C:\Documents and Settings\All Users\Documents\RAD Studio\7.0\Bpl\IOADO_D14.bpl</DCC_DependencyCheckOutputName>
+			<DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\7.0\Bpl\IOADO_D14.bpl</DCC_DependencyCheckOutputName>
 			<DllSuffix>_D14</DllSuffix>
 			<DCC_WriteableConstants>true</DCC_WriteableConstants>
 			<DCC_Platform>x86</DCC_Platform>
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias>
 			<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
 			<DCC_Description>InstantObjects ADO Run-Time Support (Delphi 2010)</DCC_Description>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 			<DCC_S>false</DCC_S>
 			<DCC_N>false</DCC_N>
 			<GenDll>true</GenDll>

Modified: trunk/Source/Brokers/ADO/DXE3/IOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/DXE3/IOADO.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/ADO/DXE3/IOADO.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>14.3</ProjectVersion>
+        <ProjectVersion>14.4</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

Modified: trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj
===================================================================
--- trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/DBX/D2010/DclIODBX.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -2,7 +2,7 @@
 		<PropertyGroup>
 			<ProjectGuid>{37A94EA0-7FE9-4F18-B639-D0056DB88697}</ProjectGuid>
 			<MainSource>DclIODBX.dpk</MainSource>
-			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Config Condition="'$(Config)'==''">Release</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
 			<ProjectVersion>12.0</ProjectVersion>
 		</PropertyGroup>
@@ -29,7 +29,6 @@
 			<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
 			<GenDll>true</GenDll>
 			<DllSuffix>_D14</DllSuffix>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_Platform>x86</DCC_Platform>
 		</PropertyGroup>

Modified: trunk/Source/Brokers/DBX/D2010/IODBX.dproj
===================================================================
--- trunk/Source/Brokers/DBX/D2010/IODBX.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/DBX/D2010/IODBX.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -2,7 +2,7 @@
 		<PropertyGroup>
 			<ProjectGuid>{99DAEA57-EA95-4709-A5EE-36855F676EB5}</ProjectGuid>
 			<MainSource>IODBX.dpk</MainSource>
-			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Config Condition="'$(Config)'==''">Release</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
 			<ProjectVersion>12.0</ProjectVersion>
 		</PropertyGroup>
@@ -20,14 +20,13 @@
 			<Base>true</Base>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
-			<DCC_DependencyCheckOutputName>C:\Documents and Settings\All Users\Documents\RAD Studio\7.0\Bpl\IODBX_D14.bpl</DCC_DependencyCheckOutputName>
+			<DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\7.0\Bpl\IODBX_D14.bpl</DCC_DependencyCheckOutputName>
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias>
 			<DCC_Description>InstantObjects dbExpress Run-Time Support (Delphi 2010)</DCC_Description>
 			<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
 			<DllSuffix>_D14</DllSuffix>
 			<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
 			<GenDll>true</GenDll>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 			<GenPackage>true</GenPackage>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_Platform>x86</DCC_Platform>

Modified: trunk/Source/Brokers/DBX/DXE3/IODBX.dproj
===================================================================
--- trunk/Source/Brokers/DBX/DXE3/IODBX.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/DBX/DXE3/IODBX.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>14.3</ProjectVersion>
+        <ProjectVersion>14.4</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

Modified: trunk/Source/Brokers/DBX/InstantDBX.pas
===================================================================
--- trunk/Source/Brokers/DBX/InstantDBX.pas	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/DBX/InstantDBX.pas	2014-05-12 09:08:33 UTC (rev 963)
@@ -296,7 +296,7 @@
 implementation
 
 uses
-  SysUtils, InstantDBXConnectionDefEdit, InstantUtils, InstantConsts, Math,
+  SysUtils, InstantDBXConnectionDefEdit, InstantUtils, InstantConsts, Math, InstantClasses,
   InstantDBBuild, InstantIBFbCatalog, InstantMSSqlCatalog, InstantMySQLCatalog;
 
 { TInstantDBXConnector }
@@ -579,9 +579,15 @@
 function TInstantDBXBroker.Execute(const AStatement: string;
   AParams: TParams): Integer;
 begin
+  Result := 0;
   with CreateDataSet(AStatement, AParams) as TSQLQuery do
-    try
+    try try
       Result := ExecSQL;
+    except
+      on E: Exception do
+        raise EInstantError.CreateFmt(SSQLExecuteError,
+          [AStatement, E.Message], E);
+    end;
     finally
       Free;
     end;
@@ -623,6 +629,10 @@
   begin
     Writer.WriteChar('0');
     Result := True;
+  end else if (Copy(Constant.Value,1,1) = '[') and (Copy(Constant.Value,length(Constant.Value),1) = ']') then
+  begin
+    Writer.WriteString(Copy(Constant.Value,2,length(Constant.Value)-2));
+    Result := True;
   end else
     Result := inherited TranslateConstant(Constant, Writer);
 end;
@@ -783,7 +793,7 @@
     ftInteger:
       TargetParam.AsFloat := SourceParam.AsInteger;
     ftCurrency:
-      TargetParam.AsCurrency := SourceParam.AsCurrency;
+      TargetParam.AsBCD := SourceParam.AsCurrency;
     ftFloat:
       TargetParam.AsFloat := SourceParam.AsFloat;
   else

Modified: trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.dfm
===================================================================
--- trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.dfm	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.dfm	2014-05-12 09:08:33 UTC (rev 963)
@@ -103,12 +103,20 @@
     end
     object LoginPromptCheckBox: TCheckBox
       Left = 16
-      Top = 198
+      Top = 187
       Width = 137
       Height = 17
       Caption = '&Login Prompt'
       TabOrder = 2
     end
+    object UseUnicodeCheckBox: TCheckBox
+      Left = 16
+      Top = 205
+      Width = 137
+      Height = 17
+      Caption = '&Use Unicode'
+      TabOrder = 3
+    end
   end
   object BottomPanel: TPanel
     Left = 0

Modified: trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.pas
===================================================================
--- trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.pas	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/DBX/InstantDBXConnectionDefEdit.pas	2014-05-12 09:08:33 UTC (rev 963)
@@ -66,6 +66,7 @@
     StreamFormatLabel: TLabel;
     StreamFormatComboBox: TComboBox;
     LoginPromptCheckBox: TCheckBox;
+    UseUnicodeCheckBox: TCheckBox;
     procedure FormCreate(Sender: TObject);
     procedure DriverNameEditChange(Sender: TObject);
     procedure ConnectionNameListBoxClick(Sender: TObject);
@@ -171,6 +172,7 @@
   //CB
   StreamFormatComboBox.ItemIndex := Ord(ConnectionDef.BlobStreamFormat);
   LoginPromptCheckBox.Checked := ConnectionDef.LoginPrompt;
+  UseUnicodeCheckBox.Checked := ConnectionDef.UseUnicode;
 end;
 
 procedure TInstantDBXConnectionDefEditForm.SaveData(

Modified: trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj
===================================================================
--- trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/IBX/D2010/DclIOIBX.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -2,7 +2,7 @@
 		<PropertyGroup>
 			<ProjectGuid>{982DD2E1-206B-48F0-B7DF-76417E6E6551}</ProjectGuid>
 			<MainSource>DclIOIBX.dpk</MainSource>
-			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Config Condition="'$(Config)'==''">Release</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
 			<ProjectVersion>12.0</ProjectVersion>
 		</PropertyGroup>
@@ -28,7 +28,6 @@
 			<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
 			<GenDll>true</GenDll>
 			<GenPackage>true</GenPackage>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_Platform>x86</DCC_Platform>
 		</PropertyGroup>

Modified: trunk/Source/Brokers/IBX/D2010/IOIBX.dproj
===================================================================
--- trunk/Source/Brokers/IBX/D2010/IOIBX.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/IBX/D2010/IOIBX.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -2,7 +2,7 @@
 		<PropertyGroup>
 			<ProjectGuid>{8520BCA1-97BF-4333-A250-4291F3CFCF0E}</ProjectGuid>
 			<MainSource>IOIBX.dpk</MainSource>
-			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Config Condition="'$(Config)'==''">Release</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
 			<ProjectVersion>12.0</ProjectVersion>
 		</PropertyGroup>
@@ -20,14 +20,13 @@
 			<Base>true</Base>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
-			<DCC_DependencyCheckOutputName>C:\Documents and Settings\All Users\Documents\RAD Studio\7.0\Bpl\IOIBX_D14.bpl</DCC_DependencyCheckOutputName>
+			<DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\7.0\Bpl\IOIBX_D14.bpl</DCC_DependencyCheckOutputName>
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias>
 			<DCC_Description>InstantObjects IBX Run-Time Support (Delphi 2010)</DCC_Description>
 			<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
 			<DllSuffix>_D14</DllSuffix>
 			<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
 			<GenDll>true</GenDll>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 			<GenPackage>true</GenPackage>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_Platform>x86</DCC_Platform>

Modified: trunk/Source/Brokers/IBX/DXE3/IOIBX.dproj
===================================================================
--- trunk/Source/Brokers/IBX/DXE3/IOIBX.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/IBX/DXE3/IOIBX.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>14.3</ProjectVersion>
+        <ProjectVersion>14.4</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

Modified: trunk/Source/Brokers/IBX/InstantIBX.pas
===================================================================
--- trunk/Source/Brokers/IBX/InstantIBX.pas	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/IBX/InstantIBX.pas	2014-05-12 09:08:33 UTC (rev 963)
@@ -506,6 +506,10 @@
   begin
     Writer.WriteChar('0');
     Result := True;
+  end else if (Copy(Constant.Value,1,1) = '[') and (Copy(Constant.Value,length(Constant.Value),1) = ']') then
+  begin
+    Writer.WriteString(Copy(Constant.Value,2,length(Constant.Value)-2));
+    Result := True;
   end else
     Result := inherited TranslateConstant(Constant, Writer);
 end;

Modified: trunk/Source/Brokers/XML/D2010/DclIOXML.dproj
===================================================================
--- trunk/Source/Brokers/XML/D2010/DclIOXML.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/XML/D2010/DclIOXML.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -2,7 +2,7 @@
 		<PropertyGroup>
 			<ProjectGuid>{941A45C1-7205-4184-AE44-782C0AA9BC3C}</ProjectGuid>
 			<MainSource>DclIOXML.dpk</MainSource>
-			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Config Condition="'$(Config)'==''">Release</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
 			<ProjectVersion>12.0</ProjectVersion>
 		</PropertyGroup>
@@ -29,7 +29,6 @@
 			<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
 			<GenDll>true</GenDll>
 			<DllSuffix>_D14</DllSuffix>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_Platform>x86</DCC_Platform>
 		</PropertyGroup>
@@ -81,12 +80,12 @@
 					<VersionInfo>
 						<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
 						<VersionInfo Name="AutoIncBuild">False</VersionInfo>
-						<VersionInfo Name="MajorVer">1</VersionInfo>
-						<VersionInfo Name="MinorVer">0</VersionInfo>
+						<VersionInfo Name="MajorVer">2</VersionInfo>
+						<VersionInfo Name="MinorVer">2</VersionInfo>
 						<VersionInfo Name="Release">0</VersionInfo>
 						<VersionInfo Name="Build">0</VersionInfo>
 						<VersionInfo Name="Debug">False</VersionInfo>
-						<VersionInfo Name="PreRelease">False</VersionInfo>
+						<VersionInfo Name="PreRelease">True</VersionInfo>
 						<VersionInfo Name="Special">False</VersionInfo>
 						<VersionInfo Name="Private">False</VersionInfo>
 						<VersionInfo Name="DLL">False</VersionInfo>
@@ -94,15 +93,15 @@
 						<VersionInfo Name="CodePage">1252</VersionInfo>
 					</VersionInfo>
 					<VersionInfoKeys>
-						<VersionInfoKeys Name="CompanyName"/>
-						<VersionInfoKeys Name="FileDescription"/>
-						<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys>
+						<VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">2.2.0.0</VersionInfoKeys>
 						<VersionInfoKeys Name="InternalName"/>
 						<VersionInfoKeys Name="LegalCopyright"/>
 						<VersionInfoKeys Name="LegalTrademarks"/>
 						<VersionInfoKeys Name="OriginalFilename"/>
-						<VersionInfoKeys Name="ProductName"/>
-						<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys>
+						<VersionInfoKeys Name="ProductVersion">2.2</VersionInfoKeys>
 						<VersionInfoKeys Name="Comments"/>
 					</VersionInfoKeys>
 					<Excluded_Packages>

Modified: trunk/Source/Brokers/XML/D2010/IOXML.dproj
===================================================================
--- trunk/Source/Brokers/XML/D2010/IOXML.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/XML/D2010/IOXML.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -2,7 +2,7 @@
 		<PropertyGroup>
 			<ProjectGuid>{37C4CB77-A037-444C-B2CA-DF45FE103DD3}</ProjectGuid>
 			<MainSource>IOXML.dpk</MainSource>
-			<Config Condition="'$(Config)'==''">Debug</Config>
+			<Config Condition="'$(Config)'==''">Release</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
 			<ProjectVersion>12.0</ProjectVersion>
 		</PropertyGroup>
@@ -20,7 +20,7 @@
 			<Base>true</Base>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
-			<DCC_DependencyCheckOutputName>C:\Documents and Settings\All Users\Documents\RAD Studio\7.0\Bpl\IOXML_D14.bpl</DCC_DependencyCheckOutputName>
+			<DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\7.0\Bpl\IOXML_D14.bpl</DCC_DependencyCheckOutputName>
 			<DCC_TypedAtParameter>true</DCC_TypedAtParameter>
 			<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias>
@@ -29,7 +29,6 @@
 			<GenDll>true</GenDll>
 			<GenPackage>true</GenPackage>
 			<DllSuffix>_D14</DllSuffix>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_Platform>x86</DCC_Platform>
 		</PropertyGroup>

Modified: trunk/Source/Brokers/XML/DXE3/IOXML.dproj
===================================================================
--- trunk/Source/Brokers/XML/DXE3/IOXML.dproj	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/XML/DXE3/IOXML.dproj	2014-05-12 09:08:33 UTC (rev 963)
@@ -7,7 +7,7 @@
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>14.3</ProjectVersion>
+        <ProjectVersion>14.4</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

Modified: trunk/Source/Brokers/XML/InstantXML.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXML.pas	2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/XML/InstantXML.pas	2014-05-12 09:08:33 UTC (rev 963)
@@ -58,11 +58,15 @@
 type
   TXMLFileFormat = (xffUtf8, xffIso);
 
+  TXMLFileOpenEvent = function (const AObject: TInstantObject;
+      const AObjectId, AFileName: string): Boolean of Object;
+
   TXMLFilesAccessor = class(TCustomConnection)
   private
     FConnected: Boolean;
     FRootFolder: string;
     FXMLFileFormat: TXMLFileFormat;
+    FOnCustomLoadXMLFile: TXMLFileOpenEvent;
     function GetRootFolder: string;
     procedure SetRootFolder(const AValue: string);
     function ObjectUpdateCountFromFileName(const AFileName: string): Integer;
@@ -73,8 +77,6 @@
     function GetConnected: Boolean; override;
     // Override this method to redirect storage to different folders with a
     // class-level or object-level granularity.
-    function GetObjectFileName(const AStorageName, AObjectClassName,
-      AObjectId: string): string; virtual;
     function LoadInstantObjectFromXmlFile(const AObject: TInstantObject;
       const AObjectId, AFileName: string): Boolean;
     function SaveInstantObjectToXmlFile(const AObject: TInstantObject;
@@ -97,6 +99,8 @@
     ...
 
[truncated message content]

Thread: [Instantobjects-cvscommit] SF.net SVN: instantobjects:[963] trunk (Page 2)

instantobjects-cvscommit