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: <car...@us...> - 2014-09-03 07:36:46
|
Revision: 966
http://sourceforge.net/p/instantobjects/code/966
Author: carlobar
Date: 2014-09-03 07:36:40 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
Added support for XE7
Modified Paths:
--------------
trunk/Demos/PrimerCross/Main.pas
trunk/Demos/PrimerCross/Primer_D2010.mdr
trunk/Docs/Changes.txt
trunk/Source/Catalogs/MSSql/D2010/IOMSSqlCatalog.dproj
trunk/Source/Catalogs/MSSql/DXE3/IOMSSqlCatalog.dproj
trunk/Source/Catalogs/MySQL/D2010/IOMySQLCatalog.dproj
trunk/Source/Catalogs/MySQL/DXE3/IOMySQLCatalog.dproj
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantMetadata.pas
trunk/Source/Core/InstantTypes.pas
trunk/Source/InstantDefines.inc
trunk/Source/PackageGroups/Install.txt
trunk/Tests/ubmock/src/GuiTestRunner.pas
Added Paths:
-----------
trunk/Demos/PrimerCross/Primer_DXE3_Icon.ico
trunk/Demos/PrimerCross/Primer_DXE5.mdr
trunk/Demos/PrimerCross/Primer_DXE6.mdr
trunk/Demos/PrimerCross/Primer_DXE6_Icon.ico
trunk/Demos/PrimerCross/Primer_DXE7.dpr
trunk/Demos/PrimerCross/Primer_DXE7.dproj
trunk/Demos/PrimerCross/Primer_DXE7.mdr
trunk/Demos/PrimerCross/Primer_DXE7.res
trunk/Demos/PrimerCross/Primer_DXE7.xml
trunk/Demos/PrimerCross/XmlDB/
trunk/Demos/PrimerCross/XmlDB/readme.txt
trunk/Docs/Logo.bmp
trunk/Docs/Logo.jpg
trunk/Docs/instantobjects_logo.gif
trunk/Source/Brokers/ADO/DXE7/
trunk/Source/Brokers/ADO/DXE7/DclIOADO.dpk
trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj
trunk/Source/Brokers/ADO/DXE7/DclIOADO.res
trunk/Source/Brokers/ADO/DXE7/IOADO.dpk
trunk/Source/Brokers/ADO/DXE7/IOADO.dproj
trunk/Source/Brokers/ADO/DXE7/IOADO.res
trunk/Source/Brokers/DBX/DXE7/
trunk/Source/Brokers/DBX/DXE7/DclIODBX.dpk
trunk/Source/Brokers/DBX/DXE7/DclIODBX.dproj
trunk/Source/Brokers/DBX/DXE7/DclIODBX.res
trunk/Source/Brokers/DBX/DXE7/IODBX.dpk
trunk/Source/Brokers/DBX/DXE7/IODBX.dproj
trunk/Source/Brokers/DBX/DXE7/IODBX.res
trunk/Source/Brokers/XML/DXE7/
trunk/Source/Brokers/XML/DXE7/DclIOXML.dpk
trunk/Source/Brokers/XML/DXE7/DclIOXML.dproj
trunk/Source/Brokers/XML/DXE7/DclIOXML.res
trunk/Source/Brokers/XML/DXE7/IOXML.dpk
trunk/Source/Brokers/XML/DXE7/IOXML.dproj
trunk/Source/Brokers/XML/DXE7/IOXML.res
trunk/Source/Catalogs/IBFb/DXE7/
trunk/Source/Catalogs/IBFb/DXE7/IOIBFbCatalog.dpk
trunk/Source/Catalogs/IBFb/DXE7/IOIBFbCatalog.dproj
trunk/Source/Catalogs/IBFb/DXE7/IOIBFbCatalog.res
trunk/Source/Catalogs/MSSql/DXE7/
trunk/Source/Catalogs/MSSql/DXE7/IOMSSqlCatalog.dpk
trunk/Source/Catalogs/MSSql/DXE7/IOMSSqlCatalog.dproj
trunk/Source/Catalogs/MSSql/DXE7/IOMSSqlCatalog.res
trunk/Source/Catalogs/MySQL/DXE7/
trunk/Source/Catalogs/MySQL/DXE7/IOMySQLCatalog.dpk
trunk/Source/Catalogs/MySQL/DXE7/IOMySQLCatalog.dproj
trunk/Source/Catalogs/MySQL/DXE7/IOMySQLCatalog.res
trunk/Source/Core/DXE3/IOCoreRtl.dpk
trunk/Source/Core/DXE3/IOCoreRtl.dproj
trunk/Source/Core/DXE3/IOCoreRtl.res
trunk/Source/Core/DXE5/
trunk/Source/Core/DXE5/IOCore.dpk
trunk/Source/Core/DXE5/IOCore.dproj
trunk/Source/Core/DXE5/IOCore.res
trunk/Source/Core/DXE6/
trunk/Source/Core/DXE6/IOCore.dpk
trunk/Source/Core/DXE6/IOCore.dproj
trunk/Source/Core/DXE6/IOCore.res
trunk/Source/Core/DXE7/
trunk/Source/Core/DXE7/IOCore.dpk
trunk/Source/Core/DXE7/IOCore.dproj
trunk/Source/Core/DXE7/IOCore.res
trunk/Source/Design/DXE7/
trunk/Source/Design/DXE7/DclIOCore.dpk
trunk/Source/Design/DXE7/DclIOCore.dproj
trunk/Source/Design/DXE7/DclIOCore.res
trunk/Source/PackageGroups/DXE7/
trunk/Source/PackageGroups/DXE7/DesignTimePackages.groupproj
trunk/Source/PackageGroups/DXE7/RunTimePackages.groupproj
trunk/Tests/TestIO_DXE5.mdr
trunk/Tests/TestIO_DXE5.mdrt
trunk/Tests/TestIO_DXE6.mdr
trunk/Tests/TestIO_DXE6.mdrt
trunk/Tests/TestIO_DXE7.dpr
trunk/Tests/TestIO_DXE7.dproj
trunk/Tests/TestIO_DXE7.mdr
trunk/Tests/TestIO_DXE7.mdrt
trunk/Tests/TestIO_DXE7.res
Modified: trunk/Demos/PrimerCross/Main.pas
===================================================================
--- trunk/Demos/PrimerCross/Main.pas 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Demos/PrimerCross/Main.pas 2014-09-03 07:36:40 UTC (rev 966)
@@ -149,7 +149,7 @@
{$IFNDEF VER130}
InstantDBX,
{$ENDIF}
- InstantADO, InstantIBX, InstantBDE,
+ InstantADO, InstantIBX,
{$IFDEF D19+}
InstantFireDAC,
{$ENDIF}
Modified: trunk/Demos/PrimerCross/Primer_D2010.mdr
===================================================================
(Binary files differ)
Added: trunk/Demos/PrimerCross/Primer_DXE3_Icon.ico
===================================================================
(Binary files differ)
Index: trunk/Demos/PrimerCross/Primer_DXE3_Icon.ico
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE3_Icon.ico 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Demos/PrimerCross/Primer_DXE3_Icon.ico 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE3_Icon.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE5.mdr
===================================================================
(Binary files differ)
Index: trunk/Demos/PrimerCross/Primer_DXE5.mdr
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE5.mdr 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Demos/PrimerCross/Primer_DXE5.mdr 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE5.mdr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE6.mdr
===================================================================
(Binary files differ)
Index: trunk/Demos/PrimerCross/Primer_DXE6.mdr
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE6.mdr 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Demos/PrimerCross/Primer_DXE6.mdr 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE6.mdr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE6_Icon.ico
===================================================================
(Binary files differ)
Index: trunk/Demos/PrimerCross/Primer_DXE6_Icon.ico
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE6_Icon.ico 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Demos/PrimerCross/Primer_DXE6_Icon.ico 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE6_Icon.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE7.dpr
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE7.dpr (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE7.dpr 2014-09-03 07:36:40 UTC (rev 966)
@@ -0,0 +1,80 @@
+(*
+ * InstantObjects
+ * Primer Demo - with "internal storage" of Part and Parts
+ * Model.pas unit is located in Model folder
+ *
+ *)
+
+(* ***** 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: Seleqt InstantObjects
+ *
+ * The Initial Developer of the Original Code is: Seleqt
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Carlo Barazzetta, Nando Dessena
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+program Primer_DXE7;
+
+{$IFDEF LINUX}
+{$I '../../Source/InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\Source\InstantDefines.inc'}
+{$ENDIF}
+
+
+uses
+ Forms,
+ Main in 'Main.pas' {MainForm},
+ Model in 'Model\Model.pas',
+ ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
+ BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
+ BasicEdit in 'BasicEdit.pas' {BasicEditForm},
+ ContactEdit in 'ContactEdit.pas' {ContactEditForm},
+ PersonEdit in 'PersonEdit.pas' {PersonEditForm},
+ CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm},
+ DemoData in 'DemoData.pas',
+ ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm},
+ MainData in 'MainData.pas' {MainDataModule: TDataModule},
+ ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm},
+ CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm},
+ PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame},
+ Welcome in 'Welcome.pas' {WelcomeForm},
+ PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm},
+ BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm},
+ CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm},
+ DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm},
+ 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';
+
+{$R *.res}
+{$R *.mdr} {Model}
+
+begin
+ Application.Initialize;
+ Application.Title := 'InstantObjects Primer Demo (Delphi XE7 version)';
+ Application.CreateForm(TMainForm, MainForm);
+ Application.CreateForm(TMainDataModule, MainDataModule);
+ Application.Run;
+end.
Property changes on: trunk/Demos/PrimerCross/Primer_DXE7.dpr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE7.dproj
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE7.dproj (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE7.dproj 2014-09-03 07:36:40 UTC (rev 966)
@@ -0,0 +1,523 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid>
+ <MainSource>Primer_DXE7.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName>
+ <ProjectVersion>16.0</ProjectVersion>
+ <Config Condition="'$(Config)'==''">Release</Config>
+ <Base>True</Base>
+ <AppType>Application</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+ <Cfg_1_Win32>true</Cfg_1_Win32>
+ <CfgParent>Cfg_1</CfgParent>
+ <Cfg_1>true</Cfg_1>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <SanitizedProjectName>Primer_DXE7</SanitizedProjectName>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;IBX;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_MajorVer>2</VerInfo_MajorVer>
+ <VerInfo_Locale>1030</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\FireDAC;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+ <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage>
+ <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_MajorVer>1</VerInfo_MajorVer>
+ <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+ <Icon_MainIcon>Primer_DXE6_Icon.ico</Icon_MainIcon>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_MajorVer>1</VerInfo_MajorVer>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_DebugDCUs>true</DCC_DebugDCUs>
+ <Version>7.0</Version>
+ <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_MajorVer>1</VerInfo_MajorVer>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <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 Name="LegalCopyright">MPL public license</VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"/>
+ <VersionInfoKeys Name="OriginalFilename"/>
+ <VersionInfoKeys Name="ProductName"/>
+ <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"/>
+ </VersionInfoKeys>
+ <Source>
+ <Source Name="MainSource">Primer_DXE7.dpr</Source>
+ </Source>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k200.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp200.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <ModelSupport>False</ModelSupport>
+ <Platforms>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ <Deployment>
+ <DeployFile LocalName="Primer_DXE7.exe" Configuration="Release" Class="ProjectOutput">
+ <Platform Name="Win32">
+ <RemoteName>Primer_DXE7.exe</RemoteName>
+ <Overwrite>true</Overwrite>
+ </Platform>
+ </DeployFile>
+ <DeployClass Required="true" Name="DependencyPackage">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ <Extensions>.dylib</Extensions>
+ </Platform>
+ <Platform Name="Win32">
+ <Operation>0</Operation>
+ <Extensions>.bpl</Extensions>
+ </Platform>
+ <Platform Name="OSX32">
+ <Operation>1</Operation>
+ <Extensions>.dylib</Extensions>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ <Extensions>.dylib</Extensions>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="DependencyModule">
+ <Platform Name="OSX32">
+ <Operation>1</Operation>
+ <Extensions>.dylib</Extensions>
+ </Platform>
+ <Platform Name="Win32">
+ <Operation>0</Operation>
+ <Extensions>.dll;.bpl</Extensions>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch2048">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="ProjectOSXInfoPList"/>
+ <DeployClass Name="ProjectiOSDeviceDebug">
+ <Platform Name="iOSDevice">
+ <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_SplashImage470">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-normal</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="AndroidLibnativeX86File">
+ <Platform Name="Android">
+ <RemoteDir>library\lib\x86</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="ProjectiOSResource">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="ProjectOSXEntitlements"/>
+ <DeployClass Name="AndroidGDBServer">
+ <Platform Name="Android">
+ <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch640">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_SplashImage960">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xlarge</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_LauncherIcon96">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch320">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_LauncherIcon144">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="AndroidLibnativeMipsFile">
+ <Platform Name="Android">
+ <RemoteDir>library\lib\mips</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="AndroidSplashImageDef">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="DebugSymbols">
+ <Platform Name="OSX32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="Win32">
+ <Operation>0</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="DependencyFramework">
+ <Platform Name="OSX32">
+ <Operation>1</Operation>
+ <Extensions>.framework</Extensions>
+ </Platform>
+ <Platform Name="Win32">
+ <Operation>0</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="ProjectiOSEntitlements"/>
+ <DeployClass Name="AdditionalDebugSymbols">
+ <Platform Name="OSX32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="Win32">
+ <RemoteDir>Contents\MacOS</RemoteDir>
+ <Operation>0</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="AndroidClassesDexFile">
+ <Platform Name="Android">
+ <RemoteDir>classes</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="ProjectiOSInfoPList"/>
+ <DeployClass Name="iPad_Launch1024">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_DefaultAppIcon">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="ProjectOSXResource">
+ <Platform Name="OSX32">
+ <RemoteDir>Contents\Resources</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+ <DeployClass Name="iPad_Launch768">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Required="true" Name="ProjectOutput">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="Android">
+ <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="Win32">
+ <Operation>0</Operation>
+ </Platform>
+ <Platform Name="OSX32">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="AndroidLibnativeArmeabiFile">
+ <Platform Name="Android">
+ <RemoteDir>library\lib\armeabi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_SplashImage640">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-large</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="File">
+ <Platform Name="iOSDevice">
+ <Operation>0</Operation>
+ </Platform>
+ <Platform Name="Android">
+ <Operation>0</Operation>
+ </Platform>
+ <Platform Name="Win32">
+ <Operation>0</Operation>
+ </Platform>
+ <Platform Name="OSX32">
+ <Operation>0</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>0</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPhone_Launch640x1136">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_LauncherIcon36">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-ldpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="AndroidSplashStyles">
+ <Platform Name="Android">
+ <RemoteDir>res\values</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="iPad_Launch1536">
+ <Platform Name="iOSDevice">
+ <Operation>1</Operation>
+ </Platform>
+ <Platform Name="iOSSimulator">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_LauncherIcon48">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-mdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="Android_LauncherIcon72">
+ <Platform Name="Android">
+ <RemoteDir>res\drawable-hdpi</RemoteDir>
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <DeployClass Name="ProjectAndroidManifest">
+ <Platform Name="Android">
+ <Operation>1</Operation>
+ </Platform>
+ </DeployClass>
+ <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
+ <ProjectRoot Platform="iOSDevice" Name="$(PROJECTNAME).app"/>
+ <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+ <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
+ <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
+ <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+ </Deployment>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="Main.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="Model\Model.pas"/>
+ <DCCReference Include="ContactView.pas">
+ <Form>ContactViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicView.pas">
+ <Form>BasicViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicEdit.pas">
+ <Form>BasicEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEdit.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonEdit.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyEdit.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoData.pas"/>
+ <DCCReference Include="ContactFilterEdit.pas">
+ <Form>ContactFilterEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="MainData.pas">
+ <Form>MainDataModule</Form>
+ <DesignClass>TDataModule</DesignClass>
+ </DCCReference>
+ <DCCReference Include="ContactBrowse.pas">
+ <Form>ContactBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyBrowse.pas">
+ <Form>CompanyBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="PerformanceView.pas">
+ <Form>PerformanceViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="Welcome.pas">
+ <Form>WelcomeForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonBrowse.pas">
+ <Form>PersonBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicBrowse.pas">
+ <Form>BasicBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CountryBrowse.pas">
+ <Form>CountryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoDataRequest.pas">
+ <Form>DemoDataRequestForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactSort.pas">
+ <Form>ContactSortForm</Form>
+ </DCCReference>
+ <DCCReference Include="CategoryBrowse.pas">
+ <Form>CategoryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="HelpView.pas">
+ <Form>HelpViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="QueryView.pas">
+ <Form>QueryViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="RandomData.pas"/>
+ <DCCReference Include="Stopwatch.pas"/>
+ <DCCReference Include="Utility.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+ <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
+</Project>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE7.dproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE7.mdr
===================================================================
(Binary files differ)
Index: trunk/Demos/PrimerCross/Primer_DXE7.mdr
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE7.mdr 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Demos/PrimerCross/Primer_DXE7.mdr 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE7.mdr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE7.res
===================================================================
(Binary files differ)
Index: trunk/Demos/PrimerCross/Primer_DXE7.res
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE7.res 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Demos/PrimerCross/Primer_DXE7.res 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE7.res
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE7.xml
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE7.xml (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE7.xml 2014-09-03 07:36:40 UTC (rev 966)
@@ -0,0 +1,54 @@
+<TInstantConnectionDefs>
+ <TInstantIBXConnectionDef>
+ <Name>IBX_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <ConnectionString>127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\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>DBX_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <ConnectionName>FBConnection</ConnectionName>
+ <DriverName>Firebird</DriverName>
+ <Params>DriverName=Firebird
+Database=127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\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>
+ <TInstantFireDACConnectionDef>
+ <Name>FireDAC_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <Database>C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</Database>
+ <HostName>127.0.0.1</HostName>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <Password>masterkey</Password>
+ <Port>0</Port>
+ <Protocol>FB</Protocol>
+ <UseDelimitedIdents>FALSE</UseDelimitedIdents>
+ <UserName>SYSDBA</UserName>
+ </TInstantFireDACConnectionDef>
+</TInstantConnectionDefs>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE7.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Demos/PrimerCross/XmlDB/readme.txt
===================================================================
--- trunk/Demos/PrimerCross/XmlDB/readme.txt (rev 0)
+++ trunk/Demos/PrimerCross/XmlDB/readme.txt 2014-09-03 07:36:40 UTC (rev 966)
@@ -0,0 +1 @@
+Xml-DB databases folder for Primer demos, if you are using default connection definitions.
Property changes on: trunk/Demos/PrimerCross/XmlDB/readme.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Docs/Changes.txt
===================================================================
--- trunk/Docs/Changes.txt 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Docs/Changes.txt 2014-09-03 07:36:40 UTC (rev 966)
@@ -1,6 +1,8 @@
VERSION HISTORY
---------------
+- Added support for Delphi XE7
+
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
Added: trunk/Docs/Logo.bmp
===================================================================
(Binary files differ)
Index: trunk/Docs/Logo.bmp
===================================================================
--- trunk/Docs/Logo.bmp 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Docs/Logo.bmp 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Docs/Logo.bmp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Docs/Logo.jpg
===================================================================
(Binary files differ)
Index: trunk/Docs/Logo.jpg
===================================================================
--- trunk/Docs/Logo.jpg 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Docs/Logo.jpg 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Docs/Logo.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Docs/instantobjects_logo.gif
===================================================================
(Binary files differ)
Index: trunk/Docs/instantobjects_logo.gif
===================================================================
--- trunk/Docs/instantobjects_logo.gif 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Docs/instantobjects_logo.gif 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Docs/instantobjects_logo.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Source/Brokers/ADO/DXE7/DclIOADO.dpk
===================================================================
--- trunk/Source/Brokers/ADO/DXE7/DclIOADO.dpk (rev 0)
+++ trunk/Source/Brokers/ADO/DXE7/DclIOADO.dpk 2014-09-03 07:36:40 UTC (rev 966)
@@ -0,0 +1,41 @@
+package DclIOADO;
+
+{$R *.res}
+{$R '..\InstantADO.dcr'}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS ON}
+{$RANGECHECKS ON}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects ADO Design-Time Support (Delphi XE7)'}
+{$LIBSUFFIX '_D21'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ rtl,
+ IOADO;
+
+contains
+ InstantADOReg in '..\InstantADOReg.pas';
+
+end.
Property changes on: trunk/Source/Brokers/ADO/DXE7/DclIOADO.dpk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj (rev 0)
+++ trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj 2014-09-03 07:36:40 UTC (rev 966)
@@ -0,0 +1,162 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{25086FF7-139E-40BB-9278-EDE3F344302B}</ProjectGuid>
+ <MainSource>DclIOADO.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>16.0</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
+ <Base_Android>true</Base_Android>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <SanitizedProjectName>DclIOADO</SanitizedProjectName>
+ <DesignOnlyPackage>true</DesignOnlyPackage>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects ADO Design-Time Support (Delphi XE6)</DCC_Description>
+ <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
+ <DCC_RangeChecking>true</DCC_RangeChecking>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <DCC_F>false</DCC_F>
+ <GenPackage>true</GenPackage>
+ <DllSuffix>_D20</DllSuffix>
+ <DCC_E>false</DCC_E>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Android)'!=''">
+ <BT_BuildType>Debug</BT_BuildType>
+ <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <DCC_UsePackage>IOADO;$(DCC_UsePackage)</DCC_UsePackage>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <DCC_Description>InstantObjects ADO Design-Time Support (Delphi XE7)</DCC_Description>
+ <DllSuffix>_D21</DllSuffix>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantADO.dcr"/>
+ <DCCReference Include="rtl.dcp"/>
+ <DCCReference Include="IOADO.dcp"/>
+ <DCCReference Include="..\InstantADOReg.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">DclIOADO.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k210.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp210.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Android" ActiveMobileDevice="4df786101d45bf99">False</Platform>
+ <Platform value="iOSDevice">False</Platform>
+ <Platform value="iOSSimulator">False</Platform>
+ <Platform value="OSX32">False</Platform>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Source/Brokers/ADO/DXE7/DclIOADO.dproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/ADO/DXE7/DclIOADO.res
===================================================================
(Binary files differ)
Index: trunk/Source/Brokers/ADO/DXE7/DclIOADO.res
===================================================================
--- trunk/Source/Brokers/ADO/DXE7/DclIOADO.res 2014-05-12 10:07:50 UTC (rev 965)
+++ trunk/Source/Brokers/ADO/DXE7/DclIOADO.res 2014-09-03 07:36:40 UTC (rev 966)
Property changes on: trunk/Source/Brokers/ADO/DXE7/DclIOADO.res
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Source/Brokers/ADO/DXE7/IOADO.dpk
===================================================================
--- trunk/Source/Brokers/ADO/DXE7/IOADO.dpk (rev 0)
+++ trunk/Source/Brokers/ADO/DXE7/IOADO.dpk 2014-09-03 07:36:40 UTC (rev 966)
@@ -0,0 +1,47 @@
+package IOADO;
+
+{$R *.res}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects ADO Run-Time Support (Delphi XE7)'}
+{$LIBSUFFIX '_D21'}
+{$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.
Property changes on: trunk/Source/Brokers/ADO/DXE7/IOADO.dpk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/ADO/DXE7/IOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/DXE7/IOADO.dproj (rev 0)
+++ trunk/Source/Brokers/ADO/DXE7/IOADO.dproj 2014-09-03 07:36:40 UTC (rev 966)
@@ -0,0 +1,174 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{A15C8D03-E537-4203-982B-A812DB31354A}</ProjectGuid>
+ <MainSource>IOADO.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <ProjectVersion>16.0</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
+ <Base_Android>true</Base_Android>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ ...
[truncated message content] |
|
From: <car...@us...> - 2014-05-12 10:07:57
|
Revision: 965
http://sourceforge.net/p/instantobjects/code/965
Author: carlobar
Date: 2014-05-12 10:07:50 +0000 (Mon, 12 May 2014)
Log Message:
-----------
Added support for Delphi XE5 and XE6
Added Paths:
-----------
trunk/Demos/PrimerCross/Primer_DXE5.dpr
trunk/Demos/PrimerCross/Primer_DXE5.dproj
trunk/Demos/PrimerCross/Primer_DXE5.res
trunk/Demos/PrimerCross/Primer_DXE5.xml
trunk/Demos/PrimerCross/Primer_DXE6.dpr
trunk/Demos/PrimerCross/Primer_DXE6.dproj
trunk/Demos/PrimerCross/Primer_DXE6.res
trunk/Demos/PrimerCross/Primer_DXE6.xml
trunk/Docs/VirtualContainers.txt
trunk/Source/Brokers/ADO/DXE5/
trunk/Source/Brokers/ADO/DXE5/DclIOADO.dpk
trunk/Source/Brokers/ADO/DXE5/DclIOADO.dproj
trunk/Source/Brokers/ADO/DXE5/DclIOADO.res
trunk/Source/Brokers/ADO/DXE5/IOADO.dpk
trunk/Source/Brokers/ADO/DXE5/IOADO.dproj
trunk/Source/Brokers/ADO/DXE5/IOADO.res
trunk/Source/Brokers/ADO/DXE6/
trunk/Source/Brokers/ADO/DXE6/DclIOADO.dpk
trunk/Source/Brokers/ADO/DXE6/DclIOADO.dproj
trunk/Source/Brokers/ADO/DXE6/DclIOADO.res
trunk/Source/Brokers/ADO/DXE6/IOADO.dpk
trunk/Source/Brokers/ADO/DXE6/IOADO.dproj
trunk/Source/Brokers/ADO/DXE6/IOADO.res
trunk/Source/Brokers/DBX/DXE5/
trunk/Source/Brokers/DBX/DXE5/DclIODBX.dpk
trunk/Source/Brokers/DBX/DXE5/DclIODBX.dproj
trunk/Source/Brokers/DBX/DXE5/DclIODBX.res
trunk/Source/Brokers/DBX/DXE5/IODBX.dpk
trunk/Source/Brokers/DBX/DXE5/IODBX.dproj
trunk/Source/Brokers/DBX/DXE5/IODBX.res
trunk/Source/Brokers/DBX/DXE6/
trunk/Source/Brokers/DBX/DXE6/DclIODBX.dpk
trunk/Source/Brokers/DBX/DXE6/DclIODBX.dproj
trunk/Source/Brokers/DBX/DXE6/DclIODBX.res
trunk/Source/Brokers/DBX/DXE6/IODBX.dpk
trunk/Source/Brokers/DBX/DXE6/IODBX.dproj
trunk/Source/Brokers/DBX/DXE6/IODBX.res
trunk/Source/Brokers/IBX/DXE5/
trunk/Source/Brokers/IBX/DXE5/DclIOIBX.dpk
trunk/Source/Brokers/IBX/DXE5/DclIOIBX.dproj
trunk/Source/Brokers/IBX/DXE5/DclIOIBX.res
trunk/Source/Brokers/IBX/DXE5/IOIBX.dpk
trunk/Source/Brokers/IBX/DXE5/IOIBX.dproj
trunk/Source/Brokers/IBX/DXE5/IOIBX.res
trunk/Source/Brokers/IBX/DXE6/
trunk/Source/Brokers/IBX/DXE6/DclIOIBX.dpk
trunk/Source/Brokers/IBX/DXE6/DclIOIBX.dproj
trunk/Source/Brokers/IBX/DXE6/DclIOIBX.res
trunk/Source/Brokers/IBX/DXE6/IOIBX.dpk
trunk/Source/Brokers/IBX/DXE6/IOIBX.dproj
trunk/Source/Brokers/IBX/DXE6/IOIBX.res
trunk/Source/Brokers/XML/DXE5/
trunk/Source/Brokers/XML/DXE5/DclIOXML.dpk
trunk/Source/Brokers/XML/DXE5/DclIOXML.dproj
trunk/Source/Brokers/XML/DXE5/DclIOXML.res
trunk/Source/Brokers/XML/DXE5/IOXML.dpk
trunk/Source/Brokers/XML/DXE5/IOXML.dproj
trunk/Source/Brokers/XML/DXE5/IOXML.res
trunk/Source/Brokers/XML/DXE6/
trunk/Source/Brokers/XML/DXE6/DclIOXML.dpk
trunk/Source/Brokers/XML/DXE6/DclIOXML.dproj
trunk/Source/Brokers/XML/DXE6/DclIOXML.res
trunk/Source/Brokers/XML/DXE6/IOXML.dpk
trunk/Source/Brokers/XML/DXE6/IOXML.dproj
trunk/Source/Brokers/XML/DXE6/IOXML.res
trunk/Source/Catalogs/IBFb/DXE5/
trunk/Source/Catalogs/IBFb/DXE5/IOIBFbCatalog.dpk
trunk/Source/Catalogs/IBFb/DXE5/IOIBFbCatalog.dproj
trunk/Source/Catalogs/IBFb/DXE5/IOIBFbCatalog.res
trunk/Source/Catalogs/IBFb/DXE6/
trunk/Source/Catalogs/IBFb/DXE6/IOIBFbCatalog.dpk
trunk/Source/Catalogs/IBFb/DXE6/IOIBFbCatalog.dproj
trunk/Source/Catalogs/IBFb/DXE6/IOIBFbCatalog.res
trunk/Source/Catalogs/MSSql/DXE5/
trunk/Source/Catalogs/MSSql/DXE5/IOMSSqlCatalog.dpk
trunk/Source/Catalogs/MSSql/DXE5/IOMSSqlCatalog.dproj
trunk/Source/Catalogs/MSSql/DXE5/IOMSSqlCatalog.res
trunk/Source/Catalogs/MSSql/DXE6/
trunk/Source/Catalogs/MSSql/DXE6/IOMSSqlCatalog.dpk
trunk/Source/Catalogs/MSSql/DXE6/IOMSSqlCatalog.dproj
trunk/Source/Catalogs/MSSql/DXE6/IOMSSqlCatalog.res
trunk/Source/Catalogs/MySQL/DXE5/
trunk/Source/Catalogs/MySQL/DXE5/IOMySQLCatalog.dpk
trunk/Source/Catalogs/MySQL/DXE5/IOMySQLCatalog.dproj
trunk/Source/Catalogs/MySQL/DXE5/IOMySQLCatalog.res
trunk/Source/Catalogs/MySQL/DXE6/
trunk/Source/Catalogs/MySQL/DXE6/IOMySQLCatalog.dpk
trunk/Source/Catalogs/MySQL/DXE6/IOMySQLCatalog.dproj
trunk/Source/Catalogs/MySQL/DXE6/IOMySQLCatalog.res
trunk/Source/Core/InstantPumpConnectionManagerFormUnit.dfm
trunk/Source/Core/InstantPumpConnectionManagerFormUnit.pas
trunk/Source/Design/DXE5/
trunk/Source/Design/DXE5/DclIOCore.dpk
trunk/Source/Design/DXE5/DclIOCore.dproj
trunk/Source/Design/DXE5/DclIOCore.res
trunk/Source/Design/DXE6/
trunk/Source/Design/DXE6/DclIOCore.dpk
trunk/Source/Design/DXE6/DclIOCore.dproj
trunk/Source/Design/DXE6/DclIOCore.res
trunk/Source/PackageGroups/DXE5/
trunk/Source/PackageGroups/DXE5/DesignTimePackages.groupproj
trunk/Source/PackageGroups/DXE5/RunTimePackages.groupproj
trunk/Source/PackageGroups/DXE6/
trunk/Source/PackageGroups/DXE6/DesignTimePackages.groupproj
trunk/Source/PackageGroups/DXE6/RunTimePackages.groupproj
trunk/Tests/TestIO_D2010.dpr
trunk/Tests/TestIO_D2010.dproj
trunk/Tests/TestIO_D2010.res
trunk/Tests/TestIO_DXE5.dpr
trunk/Tests/TestIO_DXE5.dproj
trunk/Tests/TestIO_DXE5.res
trunk/Tests/TestIO_DXE6.dpr
trunk/Tests/TestIO_DXE6.dproj
trunk/Tests/TestIO_DXE6.res
trunk/Tests/TestInstantExposer.pas
Added: trunk/Demos/PrimerCross/Primer_DXE5.dpr
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE5.dpr (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE5.dpr 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,80 @@
+(*
+ * InstantObjects
+ * Primer Demo - with "internal storage" of Part and Parts
+ * Model.pas unit is located in Model folder
+ *
+ *)
+
+(* ***** 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: Seleqt InstantObjects
+ *
+ * The Initial Developer of the Original Code is: Seleqt
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Carlo Barazzetta, Nando Dessena
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+program Primer_DXE5;
+
+{$IFDEF LINUX}
+{$I '../../Source/InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\Source\InstantDefines.inc'}
+{$ENDIF}
+
+
+uses
+ Forms,
+ Main in 'Main.pas' {MainForm},
+ Model in 'Model\Model.pas',
+ ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
+ BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
+ BasicEdit in 'BasicEdit.pas' {BasicEditForm},
+ ContactEdit in 'ContactEdit.pas' {ContactEditForm},
+ PersonEdit in 'PersonEdit.pas' {PersonEditForm},
+ CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm},
+ DemoData in 'DemoData.pas',
+ ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm},
+ MainData in 'MainData.pas' {MainDataModule: TDataModule},
+ ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm},
+ CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm},
+ PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame},
+ Welcome in 'Welcome.pas' {WelcomeForm},
+ PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm},
+ BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm},
+ CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm},
+ DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm},
+ 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';
+
+{$R *.res}
+{$R *.mdr} {Model}
+
+begin
+ Application.Initialize;
+ Application.Title := 'InstantObjects Primer Demo (Delphi XE5 version)';
+ Application.CreateForm(TMainForm, MainForm);
+ Application.CreateForm(TMainDataModule, MainDataModule);
+ Application.Run;
+end.
Property changes on: trunk/Demos/PrimerCross/Primer_DXE5.dpr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE5.dproj
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE5.dproj (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE5.dproj 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,234 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid>
+ <MainSource>Primer_DXE5.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName>
+ <ProjectVersion>15.3</ProjectVersion>
+ <Config Condition="'$(Config)'==''">Release</Config>
+ <Base>True</Base>
+ <AppType>Application</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+ <Cfg_1_Win32>true</Cfg_1_Win32>
+ <CfgParent>Cfg_1</CfgParent>
+ <Cfg_1>true</Cfg_1>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <Icon_MainIcon>Primer_DXE3_Icon.ico</Icon_MainIcon>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_MajorVer>2</VerInfo_MajorVer>
+ <VerInfo_Locale>1030</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\FireDAC;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+ <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage>
+ <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_DebugDCUs>true</DCC_DebugDCUs>
+ <Version>7.0</Version>
+ <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ <VerInfo_MajorVer>1</VerInfo_MajorVer>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <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 Name="LegalCopyright">MPL public license</VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"/>
+ <VersionInfoKeys Name="OriginalFilename"/>
+ <VersionInfoKeys Name="ProductName"/>
+ <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"/>
+ </VersionInfoKeys>
+ <Source>
+ <Source Name="MainSource">Primer_DXE5.dpr</Source>
+ </Source>
+ <Excluded_Packages>
+ <Excluded_Packages Name="C:\Users\Public\Documents\RAD Studio\12.0\Bpl\UniSynEdit_DXE5.bpl">File C:\Users\Public\Documents\RAD Studio\12.0\Bpl\UniSynEdit_DXE5.bpl not found</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp190.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <ModelSupport>False</ModelSupport>
+ <Platforms>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="Main.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="Model\Model.pas"/>
+ <DCCReference Include="ContactView.pas">
+ <Form>ContactViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicView.pas">
+ <Form>BasicViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicEdit.pas">
+ <Form>BasicEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEdit.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonEdit.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyEdit.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoData.pas"/>
+ <DCCReference Include="ContactFilterEdit.pas">
+ <Form>ContactFilterEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="MainData.pas">
+ <Form>MainDataModule</Form>
+ <DesignClass>TDataModule</DesignClass>
+ </DCCReference>
+ <DCCReference Include="ContactBrowse.pas">
+ <Form>ContactBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyBrowse.pas">
+ <Form>CompanyBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="PerformanceView.pas">
+ <Form>PerformanceViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="Welcome.pas">
+ <Form>WelcomeForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonBrowse.pas">
+ <Form>PersonBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicBrowse.pas">
+ <Form>BasicBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CountryBrowse.pas">
+ <Form>CountryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoDataRequest.pas">
+ <Form>DemoDataRequestForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactSort.pas">
+ <Form>ContactSortForm</Form>
+ </DCCReference>
+ <DCCReference Include="CategoryBrowse.pas">
+ <Form>CategoryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="HelpView.pas">
+ <Form>HelpViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="QueryView.pas">
+ <Form>QueryViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="RandomData.pas"/>
+ <DCCReference Include="Stopwatch.pas"/>
+ <DCCReference Include="Utility.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE5.dproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE5.res
===================================================================
(Binary files differ)
Index: trunk/Demos/PrimerCross/Primer_DXE5.res
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE5.res 2014-05-12 09:37:17 UTC (rev 964)
+++ trunk/Demos/PrimerCross/Primer_DXE5.res 2014-05-12 10:07:50 UTC (rev 965)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE5.res
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE5.xml
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE5.xml (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE5.xml 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,54 @@
+<TInstantConnectionDefs>
+ <TInstantIBXConnectionDef>
+ <Name>IBX_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <ConnectionString>127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\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>DBX_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <ConnectionName>FBConnection</ConnectionName>
+ <DriverName>Firebird</DriverName>
+ <Params>DriverName=Firebird
+Database=127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\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>
+ <TInstantFireDACConnectionDef>
+ <Name>FireDAC_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <Database>C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</Database>
+ <HostName>127.0.0.1</HostName>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <Password>masterkey</Password>
+ <Port>0</Port>
+ <Protocol>FB</Protocol>
+ <UseDelimitedIdents>FALSE</UseDelimitedIdents>
+ <UserName>SYSDBA</UserName>
+ </TInstantFireDACConnectionDef>
+</TInstantConnectionDefs>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE5.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE6.dpr
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE6.dpr (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE6.dpr 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,80 @@
+(*
+ * InstantObjects
+ * Primer Demo - with "internal storage" of Part and Parts
+ * Model.pas unit is located in Model folder
+ *
+ *)
+
+(* ***** 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: Seleqt InstantObjects
+ *
+ * The Initial Developer of the Original Code is: Seleqt
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Carlo Barazzetta, Nando Dessena
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+program Primer_DXE6;
+
+{$IFDEF LINUX}
+{$I '../../Source/InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\Source\InstantDefines.inc'}
+{$ENDIF}
+
+
+uses
+ Forms,
+ Main in 'Main.pas' {MainForm},
+ Model in 'Model\Model.pas',
+ ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
+ BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
+ BasicEdit in 'BasicEdit.pas' {BasicEditForm},
+ ContactEdit in 'ContactEdit.pas' {ContactEditForm},
+ PersonEdit in 'PersonEdit.pas' {PersonEditForm},
+ CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm},
+ DemoData in 'DemoData.pas',
+ ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm},
+ MainData in 'MainData.pas' {MainDataModule: TDataModule},
+ ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm},
+ CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm},
+ PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame},
+ Welcome in 'Welcome.pas' {WelcomeForm},
+ PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm},
+ BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm},
+ CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm},
+ DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm},
+ 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';
+
+{$R *.res}
+{$R *.mdr} {Model}
+
+begin
+ Application.Initialize;
+ Application.Title := 'InstantObjects Primer Demo (Delphi XE6 version)';
+ Application.CreateForm(TMainForm, MainForm);
+ Application.CreateForm(TMainDataModule, MainDataModule);
+ Application.Run;
+end.
Property changes on: trunk/Demos/PrimerCross/Primer_DXE6.dpr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE6.dproj
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE6.dproj (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE6.dproj 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,234 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid>
+ <MainSource>Primer_DXE6.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName>
+ <ProjectVersion>15.4</ProjectVersion>
+ <Config Condition="'$(Config)'==''">Release</Config>
+ <Base>True</Base>
+ <AppType>Application</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+ <Cfg_1_Win32>true</Cfg_1_Win32>
+ <CfgParent>Cfg_1</CfgParent>
+ <Cfg_1>true</Cfg_1>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <SanitizedProjectName>Primer_DXE6</SanitizedProjectName>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;IBX;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_MajorVer>2</VerInfo_MajorVer>
+ <VerInfo_Locale>1030</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
+ <DCC_UnitSearchPath>..\..\Source\Core;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\DBX;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\FireDAC;..\..\Source\Catalogs\IBFb;..\..\Source\Catalogs\MSSql;..\..\Source\Catalogs\MySql;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+ <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage>
+ <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_MajorVer>1</VerInfo_MajorVer>
+ <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+ <Icon_MainIcon>Primer_DXE6_Icon.ico</Icon_MainIcon>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_MajorVer>1</VerInfo_MajorVer>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_DebugDCUs>true</DCC_DebugDCUs>
+ <Version>7.0</Version>
+ <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_MajorVer>1</VerInfo_MajorVer>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <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 Name="LegalCopyright">MPL public license</VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"/>
+ <VersionInfoKeys Name="OriginalFilename"/>
+ <VersionInfoKeys Name="ProductName"/>
+ <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"/>
+ </VersionInfoKeys>
+ <Source>
+ <Source Name="MainSource">Primer_DXE6.dpr</Source>
+ </Source>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k200.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp200.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <ModelSupport>False</ModelSupport>
+ <Platforms>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="Main.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="Model\Model.pas"/>
+ <DCCReference Include="ContactView.pas">
+ <Form>ContactViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicView.pas">
+ <Form>BasicViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicEdit.pas">
+ <Form>BasicEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEdit.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonEdit.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyEdit.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoData.pas"/>
+ <DCCReference Include="ContactFilterEdit.pas">
+ <Form>ContactFilterEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="MainData.pas">
+ <Form>MainDataModule</Form>
+ <DesignClass>TDataModule</DesignClass>
+ </DCCReference>
+ <DCCReference Include="ContactBrowse.pas">
+ <Form>ContactBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyBrowse.pas">
+ <Form>CompanyBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="PerformanceView.pas">
+ <Form>PerformanceViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="Welcome.pas">
+ <Form>WelcomeForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonBrowse.pas">
+ <Form>PersonBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicBrowse.pas">
+ <Form>BasicBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CountryBrowse.pas">
+ <Form>CountryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoDataRequest.pas">
+ <Form>DemoDataRequestForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactSort.pas">
+ <Form>ContactSortForm</Form>
+ </DCCReference>
+ <DCCReference Include="CategoryBrowse.pas">
+ <Form>CategoryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="HelpView.pas">
+ <Form>HelpViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="QueryView.pas">
+ <Form>QueryViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="RandomData.pas"/>
+ <DCCReference Include="Stopwatch.pas"/>
+ <DCCReference Include="Utility.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE6.dproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE6.res
===================================================================
(Binary files differ)
Index: trunk/Demos/PrimerCross/Primer_DXE6.res
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE6.res 2014-05-12 09:37:17 UTC (rev 964)
+++ trunk/Demos/PrimerCross/Primer_DXE6.res 2014-05-12 10:07:50 UTC (rev 965)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE6.res
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Demos/PrimerCross/Primer_DXE6.xml
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE6.xml (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE6.xml 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,54 @@
+<TInstantConnectionDefs>
+ <TInstantIBXConnectionDef>
+ <Name>IBX_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <ConnectionString>127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\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>DBX_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <ConnectionName>FBConnection</ConnectionName>
+ <DriverName>Firebird</DriverName>
+ <Params>DriverName=Firebird
+Database=127.0.0.1:C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\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>
+ <TInstantFireDACConnectionDef>
+ <Name>FireDAC_Firebird</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <Database>C:\ETHEA\ISF6\InstantObjects\Demos\PrimerCross\FirebirdDB\PRIMERDB.FDB</Database>
+ <HostName>127.0.0.1</HostName>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <Password>masterkey</Password>
+ <Port>0</Port>
+ <Protocol>FB</Protocol>
+ <UseDelimitedIdents>FALSE</UseDelimitedIdents>
+ <UserName>SYSDBA</UserName>
+ </TInstantFireDACConnectionDef>
+</TInstantConnectionDefs>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE6.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Docs/VirtualContainers.txt
===================================================================
--- trunk/Docs/VirtualContainers.txt (rev 0)
+++ trunk/Docs/VirtualContainers.txt 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,52 @@
+Virtual Containers
+Carlo Barazzetta, 12/05/2014
+
+What is a Virtual Container
+---------------------------
+
+A Virtual Container is a particular References Container of a Master Object to manage his details attributes. This type of container works only for SQL Brokers.
+To obtain a Master-Detail relationship you must have a reference to the Master Object into the Detail Object. This is the typical approach for a Master-Detail relationship used in SQL environment.
+
+
+What does it do
+---------------
+
+In IO a References Container attribute uses a Blob field stored in the master record containing a list of Ids to retrieve Detail records.
+Using a Virtual Container the List of Ids is loaded directly by a query to the Detail Table, using the reference attribute field.
+using Virtual Containers is more simple to manage details objects, because is never necessary to update the Master Object after deleting a Detail Object and you are not responsible to reorder the details objects into the Container if you want to order Details by a particular attribute.
+
+Defining a Virtual Container
+----------------------------
+
+To define a Virtual Container use those parameters:
+Type: References
+Object Class: Txxxx
+Storage Kind: Virtual
+External Storage Name: Detail TableName and Detail Field names separated by ;
+
+The source code for METADATA definition appear like this one:
+Details: References(TISSampleDetail) virtual 'SAMPLEDETAIL;PARENTOBJECTCLASS;PARENTOBJECTID';
+Note that the External Storage Name is not used to define a new table for external storage of relationship, but contains 2 informations about the existing Detail Table:
+1) SAMPLEDETAIL is the name of the Detail Table
+2) PARENTOBJECTCLASS;PARENTOBJECTID are the fields in the Detail Table referencing the Master Record.
+
+In the Master Table the Field of the Virtual Container doesn't exists.
+
+Defining the order of Detail Objects
+------------------------------------
+You can continue to work with the virtual container as a normal container, but you cannot change the order of Detail Objects using Move() because this order is never stored in a field.
+The default order of details objects of a virtual container is the InstantUpdateCountFieldName attribute.
+
+If you want to change the order of the detail objects you must inherits GetDetailsStatementValues method and write a code like this:
+procedure TISSampleClass.GetDetailsStatementValues(
+ var FromClause, SequenceNoFieldName, OrderByClause: string);
+begin
+ inherited;
+ if SameText(FromClause,'SAMPLEDETAIL') then
+ begin
+ SequenceNoFieldName := 'CompanyDescription';
+ OrderByClause := 'COMPANY.DX DESC';
+ end;
+end;
+
+
\ No newline at end of file
Property changes on: trunk/Docs/VirtualContainers.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/ADO/DXE5/DclIOADO.dpk
===================================================================
--- trunk/Source/Brokers/ADO/DXE5/DclIOADO.dpk (rev 0)
+++ trunk/Source/Brokers/ADO/DXE5/DclIOADO.dpk 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,41 @@
+package DclIOADO;
+
+{$R *.res}
+{$R '..\InstantADO.dcr'}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS ON}
+{$RANGECHECKS ON}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects ADO Design-Time Support (Delphi XE5)'}
+{$LIBSUFFIX '_D19'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ rtl,
+ IOADO;
+
+contains
+ InstantADOReg in '..\InstantADOReg.pas';
+
+end.
Property changes on: trunk/Source/Brokers/ADO/DXE5/DclIOADO.dpk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/ADO/DXE5/DclIOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/DXE5/DclIOADO.dproj (rev 0)
+++ trunk/Source/Brokers/ADO/DXE5/DclIOADO.dproj 2014-05-12 10:07:50 UTC (rev 965)
@@ -0,0 +1,159 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{25086FF7-139E-40BB-9278-EDE3F344302B}</ProjectGuid>
+ <MainSource>DclIOADO.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>15.3</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
+ <Base_Android>true</Base_Android>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <DesignOnlyPackage>true</DesignOnlyPackage>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects ADO Design-Time Support (Delphi XE5)</DCC_Description>
+ <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
+ <DCC_RangeChecking>true</DCC_RangeChecking>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <DCC_F>false</DCC_F>
+ <GenPackage>true</GenPackage>
+ <DllSuffix>_D19</DllSuffix>
+ <DCC_E>false</DCC_E>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Android)'!=''">
+ <BT_BuildType>Debug</BT_BuildType>
+ <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <DCC_UsePackage>IOADO;$(DCC_UsePackage)</DCC_UsePackage>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantADO.dcr"/>
+ <DCCReference Include="rtl.dcp"/>
+ <DCCReference Include="IOADO.dcp"/>
+ <DCCReference Include="..\InstantADOReg.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">DclIOADO.dpk</Source>
+ </Source>
+ <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...
[truncated message content] |
|
From: <car...@us...> - 2014-05-12 09:37:21
|
Revision: 964
http://sourceforge.net/p/instantobjects/code/964
Author: carlobar
Date: 2014-05-12 09:37:17 +0000 (Mon, 12 May 2014)
Log Message:
-----------
Added Broker for Embarcadero FireDac
Added Paths:
-----------
trunk/Source/Brokers/FireDAC/
trunk/Source/Brokers/FireDAC/DXE5/
trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dpk
trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dproj
trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.res
trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dpk
trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dproj
trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.res
trunk/Source/Brokers/FireDAC/DXE6/
trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dpk
trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dproj
trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.res
trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dpk
trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dproj
trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.res
trunk/Source/Brokers/FireDAC/InstantFireDAC.pas
trunk/Source/Brokers/FireDAC/InstantFireDAC.res
trunk/Source/Brokers/FireDAC/InstantFireDACCatalog.pas
trunk/Source/Brokers/FireDAC/InstantFireDACConnectionDefEdit.dfm
trunk/Source/Brokers/FireDAC/InstantFireDACConnectionDefEdit.pas
trunk/Source/Brokers/FireDAC/InstantFireDACReg.pas
Added: trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dpk
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dpk (rev 0)
+++ trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dpk 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,41 @@
+package DclIOFireDAC;
+
+{$R *.res}
+{$R '..\InstantFireDAC.dcr'}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects FireDAC Design-Time Support (Delphi XE5)'}
+{$LIBSUFFIX '_D19'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ IOFireDAC;
+
+contains
+ InstantFireDACReg in '..\InstantFireDACReg.pas';
+
+end.
+
Property changes on: trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dpk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dproj
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dproj (rev 0)
+++ trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dproj 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,159 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{7ECBEBD9-43A5-439E-8FBB-4B27DC40A0DD}</ProjectGuid>
+ <MainSource>DclIOFireDAC.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>15.3</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
+ <Base_Android>true</Base_Android>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DesignOnlyPackage>true</DesignOnlyPackage>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DllSuffix>_D16</DllSuffix>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects FireDAC Design-Time Support (Delphi XE2)</DCC_Description>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <GenPackage>true</GenPackage>
+ <DCC_F>false</DCC_F>
+ <DCC_E>false</DCC_E>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Android)'!=''">
+ <BT_BuildType>Debug</BT_BuildType>
+ <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <DCC_UsePackage>IOFireDAC;$(DCC_UsePackage)</DCC_UsePackage>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DllSuffix>_D19</DllSuffix>
+ <DCC_Description>InstantObjects FireDAC Design-Time Support (Delphi XE5)</DCC_Description>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantFireDAC.dcr"/>
+ <DCCReference Include="IOFireDAC.dcp"/>
+ <DCCReference Include="..\InstantFireDACReg.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">DclIOFireDAC.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="C:\Users\Public\Documents\RAD Studio\12.0\Bpl\UniSynEdit_DXE5.bpl">File C:\Users\Public\Documents\RAD Studio\12.0\Bpl\UniSynEdit_DXE5.bpl not found</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp190.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Android">False</Platform>
+ <Platform value="iOSDevice">False</Platform>
+ <Platform value="iOSSimulator">False</Platform>
+ <Platform value="OSX32">False</Platform>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.dproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.res
===================================================================
(Binary files differ)
Index: trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.res
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.res 2014-05-12 09:08:33 UTC (rev 963)
+++ trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.res 2014-05-12 09:37:17 UTC (rev 964)
Property changes on: trunk/Source/Brokers/FireDAC/DXE5/DclIOFireDAC.res
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dpk
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dpk (rev 0)
+++ trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dpk 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,53 @@
+package IOFireDAC;
+
+{$R *.res}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects FireDAC Run-Time Support (Delphi XE5)'}
+{$LIBSUFFIX '_D19'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ IOCore,
+ xmlrtl,
+ FireDACCommonDriver,
+ FireDACCommon,
+ FireDAC,
+ FireDACODBCDriver,
+ FireDACMSSQLDriver,
+ FireDACOracleDriver,
+ FireDACPgDriver,
+ FireDACASADriver,
+ FireDACIBDriver,
+ FireDACMySQLDriver,
+ vclFireDAC;
+
+contains
+ InstantFireDAC in '..\InstantFireDAC.pas',
+ InstantFireDACCatalog in '..\InstantFireDACCatalog.pas',
+ InstantFireDACConnectionDefEdit in '..\InstantFireDACConnectionDefEdit.pas' {InstantFireDACConnectionDefEditForm};
+
+end.
Property changes on: trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dpk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dproj
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dproj (rev 0)
+++ trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dproj 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,173 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{50885E3B-26BC-4A4D-B07A-520421576DE5}</ProjectGuid>
+ <MainSource>IOFireDAC.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>15.3</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
+ <Base_Android>true</Base_Android>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DllSuffix>_D16</DllSuffix>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects FireDAC Run-Time Support (Delphi XE2)</DCC_Description>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <GenPackage>true</GenPackage>
+ <DCC_F>false</DCC_F>
+ <DCC_E>false</DCC_E>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Android)'!=''">
+ <BT_BuildType>Debug</BT_BuildType>
+ <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DllSuffix>_D19</DllSuffix>
+ <DCC_Description>InstantObjects FireDAC Run-Time Support (Delphi XE5)</DCC_Description>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="IOCore.dcp"/>
+ <DCCReference Include="xmlrtl.dcp"/>
+ <DCCReference Include="FireDACCommonDriver.dcp"/>
+ <DCCReference Include="FireDACCommon.dcp"/>
+ <DCCReference Include="FireDAC.dcp"/>
+ <DCCReference Include="FireDACODBCDriver.dcp"/>
+ <DCCReference Include="FireDACMSSQLDriver.dcp"/>
+ <DCCReference Include="FireDACOracleDriver.dcp"/>
+ <DCCReference Include="FireDACPgDriver.dcp"/>
+ <DCCReference Include="FireDACASADriver.dcp"/>
+ <DCCReference Include="FireDACIBDriver.dcp"/>
+ <DCCReference Include="FireDACMySQLDriver.dcp"/>
+ <DCCReference Include="vclFireDAC.dcp"/>
+ <DCCReference Include="..\InstantFireDAC.pas"/>
+ <DCCReference Include="..\InstantFireDACCatalog.pas"/>
+ <DCCReference Include="..\InstantFireDACConnectionDefEdit.pas">
+ <Form>InstantFireDACConnectionDefEditForm</Form>
+ </DCCReference>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">IOFireDAC.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="C:\Users\Public\Documents\RAD Studio\12.0\Bpl\UniSynEdit_DXE5.bpl">File C:\Users\Public\Documents\RAD Studio\12.0\Bpl\UniSynEdit_DXE5.bpl not found</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k190.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp190.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Android">False</Platform>
+ <Platform value="iOSDevice">False</Platform>
+ <Platform value="iOSSimulator">False</Platform>
+ <Platform value="OSX32">False</Platform>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.dproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.res
===================================================================
(Binary files differ)
Index: trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.res
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.res 2014-05-12 09:08:33 UTC (rev 963)
+++ trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.res 2014-05-12 09:37:17 UTC (rev 964)
Property changes on: trunk/Source/Brokers/FireDAC/DXE5/IOFireDAC.res
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dpk
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dpk (rev 0)
+++ trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dpk 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,41 @@
+package DclIOFireDAC;
+
+{$R *.res}
+{$R '..\InstantFireDAC.dcr'}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects FireDAC Design-Time Support (Delphi XE6)'}
+{$LIBSUFFIX '_D20'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ IOFireDAC;
+
+contains
+ InstantFireDACReg in '..\InstantFireDACReg.pas';
+
+end.
+
Property changes on: trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dpk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dproj
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dproj (rev 0)
+++ trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dproj 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,159 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{7ECBEBD9-43A5-439E-8FBB-4B27DC40A0DD}</ProjectGuid>
+ <MainSource>DclIOFireDAC.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>15.4</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
+ <Base_Android>true</Base_Android>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <SanitizedProjectName>DclIOFireDAC</SanitizedProjectName>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DesignOnlyPackage>true</DesignOnlyPackage>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DllSuffix>_D16</DllSuffix>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects FireDAC Design-Time Support (Delphi XE2)</DCC_Description>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <GenPackage>true</GenPackage>
+ <DCC_F>false</DCC_F>
+ <DCC_E>false</DCC_E>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Android)'!=''">
+ <BT_BuildType>Debug</BT_BuildType>
+ <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <DCC_UsePackage>IOFireDAC;$(DCC_UsePackage)</DCC_UsePackage>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DllSuffix>_D20</DllSuffix>
+ <DCC_Description>InstantObjects FireDAC Design-Time Support (Delphi XE6)</DCC_Description>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantFireDAC.dcr"/>
+ <DCCReference Include="IOFireDAC.dcp"/>
+ <DCCReference Include="..\InstantFireDACReg.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">DclIOFireDAC.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k200.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp200.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Android">False</Platform>
+ <Platform value="iOSDevice">False</Platform>
+ <Platform value="iOSSimulator">False</Platform>
+ <Platform value="OSX32">False</Platform>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.dproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.res
===================================================================
(Binary files differ)
Index: trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.res
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.res 2014-05-12 09:08:33 UTC (rev 963)
+++ trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.res 2014-05-12 09:37:17 UTC (rev 964)
Property changes on: trunk/Source/Brokers/FireDAC/DXE6/DclIOFireDAC.res
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dpk
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dpk (rev 0)
+++ trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dpk 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,53 @@
+package IOFireDAC;
+
+{$R *.res}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects FireDAC Run-Time Support (Delphi XE6)'}
+{$LIBSUFFIX '_D20'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ IOCore,
+ xmlrtl,
+ FireDACCommonDriver,
+ FireDACCommon,
+ FireDAC,
+ FireDACODBCDriver,
+ FireDACMSSQLDriver,
+ FireDACOracleDriver,
+ vclFireDAC,
+ FireDACPgDriver,
+ FireDACASADriver,
+ FireDACIBDriver,
+ FireDACMySQLDriver;
+
+contains
+ InstantFireDAC in '..\InstantFireDAC.pas',
+ InstantFireDACCatalog in '..\InstantFireDACCatalog.pas',
+ InstantFireDACConnectionDefEdit in '..\InstantFireDACConnectionDefEdit.pas' {InstantFireDACConnectionDefEditForm};
+
+end.
Property changes on: trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dpk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dproj
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dproj (rev 0)
+++ trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dproj 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,173 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{50885E3B-26BC-4A4D-B07A-520421576DE5}</ProjectGuid>
+ <MainSource>IOFireDAC.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>15.4</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
+ <Base_Android>true</Base_Android>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <SanitizedProjectName>IOFireDAC</SanitizedProjectName>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DllSuffix>_D16</DllSuffix>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects FireDAC Run-Time Support (Delphi XE2)</DCC_Description>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <GenPackage>true</GenPackage>
+ <DCC_F>false</DCC_F>
+ <DCC_E>false</DCC_E>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Android)'!=''">
+ <BT_BuildType>Debug</BT_BuildType>
+ <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>0</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DllSuffix>_D20</DllSuffix>
+ <DCC_Description>InstantObjects FireDAC Run-Time Support (Delphi XE6)</DCC_Description>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="IOCore.dcp"/>
+ <DCCReference Include="xmlrtl.dcp"/>
+ <DCCReference Include="FireDACCommonDriver.dcp"/>
+ <DCCReference Include="FireDACCommon.dcp"/>
+ <DCCReference Include="FireDAC.dcp"/>
+ <DCCReference Include="FireDACODBCDriver.dcp"/>
+ <DCCReference Include="FireDACMSSQLDriver.dcp"/>
+ <DCCReference Include="FireDACOracleDriver.dcp"/>
+ <DCCReference Include="vclFireDAC.dcp"/>
+ <DCCReference Include="FireDACPgDriver.dcp"/>
+ <DCCReference Include="FireDACASADriver.dcp"/>
+ <DCCReference Include="FireDACIBDriver.dcp"/>
+ <DCCReference Include="FireDACMySQLDriver.dcp"/>
+ <DCCReference Include="..\InstantFireDAC.pas"/>
+ <DCCReference Include="..\InstantFireDACCatalog.pas"/>
+ <DCCReference Include="..\InstantFireDACConnectionDefEdit.pas">
+ <Form>InstantFireDACConnectionDefEditForm</Form>
+ </DCCReference>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">IOFireDAC.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k200.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp200.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Android">False</Platform>
+ <Platform value="iOSDevice">False</Platform>
+ <Platform value="iOSSimulator">False</Platform>
+ <Platform value="OSX32">False</Platform>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.dproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.res
===================================================================
(Binary files differ)
Index: trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.res
===================================================================
--- trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.res 2014-05-12 09:08:33 UTC (rev 963)
+++ trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.res 2014-05-12 09:37:17 UTC (rev 964)
Property changes on: trunk/Source/Brokers/FireDAC/DXE6/IOFireDAC.res
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Source/Brokers/FireDAC/InstantFireDAC.pas
===================================================================
--- trunk/Source/Brokers/FireDAC/InstantFireDAC.pas (rev 0)
+++ trunk/Source/Brokers/FireDAC/InstantFireDAC.pas 2014-05-12 09:37:17 UTC (rev 964)
@@ -0,0 +1,1423 @@
+(*
+ * InstantObjects
+ * Embarcadero FireDAC Support
+ *)
+
+(* ***** 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 FireDAC Support
+ *
+ * The Initial Developer of the Original Code is: David Taylor
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2009-2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Carlo Barazzetta
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+unit InstantFireDAC;
+
+{$IFDEF LINUX}
+{$I '../../InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\InstantDefines.inc'}
+{$ENDIF}
+
+// Supported databases (only MSSQL and Firebird have been tested as of 8/18/2009)
+
+{$DEFINE SYBASE_SUPPORT}
+{$DEFINE MSSQL_SUPPORT}
+{$DEFINE IBFB_SUPPORT}
+{$DEFINE ORACLE_SUPPORT}
+{$DEFINE PGSQL_SUPPORT}
+{$DEFINE MYSQL_SUPPORT}
+{$DEFINE SQLITE_SUPPORT}
+
+interface
+
+uses
+ Classes, Db, InstantPersistence, InstantCommand, InstantDBBuild,
+ InstantBrokers, InstantMetadata, InstantTypes, FireDAC.Comp.Client,
+ {$IFDEF IBFB_SUPPORT}FireDAC.Phys.IBBase, FireDAC.Phys.FB, FireDAC.Phys.IB,{$ENDIF}
+ {$IFDEF MSSQL_SUPPORT}FireDAC.Phys.MSSQL, FireDAC.Phys.MSSQLMeta,{$ENDIF}
+ {$IFDEF SYBASE_SUPPORT}FireDAC.Phys.ASA, FireDAC.Phys.ASAWrapper,{$ENDIF}
+ {$IFDEF ORACLE_SUPPORT}FireDAC.Phys.ORACLE, FireDAC.Phys.ORACLEMeta,{$ENDIF}
+ {$IFDEF PGSQL_SUPPORT}FireDAC.Phys.PG, FireDAC.Phys.PGWrapper,{$ENDIF}
+ {$IFDEF MYSQL_SUPPORT}FireDAC.Phys.MYSQL, FireDAC.Phys.MYSQLWrapper,{$ENDIF}
+ {$IFDEF SQLITE_SUPPORT}FireDAC.Phys.SQLite, FireDAC.Phys.SQLiteWrapper,{$ENDIF}
+ FireDAC.Stan.Option, FireDAC.Stan.Param, FireDAC.Stan.Intf, FireDAC.Phys.Intf,
+ FireDAC.DApt.Intf, FireDAC.Stan.Async, FireDAC.DApt, FireDAC.Comp.DataSet
+ {$IFDEF D10+}, Variants, DBCommonTypes{$ENDIF};
+
+type
+ TInstantFireDACConnectionDef = class(TInstantRelationalConnectionDef)
+ private
+ FCatalog : string;
+ FDatabase : string;
+ FHostName : string;
+ FLoginPrompt : boolean;
+ FPassword : string;
+ FPort : integer;
+ FProperties : string;
+ FProtocol : string;
+ FUseDelimitedIdents : boolean;
+ FUserName : string;
+ protected
+ procedure InitConnector(Connector: TInstantConnector); override;
+ public
+ function Edit: Boolean; override;
+ class function ConnectionTypeName: string; override;
+ class function ConnectorClass: TInstantConnectorClass; override;
+ published
+ property Catalog: string read FCatalog write FCatalog;
+ property Database: string read FDatabase write FDatabase;
+ property HostName: string read FHostName write FHostName;
+ property LoginPrompt: boolean read FLoginPrompt write FLoginPrompt;
+ property Password: string read FPassword write FPassword;
+ property Port: Integer read FPort write FPort;
+ property Properties: string read FProperties write FProperties;
+ property Protocol: string read FProtocol write FProtocol;
+ property UseDelimitedIdents: boolean read FUseDelimitedIdents write FUseDelimitedIdents;
+ property UserName: string read FUserName write FUserName;
+ end;
+
+ TInstantFireDACBroker = class;
+
+ TInstantFireDACConnector = class(TInstantRelationalConnector)
+ private
+ FConnection : TFDConnection;
+ FLoginPrompt : Boolean;
+ FOnLogin : TLoginEvent;
+ FUseDelimitedIdents : Boolean;
+ procedure DoAfterConnectionChange;
+ procedure DoBeforeConnectionChange;
+ function GetBroker: TInstantFireDACBroker;
+ function GetConnection: TFDConnection;
+ function GetLoginPrompt: Boolean;
+ procedure SetConnection(Value: TFDConnection);
+ procedure SetLoginPrompt(const Value: Boolean);
+ procedure SetUseDelimitedIdents(const Value: Boolean);
+ protected
+ procedure AfterConnectionChange; virtual;
+ procedure BeforeConnectionChange; virtual;
+ procedure AssignLoginOptions; virtual;
+ procedure CheckConnection;
+ function CreateBroker: TInstantBroker; override;
+ procedure DoLogin(AConnection: TFDCustomConnection;
+ const AConnectionDef: IFDStanConnectionDef); virtual;
+ function GetConnected: Boolean; override;
+ function GetDatabaseExists: Boolean; override;
+ procedure InternalBuildDatabase(Scheme: TInstantScheme); override;
+ procedure InternalCommitTransaction; override;
+ procedure InternalConnect; override;
+ procedure InternalCreateDatabase; override;
+ procedure InternalDisconnect; override;
+ procedure InternalRollbackTransaction; override;
+ procedure InternalStartTransaction; override;
+ procedure Notification(AComponent: TComponent; Operation: TOperation); override;
+ function ParamByName(const AName: string): string;
+ public
+ constructor Create(AOwner: TComponent); override;
+ class function ConnectionDefClass: TInstantConnectionDefClass; override;
+ function HasConnection: Boolean;
+ property Broker: TInstantFireDACBroker read GetBroker;
+ published
+ property Connection: TFDConnection read GetConnection write SetConnection;
+ property LoginPrompt: Boolean read GetLoginPrompt write SetLoginPrompt default False;
+ property OnLogin: TLoginEvent read FOnLogin write FOnLogin;
+ property UseDelimitedIdents: Boolean read FUseDelimitedIdents write SetUseDelimitedIdents default False;
+ end;
+
+ TInstantFireDACBroker = class(TInstantSQLBroker)
+ private
+ function GetConnector: TInstantFireDACConnector;
+ protected
+ procedure AssignDataSetParams(DataSet: TDataSet; AParams: TParams); override;
+ procedure AssignParam(SourceParam: TParam; TargetParam: TFDParam); virtual;
+ function CreateCatalog(const AScheme: TInstantScheme): TInstantCatalog; override;
+ function CreateResolver(Map: TInstantAttributeMap): TInstantSQLResolver; override;
+ function GetDatabaseName: string; override;
+ function GetDBMSName: string; override;
+ function GetSQLDelimiters: string; override;
+ function GetSQLQuote: Char; override;
+ procedure InternalCreateDatabase; virtual;
+ function InternalCreateQuery: TInstantQuery; override;
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string; virtual; abstract;
+ function InternalDBNotExistsErrorCode: Integer; virtual;
+ function UseBooleanFields: Boolean; virtual; abstract;
+ public
+ procedure CreateDatabase;
+ function CreateDataSet(const AStatement: string; AParams: TParams = nil): TDataSet; override;
+ function CreateDBBuildCommand(const CommandType: TInstantDBBuildCommandType): TInstantDBBuildCommand; override;
+ function DataTypeToColumnType(DataType: TInstantDataType; Size: Integer): string; override;
+ function Execute(const AStatement: string; AParams: TParams = nil): Integer; override;
+ function DBNotExistsErrorCode: Integer;
+ property Connector: TInstantFireDACConnector read GetConnector;
+ end;
+
+ //
+ // Resolver that interprets an integer column value as a boolean
+ //
+ TInstantFireDACResolver = class(TInstantSQLResolver)
+ protected
+ function ReadBooleanField(DataSet: TDataSet; const FieldName: string): Boolean; override;
+ end;
+
+ //
+ // Translator that translates a boolean value to a '0' or '1'
+ //
+ TInstantFireDACTranslator = class(TInstantRelationalTranslator)
+ protected
+ function TranslateConstant(Constant: TInstantIQLConstant; Writer: TInstantIQLWriter): Boolean; override;
+ end;
+
+ TInstantFireDACQuery = class(TInstantSQLQuery)
+ protected
+ class function TranslatorClass: TInstantRelationalTranslatorClass; override;
+ end;
+
+ { Sybase broker }
+
+ {$IFDEF SYBASE_SUPPORT}
+ TInstantFireDACSybaseBroker = class(TInstantFireDACBroker)
+ protected
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
+ function UseBooleanFields: Boolean; override;
+ end;
+ {$ENDIF}
+
+ { MS SQL Server broker }
+
+ {$IFDEF MSSQL_SUPPORT}
+ TInstantFireDACMSSQLBroker = class(TInstantFireDACBroker)
+ protected
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
+ function UseBooleanFields: Boolean; override;
+ end;
+
+ TInstantFireDACMSSQL2005Broker = class(TInstantFireDACMSSQLBroker)
+ protected
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
+ end;
+ {$ENDIF}
+
+ { Interbase and Firebird brokers }
+
+ {$IFDEF IBFB_SUPPORT}
+ TInstantFireDACIbFbBroker = class(TInstantFireDACBroker)
+ protected
+ procedure InternalCreateDatabase; override;
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
+ function InternalDBNotExistsErrorCode: Integer; override;
+ function UseBooleanFields: Boolean; override;
+ end;
+ {$ENDIF}
+
+ { Oracle broker }
+
+ {$IFDEF ORACLE_SUPPORT}
+ TInstantFireDACOracleBroker = class(TInstantFireDACBroker)
+ protected
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
+ function UseBooleanFields: Boolean; override;
+ end;
+ {$ENDIF}
+
+ { PostgreSQL broker }
+
+ {$IFDEF PGSQL_SUPPORT}
+ TInstantFireDACPgSQLBroker = class(TInstantFireDACBroker)
+ protected
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
+ function UseBooleanFields: Boolean; override;
+ end;
+ {$ENDIF}
+
+ { MySQL broker }
+
+ {$IFDEF MYSQL_SUPPORT}
+ TInstantMySQLGenerator = class(TInstantSQLGenerator)
+ protected
+ function InternalGenerateDropIndexSQL(Metadata: TInstantIndexMetadata): string; override;
+ end;
+
+ TInstantFireDACMySQLBroker = class(TInstantFireDACBroker)
+ protected
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string;
+ override;
+ function InternalDBNotExistsErrorCode: Integer; override;
+ function UseBooleanFields: Boolean; override;
+ public
+ class function GeneratorClass: TInstantSQLGeneratorClass; override;
+ end;
+ {$ENDIF}
+
+ { SQLite broker }
+
+ {$IFDEF SQLITE_SUPPORT}
+
+ //SQLite doesn\xB4t support ALTER TABLE. Spport for ADD COLUMN, ALTER COLUMN and
+ //DROP COLUMN, is emulated with a couple of CREATE TEMP TABLE, INSERT INTO,
+ //DROP TABLE, CREATE TABLE, INSERT INTO and finally DROP TABLE
+ TInstantDBBuildSQLiteAlterTableSQLCommand = class(TInstantDBBuildSQLCommand)
+ private
+ FTmpTableMD : TInstantTableMetadata;
+ FOldTableMetadata : TInstantTableMetadata;
+ FNewTableMetadata : TInstantTableMetadata;
+ FScheme : TInstantScheme;
+ protected
+ procedure Rollback; virtual;
+ function GetDescription: string; override;
+ function GetSQLStatement(const Index: Integer): string; override;
+ function GetSQLStatementCount: Integer; override;
+ function GetNewTableMetadata: TInstantTableMetadata;
+ function GetOldTableMetadata: TInstantTableMetadata;
+ procedure InternalExecute; override;
+ public
+ destructor Destroy; override;
+ property OldTableMetadata: TInstantTableMetadata read GetOldTableMetadata;
+ property NewTableMetadata: TInstantTableMetadata read GetNewTableMetadata;
+ end;
+
+ TInstantSQLiteGenerator = class(TInstantSQLGenerator)
+ protected
+ function InternalGenerateInsertFromSelectSQL(const SourceMetadata, TargetMetadata: TInstantTableMetadata): string; virtual;
+ function InternalGenerateCreateTempTableSQL(...
[truncated message content] |
|
From: <car...@us...> - 2014-05-12 09:08:38
|
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 @@
function InternalDeleteInstantObject(const AObject: TInstantObject;
const AStorageName: string): Boolean; virtual;
public
+ function GetObjectFileName(const AStorageName, AObjectClassName,
+ AObjectId: string): string; virtual;
constructor Create(AOwner: TComponent); override;
function LocateInstantObject(const AStorageName, AObjectClassName,
AObjectId: string): Boolean;
@@ -112,8 +116,8 @@
const AStorageNames: TStrings); virtual;
published
property RootFolder: string read GetRootFolder write SetRootFolder;
- property XMLFileFormat: TXMLFileFormat
- read FXMLFileFormat write FXMLFileFormat default xffUtf8;
+ property XMLFileFormat: TXMLFileFormat read FXMLFileFormat write FXMLFileFormat default xffUtf8;
+ property OnCustomLoadXMLFile: TXMLFileOpenEvent read FOnCustomLoadXMLFile write FOnCustomLoadXMLFile;
end;
TInstantXMLConnectionDef = class(TInstantConnectionBasedConnectionDef)
@@ -326,19 +330,11 @@
uses
SysUtils, InstantConsts,
- TypInfo, InstantXMLCatalog, InstantXMLConnectionDefEdit, InstantUtils,
-{$IFDEF D17+}
- System.Types,
+ TypInfo, InstantXMLCatalog, InstantUtils,
+{$IFNDEF FMX}
+InstantXMLConnectionDefEdit, FileCtrl, Controls,
{$ENDIF}
-{$IFDEF MSWINDOWS}
-{$IFNDEF D6+}
- FileCtrl,
-{$ENDIF}
- Windows, Controls;
-{$ENDIF}
-{$IFDEF LINUX}
-QControls;
-{$ENDIF}
+ Windows;
resourcestring
SCannotCreateDirectory = 'Cannot create directory %s';
@@ -455,6 +451,7 @@
function TInstantXMLConnectionDef.Edit: Boolean;
begin
+{$IFNDEF FMX}
with TInstantXMLConnectionDefEditForm.Create(nil) do
try
LoadData(Self);
@@ -464,6 +461,9 @@
finally
Free;
end;
+{$ELSE}
+ Result := False;
+{$ENDIF}
end;
{ TInstantXMLResolver }
@@ -1143,46 +1143,35 @@
end;
end;
-{$IFDEF UNICODE}
function TXMLFilesAccessor.SaveInstantObjectToXmlFile(
const AObject: TInstantObject; const AFileName: string): Boolean;
var
strstream: TStringStream;
fileStream: TFileStream;
+{$IFDEF UNICODE}
DataStr: UTF8String;
+{$ELSE}
+ DataStr: string;
+{$ENDIF}
begin
+{$IFDEF UNICODE}
strstream := TStringStream.Create('', TEncoding.UTF8);
+{$ELSE}
+ strstream := TStringStream.Create('');
+{$ENDIF}
try
InstantWriteObject(strStream, sfXML, AObject);
+{$IFDEF UNICODE}
DataStr := XML_UTF8_HEADER + UTF8String(GetXMLLineBreak) + UTF8String(strStream.DataString);
- finally
- strStream.Free;
- end;
- fileStream := TFileStream.Create(AFileName, fmCreate);
- try
- Result := fileStream.Write(DataStr[1], Length(DataStr)) <> 0;
- finally
- fileStream.Free;
- end;
-end;
{$ELSE}
-function TXMLFilesAccessor.SaveInstantObjectToXmlFile(
- const AObject: TInstantObject; const AFileName: string): Boolean;
-var
- strstream: TStringStream;
- fileStream: TFileStream;
- DataStr: string;
-begin
- strstream := TStringStream.Create('');
- try
- InstantWriteObject(strStream, sfXML, AObject);
-{$IFDEF D6+}
+ {$IFDEF D6+}
if FXMLFileFormat = xffUtf8 then
DataStr := AnsiToUtf8(XML_UTF8_HEADER + GetXMLLineBreak + strStream.DataString)
else
DataStr := XML_ISO_HEADER + GetXMLLineBreak + strStream.DataString;
-{$ELSE}
+ {$ELSE}
DataStr := strStream.DataString;
+ {$ENDIF}
{$ENDIF}
finally
strStream.Free;
@@ -1194,7 +1183,6 @@
fileStream.Free;
end;
end;
-{$ENDIF}
{$IFDEF UNICODE}
function TXMLFilesAccessor.LoadInstantObjectFromXmlFile(
@@ -1202,18 +1190,27 @@
var
fileStream: TFileStream;
begin
+ Result := False;
if FileExists(AFileName) then
begin
- fileStream := TFileStream.Create(AFileName, fmShareDenyWrite);
- try
- InstantReadObject(fileStream, sfXML, AObject);
- Result := True;
- finally
- fileStream.Free;
+ Try
+ if Assigned(FOnCustomLoadXMLFile) then
+ Result := FOnCustomLoadXMLFile(AObject, AObjectId, AFileName);
+
+ if not Result then
+ begin
+ fileStream := TFileStream.Create(AFileName, fmShareDenyWrite);
+ try
+ InstantReadObject(fileStream, sfXML, AObject);
+ Result := True;
+ finally
+ fileStream.Free;
+ end;
+ end;
+ except
+ on E: Exception do raise EInOutError.CreateFmt(SErrorLoadingFile, [AFileName, E.Message]);
end;
- end
- else
- Result := False;
+ end;
end;
{$ELSE}
function TXMLFilesAccessor.LoadInstantObjectFromXmlFile(
@@ -1223,24 +1220,32 @@
strUtf8: string;
strstream: TStringStream;
begin
- fileStream := TFileStream.Create(AFileName, fmShareDenyWrite);
- try
- SetLength(strUtf8, fileStream.Size);
- Result := fileStream.Read(strUtf8[1], fileStream.Size) <> 0;
- finally
- fileStream.Free;
- end;
+ if Assigned(FOnCustomLoadXMLFile) then
+ Result := FOnCustomLoadXMLFile(AObject, AObjectId, AFileName);
-{$IFDEF D6+}
- if FXMLFileFormat = xffUtf8 then
- strUtf8 := Utf8ToAnsi(strUtf8);
-{$ENDIF}
+ if not Result then
+
+ begin
+ fileStream := TFileStream.Create(AFileName, fmShareDenyWrite);
+ try
+ SetLength(strUtf8, fileStream.Size);
+ Result := fileStream.Read(strUtf8[1], fileStream.Size) <> 0;
+ finally
+ fileStream.Free;
+ end;
+ {$IFDEF D6+}
+ if FXMLFileFormat = xffUtf8 then
+ strUtf8 := Utf8ToAnsi(strUtf8);
+ {$ENDIF}
- strstream := TStringStream.Create(strUtf8);
- try
- InstantReadObject(strstream, sfXML, AObject);
- finally
- strstream.Free;
+ strstream := TStringStream.Create(strUtf8);
+ try try
+ InstantReadObject(strstream, sfXML, AObject);
+ except
+ on E: Exception do raise EInOutError.CreateFmt(SErrorLoadingFile, [AFileName, E.Message]); end;
+ finally
+ strstream.Free;
+ end;
end;
end;
{$ENDIF}
Modified: trunk/Source/Brokers/XML/InstantXMLCatalog.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXMLCatalog.pas 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Brokers/XML/InstantXMLCatalog.pas 2014-05-12 09:08:33 UTC (rev 963)
@@ -42,7 +42,7 @@
interface
uses
-{$IFDEF MSWINDOWS}
+{$IFNDEF FMX}
FileCtrl,
{$ENDIF}
InstantPersistence, InstantBrokers, InstantMetadata, InstantTypes;
Modified: trunk/Source/Catalogs/IBFb/D2010/IOIBFbCatalog.dproj
===================================================================
--- trunk/Source/Catalogs/IBFb/D2010/IOIBFbCatalog.dproj 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Catalogs/IBFb/D2010/IOIBFbCatalog.dproj 2014-05-12 09:08:33 UTC (rev 963)
@@ -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\IOIBFbCatalog_D14.bpl</DCC_DependencyCheckOutputName>
+ <DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\7.0\Bpl\IOIBFbCatalog_D14.bpl</DCC_DependencyCheckOutputName>
<DCC_TypedAtParameter>true</DCC_TypedAtParameter>
<DCC_Description>InstantObjects Catalog for InterBase and Firebird (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/Catalogs/IBFb/DXE3/IOIBFbCatalog.dproj
===================================================================
--- trunk/Source/Catalogs/IBFb/DXE3/IOIBFbCatalog.dproj 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Catalogs/IBFb/DXE3/IOIBFbCatalog.dproj 2014-05-12 09:08:33 UTC (rev 963)
@@ -7,7 +7,7 @@
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Package</AppType>
<FrameworkType>None</FrameworkType>
- <ProjectVersion>14.3</ProjectVersion>
+ <ProjectVersion>14.4</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
Modified: trunk/Source/Core/D2010/IOCore.dproj
===================================================================
--- trunk/Source/Core/D2010/IOCore.dproj 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Core/D2010/IOCore.dproj 2014-05-12 09:08:33 UTC (rev 963)
@@ -33,7 +33,6 @@
<GenDll>true</GenDll>
<GenPackage>true</GenPackage>
<DllSuffix>_D14</DllSuffix>
- <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<Version>7.0</Version>
Modified: trunk/Source/Core/DXE3/IOCore.dproj
===================================================================
--- trunk/Source/Core/DXE3/IOCore.dproj 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Core/DXE3/IOCore.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/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Core/InstantBrokers.pas 2014-05-12 09:08:33 UTC (rev 963)
@@ -423,6 +423,7 @@
FSelectExternalPartSQL: string;
FDeleteExternalSQL: string;
FInsertExternalSQL: string;
+ FSelectVirtualSQL: string;
function AddIntegerParam(Params: TParams; const ParamName: string;
Value: Integer): TParam;
function AddStringParam(Params: TParams; const ParamName, Value: string): TParam;
@@ -441,6 +442,7 @@
function GetUpdateConcurrentSQL: string;
function GetUpdateSQL: string;
function GetBroker: TInstantSQLBroker;
+ function GetSelectVirtualSQL: string;
function GetSelectExternalSQL: string;
function GetSelectExternalPartSQL: string;
function GetDeleteExternalSQL: string;
@@ -512,6 +514,8 @@
write FInsertExternalSQL;
property Map: TInstantAttributeMap read FMap;
property SelectSQL: string read GetSelectSQL write FSelectSQL;
+ property SelectVirtualSQL: string read GetSelectVirtualSQL
+ write FSelectVirtualSQL;
property SelectExternalSQL: string read GetSelectExternalSQL
write FSelectExternalSQL;
property SelectExternalPartSQL: string read GetSelectExternalPartSQL
@@ -594,16 +598,20 @@
end;
// TInstantSQLLinkResolver class defines interface for handling
- // access to container attributes with external storage for
+ // access to container attributes with external or virtual storage for
// SQL brokers. Due to the generic nature of SQL this class is used
// directly and no descendant classes are needed for SQL brokers.
TInstantSQLLinkResolver = class(TInstantLinkResolver)
private
FAttributeOwner: TInstantObject;
FTableName: string;
+ FParentObjectClassFieldName: string;
+ FParentObjectIdFieldName: string;
function GetBroker: TInstantSQLBroker;
function GetResolver: TInstantSQLResolver;
property TableName: string read FTableName;
+ property ParentObjectClassFieldName: string read FParentObjectClassFieldName;
+ property ParentObjectIdFieldName: string read FParentObjectIdFieldName;
protected
procedure InternalStoreAttributeObjects(Attribute: TInstantContainer);
override;
@@ -733,6 +741,8 @@
string; virtual;
function InternalGenerateSelectSQL(Map: TInstantAttributeMap): string;
virtual;
+ function InternalGenerateSelectVirtualSQL(Map: TInstantAttributeMap):
+ string; virtual;
function InternalGenerateSelectExternalSQL(Map: TInstantAttributeMap):
string; virtual;
function InternalGenerateSelectExternalPartSQL(Map: TInstantAttributeMap):
@@ -762,6 +772,7 @@
function GenerateInsertSQL(Map: TInstantAttributeMap): string;
function GenerateInsertExternalSQL(Map: TInstantAttributeMap): string;
function GenerateSelectSQL(Map: TInstantAttributeMap): string;
+ function GenerateSelectVirtualSQL(Map: TInstantAttributeMap): string;
function GenerateSelectExternalSQL(Map: TInstantAttributeMap): string;
function GenerateSelectExternalPartSQL(Map: TInstantAttributeMap): string;
function GenerateSelectTablesSQL: string;
@@ -1119,6 +1130,11 @@
var
InstantLogProc: procedure (const AString: string) of object;
+{$IFDEF IO_STATEMENT_LOGGING}
+procedure InstantLogStatement(const Caption, AStatement: string;
+ AParams: TParams = nil);
+{$ENDIF}
+
implementation
uses
@@ -1835,7 +1851,7 @@
{$IFDEF D12+}
if AConnector.BlobStreamFormat = sfBinary then
- Result := TBytesStream.Create(AField.AsBytes)
+ Result := TStringStream.Create(AField.AsString)
else
{$ENDIF}
Result := TInstantStringStream.Create(AField.AsString);
@@ -1848,7 +1864,7 @@
{$IFDEF D12+}
if AConnector.BlobStreamFormat = sfBinary then
- Result := TBytesStream.Create
+ Result := TStringStream.Create
else
Result := TStringStream.Create('', TEncoding.UTF8);
{$ELSE}
@@ -2093,7 +2109,7 @@
var
LinkDatasetResolver: TInstantNavigationalLinkResolver;
begin
- if Attribute.Metadata.StorageKind = skExternal then
+ if Attribute.Metadata.StorageKind in [skExternal, skVirtual] then
begin
LinkDatasetResolver :=
GetLinkDatasetResolver(Attribute.Metadata.ExternalStorageName);
@@ -2552,7 +2568,7 @@
begin
with Attribute do
begin
- if Metadata.StorageKind = skExternal then
+ if Metadata.StorageKind in [skExternal, skVirtual] then
begin
Clear;
LinkDatasetResolver :=
@@ -3006,7 +3022,7 @@
Part.Value.CheckId;
AddIdParam(Params, FieldName + InstantIdFieldName, Part.Value.Id);
end
- else
+ else if Attribute.Metadata.StorageKind = skEmbedded then
begin
Stream := CreateEmbeddedObjectOutputStream(Broker.Connector);
try
@@ -3152,9 +3168,9 @@
LParam := AddParam(AParams, AParamName, ftBlob);
if AStream.Size > 0 then
{$IFDEF D12+}
- LParam.AsBytes := (AStream as TBytesStream).Bytes;
+ LParam.AsBlob := BytesOf((AStream as TStringStream).DataString);
{$ELSE}
- LParam.AsMemo := (AStream as TStringStream).DataString;
+ LParam.AsBlob := (AStream as TStringStream).DataString;
{$ENDIF}
end
else
@@ -3170,7 +3186,7 @@
var
Param: TParam;
begin
- Param := AddParam(Params, ParamName, InstantDataTypeToFieldType(Broker.Connector.IdDataType));
+ Param := AddParam(Params, ParamName, InstantDataTypeToFieldType(Broker.Connector.IdDataType, Broker.Connector.UseUnicode));
if Value <> '' then
Param.Value := Value;
end;
@@ -3199,7 +3215,10 @@
function TInstantSQLResolver.AddStringParam(Params: TParams;
const ParamName, Value: string): TParam;
begin
- Result := AddParam(Params, ParamName, ftString);
+ if Broker.Connector.UseUnicode then
+ Result := AddParam(Params, ParamName, ftWideString)
+ else
+ Result := AddParam(Params, ParamName, ftString);
if Value <> '' then
Result.AsString := Value;
end;
@@ -3286,6 +3305,13 @@
Result := FSelectExternalPartSQL;
end;
+function TInstantSQLResolver.GetSelectVirtualSQL: string;
+begin
+ if FSelectVirtualSQL = '' then
+ FSelectVirtualSQL := Broker.Generator.GenerateSelectVirtualSQL(Map);
+ Result := FSelectVirtualSQL;
+end;
+
function TInstantSQLResolver.GetSelectExternalSQL: string;
begin
if FSelectExternalSQL = '' then
@@ -3806,7 +3832,7 @@
Stream: TStream;
LinkResolver: TInstantSQLLinkResolver;
begin
- if AttributeMetadata.StorageKind = skExternal then
+ if AttributeMetadata.StorageKind in [skExternal, skVirtual] then
begin
with (Attribute as TInstantReferences) do
begin
@@ -4285,9 +4311,34 @@
constructor TInstantSQLLinkResolver.Create(AResolver: TInstantSQLResolver;
const ATableName: string; AObject: TInstantObject);
+var
+ p: integer;
begin
inherited Create(AResolver);
- FTableName := ATableName;
+ //A virtual external container can have a composite TableName like:
+ //'DETAILTABLENAME;MASTEROBJECTCLASS;MASTEROBJECTID'
+ //If not specified the default fields for master/details relations are:
+ //InstantParentClassFieldName and InstantParentIdFieldName
+ p := pos(';',ATableName);
+ if p > 0 then
+ begin
+ FTableName := Copy(ATableName,1,p-1);
+ FParentObjectClassFieldName := Copy(ATableName,p+1,MaxInt);
+ p := pos(';',FParentObjectClassFieldName);
+ if p > 0 then
+ begin
+ FParentObjectIdFieldName := Copy(FParentObjectClassFieldName,p+1,MaxInt);
+ FParentObjectClassFieldName := Copy(FParentObjectClassFieldName,1,p-1);
+ end
+ else
+ FParentObjectIdFieldName := InstantParentIdFieldName;
+ end
+ else
+ begin
+ FTableName := ATableName;
+ FParentObjectClassFieldName := InstantParentClassFieldName;
+ FParentObjectIdFieldName := InstantParentIdFieldName;
+ end;
FAttributeOwner := AObject;
end;
@@ -4373,10 +4424,29 @@
Params: TParams;
Dataset: TDataSet;
LChildClassField, LChildIdField: TField;
+ SequenceNoFieldName, FromClause, OrderByClause: string;
begin
Params := TParams.Create;
try
- Statement := Format(Resolver.SelectExternalSQL, [TableName]);
+ if Attribute.Metadata.StorageKind = skVirtual then
+ begin
+ Statement := Resolver.SelectVirtualSQL;
+ //Default values
+ FromClause := TableName;
+ Attribute.Owner.GetDetailsStatementValues(FromClause,SequenceNoFieldName,OrderByClause);
+ //Statement custom
+ Statement := Format(Statement,
+ [TableName,TableName,
+ TableName+'.'+SequenceNoFieldName,
+ FromClause,
+ TableName+'.'+ParentObjectClassFieldName,
+ TableName+'.'+ParentObjectIdFieldName,
+ OrderByClause]);
+ end
+ else
+ begin
+ Statement := Format(Resolver.SelectExternalSQL, [TableName]);
+ end;
Resolver.AddIdParam(Params, InstantParentIdFieldName, AObjectId);
Resolver.AddStringParam(Params, InstantParentClassFieldName,
AttributeOwner.ClassName);
@@ -4697,7 +4767,7 @@
end
else if AttributeMetadata.AttributeType = atPart then
begin
- if AttributeMetadata.StorageKind = skExternal then
+ if AttributeMetadata.StorageKind in [skExternal, skVirtual] then
begin
RefClassFieldName := FieldName + InstantClassFieldName;
RefIdFieldName := FieldName + InstantIdFieldName;
@@ -4846,6 +4916,12 @@
Result := InternalGenerateSelectExternalSQL(Map);
end;
+function TInstantSQLGenerator.GenerateSelectVirtualSQL(
+ Map: TInstantAttributeMap): string;
+begin
+ Result := InternalGenerateSelectVirtualSQL(Map);
+end;
+
function TInstantSQLGenerator.GenerateSelectSQL
(Map: TInstantAttributeMap): string;
begin
@@ -5048,6 +5124,19 @@
[FieldStr, EmbraceTable('%s'), WhereStr]);
end;
+function TInstantSQLGenerator.InternalGenerateSelectVirtualSQL(
+ Map: TInstantAttributeMap): string;
+var
+ FieldStr, WhereStr: string;
+begin
+ FieldStr := Format('%s.CLASS '+InstantChildClassFieldName+', %s.ID '+InstantChildIdFieldName+', %s SequenceNo',
+ [EmbraceField('%s'),EmbraceField('%s'),EmbraceField('%s'),
+ EmbraceField(InstantIdFieldName), EmbraceField(InstantUpdateCountFieldName)]);
+ WhereStr := '%s = :'+InstantParentClassFieldName+' AND %s = :'+InstantParentIdFieldName;
+ Result := Format('SELECT %s FROM %s WHERE %s ORDER BY %s',
+ [FieldStr, EmbraceTable('%s'), WhereStr, EmbraceField('%s')]);
+end;
+
function TInstantSQLGenerator.InternalGenerateSelectExternalSQL(
Map: TInstantAttributeMap): string;
var
@@ -5589,8 +5678,8 @@
AContext.Qualify(LTablePath, LFieldName + InstantIdFieldName)]));
end
else if (LAttrMeta.AttributeType in [atParts, atReferences])
- and (LAttrMeta.StorageKind = skExternal) then
- // No fields needed for external containers.
+ and (LAttrMeta.StorageKind in [skExternal, skVirtual]) then
+ // No fields needed for external and virtual containers.
else
// Select all other fields.
Writer.WriteString(Format(', %s', [AContext.QualifyPath(LAttrMeta.Name)]));
@@ -6512,24 +6601,30 @@
LPath: TInstantIQLPath;
LClassMeta: TInstantClassMetadata;
begin
+ // Standard non-burst mode adds the main table only when needed, not always.
+ // A possible optimization would be to add it only if it does actually
+ // have attributes we select. For now let's add it by default as it
+ // covers almost all cases. We add it first to ease the join clause
+ // generation later.
+ if IsBurstLoadMode(ActualLoadMode) then
+ AddTablePath(TableName);
+
+ // Add main table path as required.
if ClassRef.Any then
- LTablePath := ObjectClassMetadata.TableName
+ LTablePath := TableName
else
begin
LPath := FindAttributePath;
if Assigned(LPath) then
LTablePath := PathToTablePath(LPath.Attributes[0])
else
- LTablePath := ObjectClassMetadata.TableName;
+ LTablePath := TableName;
end;
AddTablePath(LTablePath);
+
+ // Add paths for all parent tables in burst mode.
if IsBurstLoadMode(ActualLoadMode) then
begin
- // Standard mode only adds the main table when needed, and not always.
- // A possible optimization would be to add it only if it does actually
- // have attributes we select. For now let's add it by default as it
- // covers almost all cases.
- AddTablePath(TableName);
LClassMeta := ObjectClassMetadata.Parent;
while Assigned(LClassMeta) do
begin
Modified: trunk/Source/Core/InstantCode.pas
===================================================================
--- trunk/Source/Core/InstantCode.pas 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Core/InstantCode.pas 2014-05-12 09:08:33 UTC (rev 963)
@@ -1593,6 +1593,7 @@
MetaKeyDefault = 'default';
MetaKeyUseNull = 'usenull';
MetaKeyExternal = 'external';
+ MetaKeyVirtual = 'virtual';
MetaKeyFormat = 'format';
MetaKeyIndex = 'index';
MetaKeyRequired = 'required';
@@ -1865,6 +1866,11 @@
FMetadata.StorageKind := skExternal;
FMetadata.ExternalStorageName := ReadStringValue;
end;
+ if SameText(Token, MetaKeyVirtual) then
+ begin
+ FMetadata.StorageKind := skVirtual;
+ FMetadata.ExternalStorageName := ReadStringValue;
+ end;
end;
end;
end;
@@ -4192,6 +4198,10 @@
WriteStr(MetaKeyStored, Metadata.StorageName);
WriteStr(MetaKeyExternal, Metadata.ExternalStorageName, True);
end
+ else if Metadata.StorageKind = skVirtual then
+ begin
+ WriteStr(MetaKeyVirtual, Metadata.ExternalStorageName, True);
+ end
else
WriteStr(MetaKeyStored, Metadata.StorageName);
WriteStr(MetaKeyDefault, Metadata.DefaultValue);
@@ -4392,7 +4402,7 @@
function TInstantCodeAttribute.GetCanHaveStorageName: boolean;
begin
- Result := (StorageKind <> skExternal) or (AttributeType = atPart);
+ Result := (not (StorageKind in [skExternal, skVirtual])) or (AttributeType = atPart);
end;
function TInstantCodeAttribute.GetCanBeExternal: boolean;
@@ -9086,6 +9096,11 @@
FMetadata.StorageKind := skExternal;
FMetadata.ExternalStorageName := '';
end
+ else if SameText(Token, MetaKeyVirtual) then
+ begin
+ FMetadata.StorageKind := skVirtual;
+ FMetadata.ExternalStorageName := '';
+ end
else if SameText(Token, MetaKeyStored) then
FMetadata.StorageName := ReadStringValue;
end;
Modified: trunk/Source/Core/InstantCommand.pas
===================================================================
--- trunk/Source/Core/InstantCommand.pas 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Core/InstantCommand.pas 2014-05-12 09:08:33 UTC (rev 963)
@@ -115,7 +115,7 @@
end;
TInstantIQLOperatorType = (otEQ, otGT, otLT, otNE, otEN, otEG, otGE, otLE,
- otEL, otLike, otIs, otIn, otAdd, otSub, otOr, otXor, otMul, otDiv, otFDiv,
+ otEL, otLike, otIs, otIn, otNotIn, otAdd, otSub, otOr, otXor, otMul, otDiv, otFDiv, //Differs from standard
otMod, otAnd);
TInstantIQLOperatorTypes = set of TInstantIQLOperatorType;
@@ -545,9 +545,12 @@
InstantPersistence, InstantUtils, InstantConsts, InstantBrokers;
const
- OperatorTokens: array[TInstantIQLOperatorType] of string = ('=', '>', '<',
- '<>', '><', '=>', '>=', '<=', '=<', 'LIKE', 'IS', 'IN', '+', '-', 'OR',
+ OperatorInTokens: array[TInstantIQLOperatorType] of string = ('=', '>', '<',
+ '<>', '><', '=>', '>=', '<=', '=<', 'LIKE', 'IS', 'IN', 'NOT_IN', '+', '-', 'OR',
'XOR', '*', 'DIV', '/', 'MOD', 'AND');
+ OperatorOutTokens: array[TInstantIQLOperatorType] of string = ('=', '>', '<',
+ '<>', '><', '=>', '>=', '<=', '=<', 'LIKE', 'IS', 'IN', 'NOT IN', '+', '-', 'OR',
+ 'XOR', '*', 'DIV', '/', 'MOD', 'AND');
OrderTokens: array[TInstantIQLOrderDirection] of string = ('ASC', 'DESC');
{ TInstantIQLReader }
@@ -843,9 +846,9 @@
var
OpType: TInstantIQLOperatorType;
begin
- for OpType := Low(OperatorTokens) to High(OperatorTokens) do
+ for OpType := Low(OperatorInTokens) to High(OperatorInTokens) do
if (OpType in OperatorTypes) and
- SameText(Token, OperatorTokens[OpType]) then
+ SameText(Token, OperatorInTokens[OpType]) then
begin
Result := True;
OperatorType := OpType;
@@ -890,7 +893,7 @@
procedure TInstantIQLOperator.WriteObject(Writer: TInstantIQLWriter);
begin
inherited;
- Writer.WriteString(OperatorTokens[FOperatorType]);
+ Writer.WriteString(OperatorOutTokens[FOperatorType]);
end;
{ TInstantIQLRelOp }
@@ -898,7 +901,7 @@
class function TInstantIQLRelOp.OperatorTypes: TInstantIQLOperatorTypes;
begin
Result := [otEQ, otGT, otLT, otNE, otEN, otEG, otGE, otLE, otEL, otLike,
- otIs, otIn];
+ otIs, otIn, otNotIn];
end;
{ TInstantIQLAddOp }
@@ -1165,7 +1168,7 @@
procedure TInstantIQLConstant.ReadObject(Reader: TInstantIQLReader);
var
- Token: string;
+ Token, LastToken: string;
begin
inherited;
Token := Reader.ReadToken;
@@ -1173,8 +1176,12 @@
begin
FValue := Token;
repeat
+ LastToken := Token;
Token := Reader.ReadToken;
- FValue := FValue + Token;
+ if Pos(LastToken+Token, '><>>=<=!==') > 0 then
+ FValue := FValue + Token
+ else
+ FValue := FValue + ' ' + Token;
until Token = ']'
end else
FValue := Token;
Modified: trunk/Source/Core/InstantConnectionManagerFormUnit.pas
===================================================================
--- trunk/Source/Core/InstantConnectionManagerFormUnit.pas 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Core/InstantConnectionManagerFormUnit.pas 2014-05-12 09:08:33 UTC (rev 963)
@@ -670,7 +670,7 @@
procedure TInstantConnectionManagerForm.SetOnSupportConnector(
Value: TInstantConnectorClassEvent);
begin
- if @Value <> @FOnSupportConnector then
+ if Addr(Value) <> Addr(FOnSupportConnector) then
begin
FOnSupportConnector := Value;
UpdateMenu;
Modified: trunk/Source/Core/InstantConsts.pas
===================================================================
--- trunk/Source/Core/InstantConsts.pas 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Core/InstantConsts.pas 2014-05-12 09:08:33 UTC (rev 963)
@@ -117,6 +117,7 @@
SDisposeConflict = 'Object %s(''%s'') was disposed by another session';
SErrorDisposingObject = 'Error disposing object %s(''%s''): "%s"';
SErrorLoadingConnectionDefs = 'Error loading connection definitions from %s: %s';
+ SErrorLoadingFile = 'Error loading file "%s": %s';
SErrorRefreshingObject = 'Error refreshing object %s(''%s''): "%s"';
SErrorRetrievingObject = 'Error retrieving object %s(''%s''): "%s"';
SErrorStoringObject = 'Error storing object %s(''%s''): "%s"';
Modified: trunk/Source/Core/InstantExplorer.pas
===================================================================
--- trunk/Source/Core/InstantExplorer.pas 2012-10-29 21:30:50 UTC (rev 962)
+++ trunk/Source/Core/InstantExplorer.pas 2014-05-12 09:08:33 UTC (rev 963)
@@ -152,8 +152,6 @@
FOnIncludeNode: TInstantExplorerIncludeNodeEvent;
FOnGetAllowedValues: TInstantExplorerGetAllowedValuesEvent;
FOnGetFieldNames: TInstantExplorerGetFieldNamesEvent;
- function AddNode(NodeType: TInstantExplorerNodeType; Parent: TTreeNode;
- Name: string; AObject: TObject; Value: string = ''): TTreeNode;
procedure ArrangeControls;
procedure AssignRootObject(Value: TObject);
procedure CreateContentView;
@@ -171,10 +169,12 @@
const APropName: string; const AAllowedValues: TStrings);
function GetImages: TCustomImageList;
procedure LoadContainerNode(Node: TTreeNode; Container: TInstantContainer);
+ procedure LoadInstantQueryNode(Node: TTreeNode; InstantQuery: TInstantQuery);
procedure LoadNode(Node: TTreeNode; LoadChildren: Boolean);
procedure LoadObjectNode(Node: TTreeNode; Instance: TObject;
var ChildCount: Integer; LoadChildren: Boolean);
function NodeIsLoaded(Node: TTreeNode): Boolean;
+ function NodeDataIsAssigned(Node: TTreeNode): Boolean;
procedure ObjectExposerAfterDelete(Sender: TDataSet);
procedure ObjectExposerAfterPost(Sender: TDataSet);
procedure ResizeControls;
@@ -190,6 +190,8 @@
function GetContentEditor: TWinControl;
function CreateFieldList: TStrings;
protected
+ function AddNode(NodeType: TInstantExplorerNodeType; Parent: TTreeNode;
+ Name: string; AObject: TObject; Value: string = ''): TTreeNode; virtual;
procedure ChangeNode(Node: TTreeNode); virtual;
function CreateContentEditor(AOwner: TComponent;
DataSource: TDataSource): TInstantExplorerContentEditor; virtual;
@@ -212,6 +214,8 @@
procedure SetNodeTypes(const Value: TInstantExplorerNodeTypes); virtual;
procedure SetRootObject(const Value: TObject); virtual;
procedure UpdateDetails;
+ functio...
[truncated message content] |
|
From: <na...@us...> - 2013-03-06 18:20:25
|
Revision: 965
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=965&view=rev
Author: nandod
Date: 2013-03-06 18:20:16 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
* Fixed DXE3 bug (see TestFieldSetValue).
Modified Paths:
--------------
trunk/Source/Core/InstantPresentation.pas
trunk/Tests/TestIO.dpr
trunk/Tests/TestIO.dproj
trunk/Tests/TestIO.mdr
trunk/Tests/TestIO.mdrt
trunk/Tests/TestIO.mdx
trunk/Tests/TestIO.mdxt
trunk/Tests/TestIO_DXE3.dproj
trunk/Tests/TestIO_DXE3.mdr
trunk/Tests/TestInstantPresentation.pas
Property Changed:
----------------
trunk/Tests/XMLDB/
Modified: trunk/Source/Core/InstantPresentation.pas
===================================================================
--- trunk/Source/Core/InstantPresentation.pas 2012-12-05 03:36:25 UTC (rev 964)
+++ trunk/Source/Core/InstantPresentation.pas 2013-03-06 18:20:16 UTC (rev 965)
@@ -474,7 +474,12 @@
procedure SaveField(Field: TField); virtual;
procedure SaveFieldValue(Field: TField; Buffer: Pointer; AObject: TObject);
procedure SetActive(Value: Boolean); override;
- procedure SetFieldData(Field: TField; Buffer: Pointer); override;
+{$IFDEF D12+}
+ procedure SetFieldData(Field: TField; Buffer: TValueBuffer); overload; override;
+{$ENDIF}
+{$IFNDEF NEXTGEN}
+ procedure SetFieldData(Field: TField; Buffer: Pointer); overload; override; {$IFDEF D12+}deprecated 'Use overloaded method instead';{$ENDIF}
+{$ENDIF}
procedure SetFiltered(Value: Boolean); override;
procedure SetRecNo(Value: Integer); override;
procedure Undo; virtual;
@@ -4221,6 +4226,7 @@
end;
end;
+{$IFNDEF NEXTGEN}
procedure TInstantCustomExposer.SetFieldData(Field: TField; Buffer: Pointer);
begin
if Assigned(Buffer) then
@@ -4239,7 +4245,30 @@
end;
end;
end;
+{$ENDIF}
+{$IFDEF D12+}
+procedure TInstantCustomExposer.SetFieldData(Field: TField;
+ Buffer: TValueBuffer);
+begin
+ if Assigned(Buffer) then
+ Move(Buffer[0], CurrentBuffer[GetFieldOffset(Field)], FieldDataSize(Field))
+ else
+ FillChar(CurrentBuffer[GetFieldOffset(Field)], FieldDataSize(Field), 0);
+ if not (State in [dsCalcFields, dsInternalCalc, dsFilter, dsNewValue]) and
+ not FInSetFieldData then
+ begin
+ FInSetFieldData := True;
+ try
+ PostField(Field);
+ DataEvent(deFieldChange, Longint(Field));
+ finally
+ FInSetFieldData := False;
+ end;
+ end;
+end;
+{$ENDIF}
+
procedure TInstantCustomExposer.SetFieldOptions(Value: TInstantFieldOptions);
begin
if Value <> FFieldOptions then
Modified: trunk/Tests/TestIO.dpr
===================================================================
--- trunk/Tests/TestIO.dpr 2012-12-05 03:36:25 UTC (rev 964)
+++ trunk/Tests/TestIO.dpr 2013-03-06 18:20:16 UTC (rev 965)
@@ -59,7 +59,8 @@
TestInstantObjectReference in 'TestInstantObjectReference.pas',
MinimalModel in 'MinimalModel.pas',
TestXMLBroker in 'TestXMLBroker.pas',
- TestInstantCode in 'TestInstantCode.pas';
+ TestInstantCode in 'TestInstantCode.pas',
+ TestInstantPresentation in 'TestInstantPresentation.pas';
{$R *.res}
{$R *.mdr} {TestModel}
Modified: trunk/Tests/TestIO.dproj
===================================================================
--- trunk/Tests/TestIO.dproj 2012-12-05 03:36:25 UTC (rev 964)
+++ trunk/Tests/TestIO.dproj 2013-03-06 18:20:16 UTC (rev 965)
@@ -37,8 +37,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
-<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages">vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;adortl;vclactnband;vclshlctrls;CS30Logging70;Rz30Ctls70;Rz30DBCtls70;ip4000v7;Rave60VCL;Rave60CLX;madBasic_;madDisAsm_;CLXIB;ibxpress;VCLIB;IOCore;IOIBX</Compiler></Compiler><Parameters><Parameters Name="DebugSourceDirs">..\Source\Core</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Program Files\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3081</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">TestIO.dpr</Source></Source></Delphi.Personality> <ModelSupport>False</ModelSupport>
-</BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Compiler><Compiler Name="UsePackages">False</Compiler><Compiler Name="Packages">vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;adortl;vclactnband;vclshlctrls;CS30Logging70;Rz30Ctls70;Rz30DBCtls70;ip4000v7;Rave60VCL;Rave60CLX;madBasic_;madDisAsm_;CLXIB;ibxpress;VCLIB;IOCore;IOIBX</Compiler></Compiler><Parameters><Parameters Name="DebugSourceDirs">..\Source\Core</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Program Files\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3081</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">TestIO.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
@@ -73,6 +72,7 @@
<DCCReference Include="TestInstantObjectStore.pas" />
<DCCReference Include="TestInstantPart.pas" />
<DCCReference Include="TestInstantParts.pas" />
+ <DCCReference Include="TestInstantPresentation.pas" />
<DCCReference Include="TestInstantReference.pas" />
<DCCReference Include="TestInstantReferences.pas" />
<DCCReference Include="TestInstantRtti.pas" />
Modified: trunk/Tests/TestIO.mdr
===================================================================
(Binary files differ)
Modified: trunk/Tests/TestIO.mdrt
===================================================================
(Binary files differ)
Modified: trunk/Tests/TestIO.mdx
===================================================================
--- trunk/Tests/TestIO.mdx 2012-12-05 03:36:25 UTC (rev 964)
+++ trunk/Tests/TestIO.mdx 2013-03-06 18:20:16 UTC (rev 965)
@@ -9,6 +9,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>TRUE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -16,6 +17,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCountry</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -23,6 +25,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>4</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -30,12 +33,14 @@
<AttributeType>atMemo</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Zip</Name>
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>10</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -51,6 +56,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -66,6 +72,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>20</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -73,6 +80,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -81,6 +89,7 @@
<EditMask>(000) 000-0000;0;_</EditMask>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>20</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -96,6 +105,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>100</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -112,6 +122,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -127,6 +138,7 @@
<AttributeType>atPart</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TAddress</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -134,6 +146,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCategory</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -141,6 +154,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>TRUE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -148,6 +162,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>TRUE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>50</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -155,6 +170,7 @@
<AttributeType>atParts</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TPhone</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -164,6 +180,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProject</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -172,6 +189,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TExternalAddress</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -181,6 +199,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TExternalPhone</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -204,12 +223,14 @@
<AttributeType>atDateTime</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Emails</Name>
<AttributeType>atParts</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TEmail</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -217,6 +238,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCompany</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -224,37 +246,43 @@
<AttributeType>atBlob</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Salary</Name>
<AttributeType>atCurrency</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
- <ValidCharsString>,.0..9\x82\xAC\xE2</ValidCharsString>
+ <IsUnique>FALSE</IsUnique>
+ <ValidCharsString>,.0..9€</ValidCharsString>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Employed</Name>
<AttributeType>atBoolean</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>AL_hours</Name>
<AttributeType>atFloat</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>EmploymentDate</Name>
<AttributeType>atDate</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>BirthTime</Name>
<AttributeType>atTime</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
</AttributeMetadatas>
@@ -270,6 +298,7 @@
<AttributeType>atReferences</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TPerson</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -277,12 +306,14 @@
<AttributeType>atInteger</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Subsidiaries</Name>
<AttributeType>atReferences</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCompany</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -299,6 +330,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -308,6 +340,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProject</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -317,6 +350,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TExternalAddress</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -324,6 +358,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TContact</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -333,6 +368,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TContact</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -340,6 +376,7 @@
<AttributeType>atPart</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProjectItems</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -356,6 +393,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -363,6 +401,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCategory</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -370,6 +409,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TPerson</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -386,6 +426,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>20</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -394,6 +435,7 @@
<EditMask>(000) 000-0000;0;_</EditMask>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>20</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -409,6 +451,7 @@
<AttributeType>atPart</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProject</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -416,6 +459,7 @@
<AttributeType>atReferences</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProjectBox</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -431,6 +475,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>50</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -438,6 +483,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCountry</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -453,6 +499,7 @@
<AttributeType>atParts</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProjectItem</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
Modified: trunk/Tests/TestIO.mdxt
===================================================================
--- trunk/Tests/TestIO.mdxt 2012-12-05 03:36:25 UTC (rev 964)
+++ trunk/Tests/TestIO.mdxt 2013-03-06 18:20:16 UTC (rev 965)
@@ -9,6 +9,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>TRUE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -16,6 +17,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCountry</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -23,6 +25,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>4</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -30,12 +33,14 @@
<AttributeType>atMemo</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Zip</Name>
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>10</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -51,6 +56,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -66,6 +72,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>20</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -73,6 +80,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -81,6 +89,7 @@
<EditMask>(000) 000-0000;0;_</EditMask>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>20</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -96,6 +105,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>100</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -111,6 +121,7 @@
<AttributeType>atPart</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TAddress</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -118,6 +129,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCategory</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -125,6 +137,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>TRUE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -132,6 +145,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>TRUE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>50</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -139,6 +153,7 @@
<AttributeType>atParts</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TPhone</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -148,6 +163,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProject</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -156,6 +172,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TExternalAddress</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -165,6 +182,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TExternalPhone</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -188,12 +206,14 @@
<AttributeType>atDateTime</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Emails</Name>
<AttributeType>atParts</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TEmail</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -201,6 +221,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCompany</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -208,37 +229,43 @@
<AttributeType>atBlob</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Salary</Name>
<AttributeType>atCurrency</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
- <ValidCharsString>,.0..9\x82\xAC\xE2</ValidCharsString>
+ <IsUnique>FALSE</IsUnique>
+ <ValidCharsString>,.0..9€</ValidCharsString>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Employed</Name>
<AttributeType>atBoolean</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>AL_hours</Name>
<AttributeType>atFloat</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>EmploymentDate</Name>
<AttributeType>atDate</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>BirthTime</Name>
<AttributeType>atTime</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
</AttributeMetadatas>
@@ -254,6 +281,7 @@
<AttributeType>atReferences</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TPerson</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -261,12 +289,14 @@
<AttributeType>atInteger</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
<Name>Subsidiaries</Name>
<AttributeType>atReferences</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCompany</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -283,6 +313,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -292,6 +323,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProject</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -301,6 +333,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TExternalAddress</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -308,6 +341,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TContact</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -317,6 +351,7 @@
<StorageKind>skExternal</StorageKind>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TContact</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -324,6 +359,7 @@
<AttributeType>atPart</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProjectItems</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -340,6 +376,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>30</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -347,6 +384,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCategory</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -354,6 +392,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TPerson</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -370,6 +409,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>20</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -378,6 +418,7 @@
<EditMask>(000) 000-0000;0;_</EditMask>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>20</Size>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -393,6 +434,7 @@
<AttributeType>atPart</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProject</ObjectClassName>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -400,6 +442,7 @@
<AttributeType>atReferences</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProjectBox</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -415,6 +458,7 @@
<AttributeType>atString</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<Size>50</Size>
</TInstantAttributeMetadata>
<TInstantAttributeMetadata>
@@ -422,6 +466,7 @@
<AttributeType>atReference</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TCountry</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
@@ -437,6 +482,7 @@
<AttributeType>atParts</AttributeType>
<IsIndexed>FALSE</IsIndexed>
<IsRequired>FALSE</IsRequired>
+ <IsUnique>FALSE</IsUnique>
<ObjectClassName>TProjectItem</ObjectClassName>
</TInstantAttributeMetadata>
</TInstantAttributeMetadatas>
Modified: trunk/Tests/TestIO_DXE3.dproj
===================================================================
--- trunk/Tests/TestIO_DXE3.dproj 2012-12-05 03:36:25 UTC (rev 964)
+++ trunk/Tests/TestIO_DXE3.dproj 2013-03-06 18:20:16 UTC (rev 965)
@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>TestIO_DXE2.exe</DCC_DependencyCheckOutputName>
- <ProjectVersion>14.3</ProjectVersion>
+ <ProjectVersion>14.4</ProjectVersion>
<Config Condition="'$(Config)'==''">Debug</Config>
<Base>True</Base>
<AppType>Application</AppType>
@@ -114,6 +114,7 @@
<DCCReference Include="MinimalModel.pas"/>
<DCCReference Include="TestXMLBroker.pas"/>
<DCCReference Include="TestInstantCode.pas"/>
+ <DCCReference Include="TestInstantPresentation.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
Modified: trunk/Tests/TestIO_DXE3.mdr
===================================================================
(Binary files differ)
Modified: trunk/Tests/TestInstantPresentation.pas
===================================================================
--- trunk/Tests/TestInstantPresentation.pas 2012-12-05 03:36:25 UTC (rev 964)
+++ trunk/Tests/TestInstantPresentation.pas 2013-03-06 18:20:16 UTC (rev 965)
@@ -53,6 +53,8 @@
procedure TearDown; override;
published
procedure TestFieldGetValue;
+ procedure TestFieldSetValue;
+ procedure TestEditPost;
end;
implementation
@@ -93,6 +95,23 @@
AssertEquals('John Doe', FInstantExposer.FieldByName('Name').AsString);
end;
+procedure TestTInstantExposer.TestFieldSetValue;
+begin
+ FInstantExposer.FieldByName('Name').AsString := 'Jane Doe';
+ AssertEquals('Jane Doe', FInstantExposer.FieldByName('Name').AsString);
+end;
+
+procedure TestTInstantExposer.TestEditPost;
+begin
+ FInstantExposer.Edit;
+ FInstantExposer.FieldByName('Name').AsString := 'Jane Doe';
+ AssertEquals('Jane Doe', FInstantExposer.FieldByName('Name').AsString);
+ AssertEquals('Jane Doe', FPerson.Name);
+ FInstantExposer.Post;
+ AssertEquals('Jane Doe', FInstantExposer.FieldByName('Name').AsString);
+ AssertEquals('Jane Doe', FPerson.Name);
+end;
+
initialization
// Register any test cases with the test runner
{$IFNDEF CURR_TESTS}
Property changes on: trunk/Tests/XMLDB
___________________________________________________________________
Added: svn:ignore
+ Contact
|
|
From: <dav...@us...> - 2012-12-05 03:36:32
|
Revision: 964
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=964&view=rev
Author: davidvtaylor
Date: 2012-12-05 03:36:25 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
* Fix to keep empty strings attributes from being converted to null when UseNull is false
Modified Paths:
--------------
trunk/Source/Core/InstantBrokers.pas
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2012-11-27 19:51:24 UTC (rev 963)
+++ trunk/Source/Core/InstantBrokers.pas 2012-12-05 03:36:25 UTC (rev 964)
@@ -3060,7 +3060,8 @@
begin
LParam := AddStringParam(Params, FieldName, (Attribute as TInstantString).Value);
if Attribute.IsNull then
- LParam.Clear;
+ LParam.Clear else
+ LParam.AsString := (Attribute as TInstantString).Value;
end;
begin
|
|
From: <dav...@us...> - 2012-11-27 19:51:31
|
Revision: 963
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=963&view=rev
Author: davidvtaylor
Date: 2012-11-27 19:51:24 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
- Remove extraneous .identcache file
Removed Paths:
-------------
trunk/Source/Design/DXE3/DclIOCore.identcache
Deleted: trunk/Source/Design/DXE3/DclIOCore.identcache
===================================================================
(Binary files differ)
|
|
From: <na...@us...> - 2012-10-29 21:31:04
|
Revision: 962
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=962&view=rev
Author: nandod
Date: 2012-10-29 21:30:50 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
+ DXE3 packages.
* DXE3 changes.
+ InstantPersistence test unit with test for a DXE3 related bug.
* Small fixes/enhancements.
Modified Paths:
--------------
trunk/Demos/PrimerCross/ContactView.pas
trunk/Demos/PrimerCross/Main.pas
trunk/Demos/PrimerCross/Utility.pas
trunk/Source/Core/InstantAccessors.pas
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantCommand.pas
trunk/Source/Core/InstantConnectionManager.pas
trunk/Source/Core/InstantConnectionManagerFormUnit.pas
trunk/Source/Core/InstantConsts.pas
trunk/Source/Core/InstantCustomDBEvolverFormUnit.pas
trunk/Source/Core/InstantExplorer.pas
trunk/Source/Core/InstantMetadata.pas
trunk/Source/Core/InstantPersistence.pas
trunk/Source/Core/InstantPresentation.pas
trunk/Source/Core/InstantValidation.pas
trunk/Source/Design/InstantModelExpert.pas
trunk/Source/InstantDefines.inc
trunk/Tests/TestInstantAttribute.pas
trunk/Tests/TestInstantBoolean.pas
trunk/Tests/TestInstantCache.pas
trunk/Tests/TestInstantClassMetadata.pas
trunk/Tests/TestInstantComplex.pas
trunk/Tests/TestInstantCurrency.pas
trunk/Tests/TestInstantDate.pas
trunk/Tests/TestInstantDateTime.pas
trunk/Tests/TestInstantFieldMetadata.pas
trunk/Tests/TestInstantFloat.pas
trunk/Tests/TestInstantIndexMetadata.pas
trunk/Tests/TestInstantInteger.pas
trunk/Tests/TestInstantNumeric.pas
trunk/Tests/TestInstantObjectStore.pas
trunk/Tests/TestInstantScheme.pas
trunk/Tests/TestInstantString.pas
trunk/Tests/TestInstantTableMetadata.pas
trunk/Tests/TestInstantTime.pas
trunk/Tests/TestMinimalModel.pas
trunk/Tests/TestXMLBroker.pas
Added Paths:
-----------
trunk/Demos/PrimerCross/Primer_DXE3.dpr
trunk/Demos/PrimerCross/Primer_DXE3.dproj
trunk/Demos/PrimerCross/Primer_DXE3.mdr
trunk/Demos/PrimerCross/Primer_DXE3.res
trunk/Demos/PrimerCross/Primer_DXE3.xml
trunk/Source/Brokers/ADO/DXE3/
trunk/Source/Brokers/ADO/DXE3/DclIOADO.dpk
trunk/Source/Brokers/ADO/DXE3/DclIOADO.dproj
trunk/Source/Brokers/ADO/DXE3/DclIOADO.res
trunk/Source/Brokers/ADO/DXE3/IOADO.dpk
trunk/Source/Brokers/ADO/DXE3/IOADO.dproj
trunk/Source/Brokers/ADO/DXE3/IOADO.res
trunk/Source/Brokers/BDE/DXE3/
trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dpk
trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dproj
trunk/Source/Brokers/BDE/DXE3/DclIOBDE.res
trunk/Source/Brokers/BDE/DXE3/IOBDE.dpk
trunk/Source/Brokers/BDE/DXE3/IOBDE.dproj
trunk/Source/Brokers/BDE/DXE3/IOBDE.res
trunk/Source/Brokers/DBX/DXE3/
trunk/Source/Brokers/DBX/DXE3/DclIODBX.dpk
trunk/Source/Brokers/DBX/DXE3/DclIODBX.dproj
trunk/Source/Brokers/DBX/DXE3/DclIODBX.res
trunk/Source/Brokers/DBX/DXE3/IODBX.dpk
trunk/Source/Brokers/DBX/DXE3/IODBX.dproj
trunk/Source/Brokers/DBX/DXE3/IODBX.res
trunk/Source/Brokers/IBX/DXE3/
trunk/Source/Brokers/IBX/DXE3/DclIOIBX.dpk
trunk/Source/Brokers/IBX/DXE3/DclIOIBX.dproj
trunk/Source/Brokers/IBX/DXE3/DclIOIBX.res
trunk/Source/Brokers/IBX/DXE3/IOIBX.dpk
trunk/Source/Brokers/IBX/DXE3/IOIBX.dproj
trunk/Source/Brokers/IBX/DXE3/IOIBX.res
trunk/Source/Brokers/XML/DXE3/
trunk/Source/Brokers/XML/DXE3/DclIOXML.dpk
trunk/Source/Brokers/XML/DXE3/DclIOXML.dproj
trunk/Source/Brokers/XML/DXE3/DclIOXML.res
trunk/Source/Brokers/XML/DXE3/IOXML.dpk
trunk/Source/Brokers/XML/DXE3/IOXML.dproj
trunk/Source/Brokers/XML/DXE3/IOXML.res
trunk/Source/Catalogs/IBFb/DXE3/
trunk/Source/Catalogs/IBFb/DXE3/IOIBFbCatalog.dpk
trunk/Source/Catalogs/IBFb/DXE3/IOIBFbCatalog.dproj
trunk/Source/Catalogs/IBFb/DXE3/IOIBFbCatalog.res
trunk/Source/Catalogs/MSSql/DXE3/
trunk/Source/Catalogs/MSSql/DXE3/IOMSSqlCatalog.dpk
trunk/Source/Catalogs/MSSql/DXE3/IOMSSqlCatalog.dproj
trunk/Source/Catalogs/MSSql/DXE3/IOMSSqlCatalog.res
trunk/Source/Catalogs/MySQL/DXE3/
trunk/Source/Catalogs/MySQL/DXE3/IOMySQLCatalog.dpk
trunk/Source/Catalogs/MySQL/DXE3/IOMySQLCatalog.dproj
trunk/Source/Catalogs/MySQL/DXE3/IOMySQLCatalog.res
trunk/Source/Core/DXE3/
trunk/Source/Core/DXE3/IOCore.dpk
trunk/Source/Core/DXE3/IOCore.dproj
trunk/Source/Core/DXE3/IOCore.res
trunk/Source/Design/DXE3/
trunk/Source/Design/DXE3/DclIOCore.dpk
trunk/Source/Design/DXE3/DclIOCore.dproj
trunk/Source/Design/DXE3/DclIOCore.identcache
trunk/Source/Design/DXE3/DclIOCore.res
trunk/Source/PackageGroups/DXE3/
trunk/Source/PackageGroups/DXE3/DesignTimePackages.groupproj
trunk/Source/PackageGroups/DXE3/RunTimePackages.groupproj
trunk/Tests/TestIO_DXE3.dpr
trunk/Tests/TestIO_DXE3.dproj
trunk/Tests/TestIO_DXE3.mdr
trunk/Tests/TestIO_DXE3.mdrt
trunk/Tests/TestIO_DXE3.mdx
trunk/Tests/TestIO_DXE3.mdxt
trunk/Tests/TestIO_DXE3.res
trunk/Tests/TestInstantPresentation.pas
Modified: trunk/Demos/PrimerCross/ContactView.pas
===================================================================
--- trunk/Demos/PrimerCross/ContactView.pas 2012-10-29 20:44:39 UTC (rev 961)
+++ trunk/Demos/PrimerCross/ContactView.pas 2012-10-29 21:30:50 UTC (rev 962)
@@ -20,6 +20,7 @@
QComCtrls, QGrids, QDBGrids, QExtCtrls, QButtons,
QStdCtrls, QActnList, QImgList, QMenus, Types,
{$ENDIF}
+ {$IFDEF D17+}Actions,{$ENDIF}
BasicView, Model, InstantPresentation, InstantExplorer;
type
Modified: trunk/Demos/PrimerCross/Main.pas
===================================================================
--- trunk/Demos/PrimerCross/Main.pas 2012-10-29 20:44:39 UTC (rev 961)
+++ trunk/Demos/PrimerCross/Main.pas 2012-10-29 21:30:50 UTC (rev 962)
@@ -19,7 +19,8 @@
QMenus, QExtCtrls, QComCtrls, QGrids, QDBGrids, QImgList, QActnList,
{$ENDIF}
InstantPersistence, BasicView, Stopwatch,
- InstantConnectionManagerFormUnit, InstantConnectionManager;
+ InstantConnectionManagerFormUnit, InstantConnectionManager
+ {$IFDEF D17+}, System.Actions{$ENDIF};
type
TMainForm = class(TForm)
@@ -153,7 +154,8 @@
// versions of Delphi. If you get a compilation error it means you
// don't have an Enterprise version of Delphi - just remove them.
DBXFirebird, DBXInterBase, DBXDB2, DBXMSSql, DBXOracle,
- {$ENDIF}{$ENDIF}
+ {$ENDIF}
+{$ENDIF}
{$IFDEF LINUX}
InstantDBX,
{$ENDIF}
Added: trunk/Demos/PrimerCross/Primer_DXE3.dpr
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE3.dpr (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE3.dpr 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,80 @@
+(*
+ * InstantObjects
+ * Primer Demo - with "internal storage" of Part and Parts
+ * Model.pas unit is located in Model folder
+ *
+ *)
+
+(* ***** 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: Seleqt InstantObjects
+ *
+ * The Initial Developer of the Original Code is: Seleqt
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Carlo Barazzetta, Nando Dessena
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+program Primer_DXE3;
+
+{$IFDEF LINUX}
+{$I '../../Source/InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\Source\InstantDefines.inc'}
+{$ENDIF}
+
+
+uses
+ Forms,
+ Main in 'Main.pas' {MainForm},
+ Model in 'Model\Model.pas',
+ ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
+ BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
+ BasicEdit in 'BasicEdit.pas' {BasicEditForm},
+ ContactEdit in 'ContactEdit.pas' {ContactEditForm},
+ PersonEdit in 'PersonEdit.pas' {PersonEditForm},
+ CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm},
+ DemoData in 'DemoData.pas',
+ ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm},
+ MainData in 'MainData.pas' {MainDataModule: TDataModule},
+ ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm},
+ CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm},
+ PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame},
+ Welcome in 'Welcome.pas' {WelcomeForm},
+ PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm},
+ BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm},
+ CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm},
+ DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm},
+ 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';
+
+{$R *.res}
+{$R *.mdr} {Model}
+
+begin
+ Application.Initialize;
+ Application.Title := 'InstantObjects Primer Demo (Delphi XE3 version)';
+ Application.CreateForm(TMainForm, MainForm);
+ Application.CreateForm(TMainDataModule, MainDataModule);
+ Application.Run;
+end.
Property changes on: trunk/Demos/PrimerCross/Primer_DXE3.dpr
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Demos/PrimerCross/Primer_DXE3.dproj
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE3.dproj (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE3.dproj 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,223 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid>
+ <MainSource>Primer_DXE3.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName>
+ <ProjectVersion>14.3</ProjectVersion>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <Base>True</Base>
+ <AppType>Application</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <Icon_MainIcon>Primer_DXE3_Icon.ico</Icon_MainIcon>
+ <Manifest_File>None</Manifest_File>
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_MajorVer>2</VerInfo_MajorVer>
+ <VerInfo_Locale>1030</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
+ <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_UnitSearchPath>
+ <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage>
+ <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <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_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_DebugDCUs>true</DCC_DebugDCUs>
+ <Version>7.0</Version>
+ <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_MajorVer>1</VerInfo_MajorVer>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <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 Name="LegalCopyright">MPL public license</VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"/>
+ <VersionInfoKeys Name="OriginalFilename"/>
+ <VersionInfoKeys Name="ProductName"/>
+ <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"/>
+ </VersionInfoKeys>
+ <Source>
+ <Source Name="MainSource">Primer_DXE3.dpr</Source>
+ </Source>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <ModelSupport>False</ModelSupport>
+ <Platforms>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="Main.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="Model\Model.pas"/>
+ <DCCReference Include="ContactView.pas">
+ <Form>ContactViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicView.pas">
+ <Form>BasicViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicEdit.pas">
+ <Form>BasicEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEdit.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonEdit.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyEdit.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoData.pas"/>
+ <DCCReference Include="ContactFilterEdit.pas">
+ <Form>ContactFilterEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="MainData.pas">
+ <Form>MainDataModule</Form>
+ <DesignClass>TDataModule</DesignClass>
+ </DCCReference>
+ <DCCReference Include="ContactBrowse.pas">
+ <Form>ContactBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyBrowse.pas">
+ <Form>CompanyBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="PerformanceView.pas">
+ <Form>PerformanceViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="Welcome.pas">
+ <Form>WelcomeForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonBrowse.pas">
+ <Form>PersonBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicBrowse.pas">
+ <Form>BasicBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CountryBrowse.pas">
+ <Form>CountryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoDataRequest.pas">
+ <Form>DemoDataRequestForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactSort.pas">
+ <Form>ContactSortForm</Form>
+ </DCCReference>
+ <DCCReference Include="CategoryBrowse.pas">
+ <Form>CategoryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="HelpView.pas">
+ <Form>HelpViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="QueryView.pas">
+ <Form>QueryViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="RandomData.pas"/>
+ <DCCReference Include="Stopwatch.pas"/>
+ <DCCReference Include="Utility.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE3.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Demos/PrimerCross/Primer_DXE3.mdr
===================================================================
(Binary files differ)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE3.mdr
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Demos/PrimerCross/Primer_DXE3.res
===================================================================
(Binary files differ)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE3.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Demos/PrimerCross/Primer_DXE3.xml
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE3.xml (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE3.xml 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,29 @@
+<TInstantConnectionDefs>
+ <TInstantBDEConnectionDef>
+ <Name>ParadoxDB</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <DriverName>STANDARD</DriverName>
+ <Parameters>PATH=.\ParadoxDB
+DEFAULT DRIVER=PARADOX
+ENABLE BCD=TRUE
+</Parameters>
+ </TInstantBDEConnectionDef>
+ <TInstantIBXConnectionDef>
+ <Name>FirebirdDB</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <ConnectionString>localhost:c:\db\primercrossutf8.fdb</ConnectionString>
+ <Options></Options>
+ <Params>user_name=SYSDBA
+password=masterkey
+lc_ctype=UTF8</Params>
+ </TInstantIBXConnectionDef>
+ <TInstantXMLConnectionDef>
+ <Name>XmlDB</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <RootFolder>.\XmlDB</RootFolder>
+ </TInstantXMLConnectionDef>
+</TInstantConnectionDefs>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE3.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/Demos/PrimerCross/Utility.pas
===================================================================
--- trunk/Demos/PrimerCross/Utility.pas 2012-10-29 20:44:39 UTC (rev 961)
+++ trunk/Demos/PrimerCross/Utility.pas 2012-10-29 21:30:50 UTC (rev 962)
@@ -21,6 +21,9 @@
{$IFDEF LINUX}
QForms, QDialogs, QControls,
{$ENDIF}
+{$IFDEF D17+}
+ System.UITypes,
+{$ENDIF}
SysUtils;
var
Added: trunk/Source/Brokers/ADO/DXE3/DclIOADO.dpk
===================================================================
--- trunk/Source/Brokers/ADO/DXE3/DclIOADO.dpk (rev 0)
+++ trunk/Source/Brokers/ADO/DXE3/DclIOADO.dpk 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,41 @@
+package DclIOADO;
+
+{$R *.res}
+{$R '..\InstantADO.dcr'}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS ON}
+{$RANGECHECKS ON}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects ADO Design-Time Support (Delphi XE3)'}
+{$LIBSUFFIX '_D17'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ rtl,
+ IOADO;
+
+contains
+ InstantADOReg in '..\InstantADOReg.pas';
+
+end.
Property changes on: trunk/Source/Brokers/ADO/DXE3/DclIOADO.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/ADO/DXE3/DclIOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/DXE3/DclIOADO.dproj (rev 0)
+++ trunk/Source/Brokers/ADO/DXE3/DclIOADO.dproj 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,148 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{25086FF7-139E-40BB-9278-EDE3F344302B}</ProjectGuid>
+ <MainSource>DclIOADO.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>14.3</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <DesignOnlyPackage>true</DesignOnlyPackage>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects ADO Design-Time Support (Delphi XE3)</DCC_Description>
+ <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
+ <DCC_RangeChecking>true</DCC_RangeChecking>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <DCC_F>false</DCC_F>
+ <GenPackage>true</GenPackage>
+ <DllSuffix>_D17</DllSuffix>
+ <DCC_E>false</DCC_E>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <DCC_UsePackage>IOADO;$(DCC_UsePackage)</DCC_UsePackage>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>false</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantADO.dcr"/>
+ <DCCReference Include="rtl.dcp"/>
+ <DCCReference Include="IOADO.dcp"/>
+ <DCCReference Include="..\InstantADOReg.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">DclIOADO.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="OSX32">False</Platform>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Source/Brokers/ADO/DXE3/DclIOADO.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/ADO/DXE3/DclIOADO.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/ADO/DXE3/DclIOADO.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Source/Brokers/ADO/DXE3/IOADO.dpk
===================================================================
--- trunk/Source/Brokers/ADO/DXE3/IOADO.dpk (rev 0)
+++ trunk/Source/Brokers/ADO/DXE3/IOADO.dpk 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,47 @@
+package IOADO;
+
+{$R *.res}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects ADO Run-Time Support (Delphi XE3)'}
+{$LIBSUFFIX '_D17'}
+{$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.
Property changes on: trunk/Source/Brokers/ADO/DXE3/IOADO.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/ADO/DXE3/IOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/DXE3/IOADO.dproj (rev 0)
+++ trunk/Source/Brokers/ADO/DXE3/IOADO.dproj 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,159 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{A15C8D03-E537-4203-982B-A812DB31354A}</ProjectGuid>
+ <MainSource>IOADO.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <ProjectVersion>14.3</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+ <Cfg_1_Win32>true</Cfg_1_Win32>
+ <CfgParent>Cfg_1</CfgParent>
+ <Cfg_1>true</Cfg_1>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <DllSuffix>_D17</DllSuffix>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DCC_Description>InstantObjects ADO Run-Time Support (Delphi XE3)</DCC_Description>
+ <DCC_WriteableConstants>true</DCC_WriteableConstants>
+ <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;Data.Win;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <GenPackage>true</GenPackage>
+ <DCC_F>false</DCC_F>
+ <DCC_E>false</DCC_E>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <DCC_Namespace>Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>false</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="vcl.dcp"/>
+ <DCCReference Include="vcldb.dcp"/>
+ <DCCReference Include="adortl.dcp"/>
+ <DCCReference Include="IOCore.dcp"/>
+ <DCCReference Include="IOMSSqlCatalog.dcp"/>
+ <DCCReference Include="..\InstantADOX.pas"/>
+ <DCCReference Include="..\InstantADOJRO.pas"/>
+ <DCCReference Include="..\InstantADOTools.pas"/>
+ <DCCReference Include="..\InstantADOConnectionDefEdit.pas">
+ <Form>InstantADOConnectionDefEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantADO.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">IOADO.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Source/Brokers/ADO/DXE3/IOADO.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/ADO/DXE3/IOADO.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/ADO/DXE3/IOADO.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dpk
===================================================================
--- trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dpk (rev 0)
+++ trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dpk 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,44 @@
+package DclIOBDE;
+
+{$R *.res}
+{$R '..\InstantBDE.dcr'}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects BDE Design-Time Support (Delphi XE3)'}
+{$LIBSUFFIX '_D17'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vcldb,
+ bdertl,
+ IOCore,
+ IOBDE;
+
+contains
+ InstantBDEReg in '..\InstantBDEReg.pas';
+
+end.
Property changes on: trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dproj
===================================================================
--- trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dproj (rev 0)
+++ trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dproj 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,156 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{9E226AEF-6EE8-445D-A0C4-59B39B5B77CD}</ProjectGuid>
+ <MainSource>DclIOBDE.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <ProjectVersion>14.3</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+ <Base_Win64>true</Base_Win64>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DesignOnlyPackage>true</DesignOnlyPackage>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DllSuffix>_D17</DllSuffix>
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects BDE Design-Time Support (Delphi XE3)</DCC_Description>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <GenPackage>true</GenPackage>
+ <DCC_F>false</DCC_F>
+ <DCC_E>false</DCC_E>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <DCC_UsePackage>vcl;bdertl;vcldb;IOCore;IOBDE;$(DCC_UsePackage)</DCC_UsePackage>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win64)'!=''">
+ <DCC_UsePackage>vcl;vcldb;$(DCC_UsePackage)</DCC_UsePackage>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>false</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantBDE.dcr"/>
+ <DCCReference Include="vcl.dcp"/>
+ <DCCReference Include="vcldb.dcp"/>
+ <DCCReference Include="bdertl.dcp"/>
+ <DCCReference Include="IOCore.dcp"/>
+ <DCCReference Include="IOBDE.dcp"/>
+ <DCCReference Include="..\InstantBDEReg.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">DclIOBDE.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Win32">True</Platform>
+ <Platform value="Win64">False</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>
Property changes on: trunk/Source/Brokers/BDE/DXE3/DclIOBDE.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/BDE/DXE3/DclIOBDE.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/BDE/DXE3/DclIOBDE.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Source/Brokers/BDE/DXE3/IOBDE.dpk
===================================================================
--- trunk/Source/Brokers/BDE/DXE3/IOBDE.dpk (rev 0)
+++ trunk/Source/Brokers/BDE/DXE3/IOBDE.dpk 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,44 @@
+package IOBDE;
+
+{$R *.res}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects BDE Run-Time Support (Delphi XE3)'}
+{$LIBSUFFIX '_D17'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vcldb,
+ bdertl,
+ IOCore;
+
+contains
+ InstantBDECatalog in '..\InstantBDECatalog.pas',
+ InstantBDEConnectionDefEdit in '..\InstantBDEConnectionDefEdit.pas' {InstantBDEConnectionDefEditForm},
+ InstantBDE in '..\InstantBDE.pas';
+
+end.
Property changes on: trunk/Source/Brokers/BDE/DXE3/IOBDE.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/BDE/DXE3/IOBDE.dproj
===================================================================
--- trunk/Source/Brokers/BDE/DXE3/IOBDE.dproj (rev 0)
+++ trunk/Source/Brokers/BDE/DXE3/IOBDE.dproj 2012-10-29 21:30:50 UTC (rev 962)
@@ -0,0 +1,149 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{BC7A03A0-6158-49B0-A344-E150F5E9AC94}</ProjectGuid>
+ <MainSource>IOBDE.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <ProjectVersion>14.3</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ ...
[truncated message content] |
|
From: <na...@us...> - 2012-10-29 20:44:49
|
Revision: 961
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=961&view=rev
Author: nandod
Date: 2012-10-29 20:44:39 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
+ Assorted files for older Delphi versions.
Modified Paths:
--------------
trunk/Demos/PrimerCross/PrimerExternal_DXE.dproj
trunk/Demos/PrimerCross/PrimerExternal_DXE.res
trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj
trunk/Source/Brokers/ADO/DXE2/DclIOADO.res
trunk/Source/Brokers/ADO/DXE2/IOADO.res
trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj
trunk/Source/Brokers/BDE/DXE2/DclIOBDE.res
trunk/Source/Brokers/BDE/DXE2/IOBDE.res
trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj
trunk/Source/Brokers/DBX/DXE2/DclIODBX.res
trunk/Source/Brokers/DBX/DXE2/IODBX.res
trunk/Source/Brokers/IBX/D2007/DclIOIBX.dproj
trunk/Source/Brokers/IBX/DXE2/DclIOIBX.res
trunk/Source/Brokers/IBX/DXE2/IOIBX.res
trunk/Source/Brokers/XML/D2007/DclIOXML.dproj
trunk/Source/Brokers/XML/DXE2/DclIOXML.res
trunk/Source/Brokers/XML/DXE2/IOXML.res
trunk/Source/Catalogs/IBFb/DXE2/IOIBFbCatalog.res
trunk/Source/Catalogs/MSSql/DXE2/IOMSSqlCatalog.res
trunk/Source/Catalogs/MySQL/DXE2/IOMySQLCatalog.res
trunk/Source/Core/DXE2/IOCore.res
trunk/Source/Design/D2007/DclIOCore.dproj
trunk/Source/Design/DXE2/DclIOCore.res
trunk/Tests/TestIO_DXE2.dpr
trunk/Tests/TestIO_DXE2.dproj
trunk/Tests/TestIO_DXE2.mdrt
trunk/Tests/TestIO_DXE2.mdx
trunk/Tests/TestIO_DXE2.mdxt
trunk/Tests/TestIO_DXE2.res
Added Paths:
-----------
trunk/Demos/PrimerCross/Primer_DXE2.dpr
trunk/Demos/PrimerCross/Primer_DXE2.dproj
trunk/Demos/PrimerCross/Primer_DXE2.mdr
trunk/Demos/PrimerCross/Primer_DXE2.res
trunk/Demos/PrimerCross/Primer_DXE2.xml
trunk/Demos/PrimerCross/Primer_DXE2_Icon.ico
trunk/Source/Brokers/NexusDb/D2007/
trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dpk
trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dproj
trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dpk
trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dproj
trunk/Source/Brokers/NexusDb/D2007/IONexusDB.res
trunk/Source/Brokers/NexusDb/D2009/
trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dpk
trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dproj
trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.res
trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dpk
trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dproj
trunk/Source/Brokers/NexusDb/D2009/IONexusDB.res
trunk/Source/Brokers/UIB/D2007/
trunk/Source/Brokers/UIB/D2007/DclIOUIB.dpk
trunk/Source/Brokers/UIB/D2007/DclIOUIB.dproj
trunk/Source/Brokers/UIB/D2007/DclIOUIB.res
trunk/Source/Brokers/UIB/D2007/IOUIB.dpk
trunk/Source/Brokers/UIB/D2007/IOUIB.dproj
trunk/Source/Brokers/UIB/D2007/IOUIB.res
Modified: trunk/Demos/PrimerCross/PrimerExternal_DXE.dproj
===================================================================
--- trunk/Demos/PrimerCross/PrimerExternal_DXE.dproj 2012-10-29 20:37:39 UTC (rev 960)
+++ trunk/Demos/PrimerCross/PrimerExternal_DXE.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -5,16 +5,27 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>PrimerExternal.exe</DCC_DependencyCheckOutputName>
- <ProjectVersion>12.2</ProjectVersion>
+ <ProjectVersion>13.4</ProjectVersion>
<Config Condition="'$(Config)'==''">Debug</Config>
<Base>True</Base>
- <Platform>Win32</Platform>
<AppType>Application</AppType>
<FrameworkType>VCL</FrameworkType>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ <TargetedPlatforms>1</TargetedPlatforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+ <Base_Win64>true</Base_Win64>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
<Cfg_1>true</Cfg_1>
<CfgParent>Base</CfgParent>
@@ -26,10 +37,25 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
- <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_MajorVer>2</VerInfo_MajorVer>
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
+ <VerInfo_Locale>1030</VerInfo_Locale>
<DCC_Define>IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define>
<DCC_DependencyCheckOutputName>PrimerExternal_D2009.exe</DCC_DependencyCheckOutputName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win64)'!=''">
+ <Icon_MainIcon>PrimerExternal_DXE_Icon1.ico</Icon_MainIcon>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <Icon_MainIcon>PrimerExternal_DXE_Icon1.ico</Icon_MainIcon>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<Version>7.0</Version>
<DCC_DebugInformation>False</DCC_DebugInformation>
@@ -93,13 +119,14 @@
</Source>
</Delphi.Personality>
<Platforms>
+ <Platform value="Win64">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
</ProjectExtensions>
<ItemGroup>
- <DelphiCompile Include="PrimerExternal_DXE.dpr">
+ <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="Main.pas">
@@ -189,5 +216,5 @@
</BuildConfiguration>
</ItemGroup>
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
- <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
</Project>
Modified: trunk/Demos/PrimerCross/PrimerExternal_DXE.res
===================================================================
(Binary files differ)
Added: trunk/Demos/PrimerCross/Primer_DXE2.dpr
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE2.dpr (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE2.dpr 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,80 @@
+(*
+ * InstantObjects
+ * Primer Demo - with "internal storage" of Part and Parts
+ * Model.pas unit is located in Model folder
+ *
+ *)
+
+(* ***** 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: Seleqt InstantObjects
+ *
+ * The Initial Developer of the Original Code is: Seleqt
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Carlo Barazzetta, Nando Dessena
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+program Primer_DXE2;
+
+{$IFDEF LINUX}
+{$I '../../Source/InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\Source\InstantDefines.inc'}
+{$ENDIF}
+
+
+uses
+ Forms,
+ Main in 'Main.pas' {MainForm},
+ Model in 'Model\Model.pas',
+ ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
+ BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
+ BasicEdit in 'BasicEdit.pas' {BasicEditForm},
+ ContactEdit in 'ContactEdit.pas' {ContactEditForm},
+ PersonEdit in 'PersonEdit.pas' {PersonEditForm},
+ CompanyEdit in 'CompanyEdit.pas' {CompanyEditForm},
+ DemoData in 'DemoData.pas',
+ ContactFilterEdit in 'ContactFilterEdit.pas' {ContactFilterEditForm},
+ MainData in 'MainData.pas' {MainDataModule: TDataModule},
+ ContactBrowse in 'ContactBrowse.pas' {ContactBrowseForm},
+ CompanyBrowse in 'CompanyBrowse.pas' {CompanyBrowseForm},
+ PerformanceView in 'PerformanceView.pas' {PerformanceViewForm: TFrame},
+ Welcome in 'Welcome.pas' {WelcomeForm},
+ PersonBrowse in 'PersonBrowse.pas' {PersonBrowseForm},
+ BasicBrowse in 'BasicBrowse.pas' {BasicBrowseForm},
+ CountryBrowse in 'CountryBrowse.pas' {CountryBrowseForm},
+ DemoDataRequest in 'DemoDataRequest.pas' {DemoDataRequestForm},
+ 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';
+
+{$R *.res}
+{$R *.mdr} {Model}
+
+begin
+ Application.Initialize;
+ Application.Title := 'InstantObjects Primer Demo (Delphi XE2 version)';
+ Application.CreateForm(TMainForm, MainForm);
+ Application.CreateForm(TMainDataModule, MainDataModule);
+ Application.Run;
+end.
Property changes on: trunk/Demos/PrimerCross/Primer_DXE2.dpr
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Demos/PrimerCross/Primer_DXE2.dproj
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE2.dproj (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE2.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,227 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{d197a2d4-31b9-43b1-8070-3f804d86e53f}</ProjectGuid>
+ <MainSource>Primer_DXE2.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>Primer.exe</DCC_DependencyCheckOutputName>
+ <ProjectVersion>13.4</ProjectVersion>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <Base>True</Base>
+ <AppType>Application</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+ <Base_Win64>true</Base_Win64>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+ <Cfg_2_Win32>true</Cfg_2_Win32>
+ <CfgParent>Cfg_2</CfgParent>
+ <Cfg_2>true</Cfg_2>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;VCLTee;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_MajorVer>2</VerInfo_MajorVer>
+ <VerInfo_Locale>1030</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=InstantObjects.org;FileDescription=Primer Demo;FileVersion=2.0.0.0;InternalName=;LegalCopyright=MPL public license;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
+ <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_UnitSearchPath>
+ <DCC_UsePackage>vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclimg;vclactnband;adortl;vcldbx;dbexpress;DbxCommonDriver;DataSnapIndy10ServerTransport;DataSnapProviderClient;vclie;xmlrtl;inet;dsnap;inetdb;IndySystem;IndyCore;IndyProtocols;DbxClientDriver;inetdbxpress;inetdbbde;DataSnapServer;dbxcds;DBXInterBaseDriver;DBXMySQLDriver;DBXFirebirdDriver;DBXSybaseASEDriver;DBXSybaseASADriver;DBXOracleDriver;DBXMSSQLDriver;DBXInformixDriver;DBXDb2Driver;vclib;ibxpress;intrawebdb_100_140;Intraweb_100_140;dsnapcon;vclribbon;VclSmp;soaprtl;TeeUI;TeeDB;Tee;vcltouch;webdsnap;websnap;rbRIDE1114;rbIDE1114;rbRAP1114;rbRCL1114;dclRBADO1114;rbADO1114;rbDB1114;rbDAD1114;dclRBBDE1114;rbDBDE1114;rbBDE1114;dclRBDBE1114;rbDBE1114;dclRBE1114;rbCIDE1114;dclRBIBE1114;rbIBE1114;rbUSERDesign1114;rbUSER1114;ActionBandExtensionsD2010;UniSynEdit_R2010;wPDF3_D2010;WPViewPDF_D2010;IOCore;Jcl;JclVcl;JvCoreD14R;JvSystemD14R;JvStdCtrlsD14R;JvAppFrmD14R;JvBandsD14R;JvDBD14R;JvDlgsD14R;JvBDED14R;JvCmpD14R;JvCryptD14R;JvCtrlsD14R;JvCustomD14R;JvDockingD14R;JvDotNetCtrlsD14R;JvEDID14R;JvGlobusD14R;JvHMID14R;JvInterpreterD14R;JvJansD14R;JvManagedThreadsD14R;JvMMD14R;JvNetD14R;JvPageCompsD14R;JvPluginD14R;JvPrintPreviewD14R;JvRuntimeDesignD14R;JvTimeFrameworkD14R;JvValidatorsD14R;JvWizardD14R;JvXPCtrlsD14R;rbDIDE1114;IOIBX;IOXML;IODBX;IOBDE;IOADO;ISRtl5;ISVcl5;ISOpenOffice5;ISFLib5;$(DCC_UsePackage)</DCC_UsePackage>
+ <DCC_DependencyCheckOutputName>Primer_DXE.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win64)'!=''">
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <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_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_DebugDCUs>true</DCC_DebugDCUs>
+ <Version>7.0</Version>
+ <DCC_Define>DEBUG;IO_STATEMENT_LOGGING;$(DCC_Define)</DCC_Define>
+ <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_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_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)</DCC_IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <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 Name="LegalCopyright">MPL public license</VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"/>
+ <VersionInfoKeys Name="OriginalFilename"/>
+ <VersionInfoKeys Name="ProductName"/>
+ <VersionInfoKeys Name="ProductVersion">2.0</VersionInfoKeys>
+ <VersionInfoKeys Name="Comments"/>
+ </VersionInfoKeys>
+ <Source>
+ <Source Name="MainSource">Primer_DXE2.dpr</Source>
+ </Source>
+ <Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+ </Excluded_Packages>
+ </Delphi.Personality>
+ <ModelSupport>False</ModelSupport>
+ <Platforms>
+ <Platform value="Win64">False</Platform>
+ <Platform value="Win32">True</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="Main.pas">
+ <Form>MainForm</Form>
+ </DCCReference>
+ <DCCReference Include="Model\Model.pas"/>
+ <DCCReference Include="ContactView.pas">
+ <Form>ContactViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicView.pas">
+ <Form>BasicViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="BasicEdit.pas">
+ <Form>BasicEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactEdit.pas">
+ <Form>ContactEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonEdit.pas">
+ <Form>PersonEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyEdit.pas">
+ <Form>CompanyEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoData.pas"/>
+ <DCCReference Include="ContactFilterEdit.pas">
+ <Form>ContactFilterEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="MainData.pas">
+ <Form>MainDataModule</Form>
+ <DesignClass>TDataModule</DesignClass>
+ </DCCReference>
+ <DCCReference Include="ContactBrowse.pas">
+ <Form>ContactBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CompanyBrowse.pas">
+ <Form>CompanyBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="PerformanceView.pas">
+ <Form>PerformanceViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="Welcome.pas">
+ <Form>WelcomeForm</Form>
+ </DCCReference>
+ <DCCReference Include="PersonBrowse.pas">
+ <Form>PersonBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="BasicBrowse.pas">
+ <Form>BasicBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="CountryBrowse.pas">
+ <Form>CountryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="DemoDataRequest.pas">
+ <Form>DemoDataRequestForm</Form>
+ </DCCReference>
+ <DCCReference Include="ContactSort.pas">
+ <Form>ContactSortForm</Form>
+ </DCCReference>
+ <DCCReference Include="CategoryBrowse.pas">
+ <Form>CategoryBrowseForm</Form>
+ </DCCReference>
+ <DCCReference Include="HelpView.pas">
+ <Form>HelpViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="QueryView.pas">
+ <Form>QueryViewForm</Form>
+ <DesignClass>TFrame</DesignClass>
+ </DCCReference>
+ <DCCReference Include="RandomData.pas"/>
+ <DCCReference Include="Stopwatch.pas"/>
+ <DCCReference Include="Utility.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+ </Project>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE2.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Demos/PrimerCross/Primer_DXE2.mdr
===================================================================
(Binary files differ)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE2.mdr
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Demos/PrimerCross/Primer_DXE2.res
===================================================================
(Binary files differ)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE2.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Demos/PrimerCross/Primer_DXE2.xml
===================================================================
--- trunk/Demos/PrimerCross/Primer_DXE2.xml (rev 0)
+++ trunk/Demos/PrimerCross/Primer_DXE2.xml 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,29 @@
+<TInstantConnectionDefs>
+ <TInstantBDEConnectionDef>
+ <Name>ParadoxDB</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <DriverName>STANDARD</DriverName>
+ <Parameters>PATH=.\ParadoxDB
+DEFAULT DRIVER=PARADOX
+ENABLE BCD=TRUE
+</Parameters>
+ </TInstantBDEConnectionDef>
+ <TInstantIBXConnectionDef>
+ <Name>FirebirdDB</Name>
+ <IsBuilt>TRUE</IsBuilt>
+ <BlobStreamFormat>sfXML</BlobStreamFormat>
+ <LoginPrompt>FALSE</LoginPrompt>
+ <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>
+</TInstantConnectionDefs>
Property changes on: trunk/Demos/PrimerCross/Primer_DXE2.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Demos/PrimerCross/Primer_DXE2_Icon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Demos/PrimerCross/Primer_DXE2_Icon.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj
===================================================================
--- trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj 2012-10-29 20:37:39 UTC (rev 960)
+++ trunk/Source/Brokers/ADO/D2007/DclIOADO.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\DclIOADO_D11.bpl</DCC_DependencyCheckOutputName>
+ <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Public\Documents\RAD Studio\5.0\Bpl\DclIOADO_D11.bpl</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
Modified: trunk/Source/Brokers/ADO/DXE2/DclIOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/ADO/DXE2/IOADO.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj
===================================================================
--- trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj 2012-10-29 20:37:39 UTC (rev 960)
+++ trunk/Source/Brokers/BDE/D2007/DclIOBDE.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\DclIOBDE_D11.bpl</DCC_DependencyCheckOutputName>
+ <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Public\Documents\RAD Studio\5.0\Bpl\DclIOBDE_D11.bpl</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
Modified: trunk/Source/Brokers/BDE/DXE2/DclIOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/BDE/DXE2/IOBDE.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj
===================================================================
--- trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj 2012-10-29 20:37:39 UTC (rev 960)
+++ trunk/Source/Brokers/DBX/D2007/DclIODBX.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\DclIODBX_D11.bpl</DCC_DependencyCheckOutputName>
+ <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Public\Documents\RAD Studio\5.0\Bpl\DclIODBX_D11.bpl</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
Modified: trunk/Source/Brokers/DBX/DXE2/DclIODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/DBX/DXE2/IODBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/D2007/DclIOIBX.dproj
===================================================================
--- trunk/Source/Brokers/IBX/D2007/DclIOIBX.dproj 2012-10-29 20:37:39 UTC (rev 960)
+++ trunk/Source/Brokers/IBX/D2007/DclIOIBX.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Documents\RAD Studio\5.0\Bpl\DclIOIBX_D11.bpl</DCC_DependencyCheckOutputName>
+ <DCC_DependencyCheckOutputName>..\..\..\..\..\..\..\..\Public\Documents\RAD Studio\5.0\Bpl\DclIOIBX_D11.bpl</DCC_DependencyCheckOutputName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
Modified: trunk/Source/Brokers/IBX/DXE2/DclIOIBX.res
===================================================================
(Binary files differ)
Modified: trunk/Source/Brokers/IBX/DXE2/IOIBX.res
===================================================================
(Binary files differ)
Added: trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dpk
===================================================================
--- trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dpk (rev 0)
+++ trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dpk 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,40 @@
+package DclIONexusDB;
+
+{$R *.res}
+{$R '..\InstantNexusDB.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 NexusDB Design-Time Support (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vcldb,
+ IOCore,
+ IONexusDB;
+
+contains
+ InstantNexusDBReg in '..\InstantNexusDBReg.pas';
+
+end.
Property changes on: trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dproj
===================================================================
--- trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dproj (rev 0)
+++ trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,91 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{a31cfa5e-557a-458d-9886-cb0f00055264}</ProjectGuid>
+ <MainSource>DclIONexusDB.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\5.0\Bpl\DclIONexusDB_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 xmlns=""> <Delphi.Personality> <Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Package_Options>
+ <Package_Options Name="PackageDescription">InstantObjects NexusDB 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">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="FileVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+
+
+
+
+
+ <Excluded_Packages Name="C:\Documents and Settings\carlo.PCCIBISOFT.001\Documenti\Borland Studio Projects\Bpl\ZComponent.bpl">Zeos Database Components</Excluded_Packages>
+ </Excluded_Packages>
+ <Source>
+ <Source Name="MainSource">DclIONexusDB.dpk</Source>
+ </Source>
+ </Delphi.Personality> </BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <ItemGroup />
+ <ItemGroup>
+ <DelphiCompile Include="DclIONexusDB.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantNexusDB.dcr" />
+ <DCCReference Include="..\InstantNexusDB.dcr" />
+ <DCCReference Include="..\InstantNexusDBReg.pas" />
+ <DCCReference Include="IOCore.dcp" />
+ <DCCReference Include="IONexusDB.dcp" />
+ <DCCReference Include="vcl.dcp" />
+ <DCCReference Include="vcldb.dcp" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>
\ No newline at end of file
Property changes on: trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/NexusDb/D2007/DclIONexusDB.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dpk
===================================================================
--- trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dpk (rev 0)
+++ trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dpk 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,46 @@
+package IONexusDB;
+
+{$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 NexusDB Run-Time Support (Delphi 2007)'}
+{$LIBSUFFIX '_D11'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vclx,
+ dbrtl,
+ rtl,
+ vcldb,
+ IOCore;
+
+contains
+ InstantNexusDBCatalog in '..\InstantNexusDBCatalog.pas',
+ InstantNexusDBConnectionDefEdit in '..\InstantNexusDBConnectionDefEdit.pas' {InstantNexusDBConnectionDefEditForm},
+ InstantNexusDB in '..\InstantNexusDB.pas',
+ InstantNexusDBConsts in '..\InstantNexusDBConsts.pas',
+ InstantNexusDBEmbeddedConnectionDefEdit in '..\InstantNexusDBEmbeddedConnectionDefEdit.pas' {InstantNexusDBEmbeddedConnectionDefEditForm},
+ InstantNexusDBEmbedded in '..\InstantNexusDBEmbedded.pas';
+
+end.
Property changes on: trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dproj
===================================================================
--- trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dproj (rev 0)
+++ trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,98 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{12721f04-79f4-43a7-8bd3-6b28edcc949c}</ProjectGuid>
+ <MainSource>IONexusDB.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\5.0\Bpl\IONexusDB_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 xmlns=""> <Delphi.Personality> <Parameters>
+ <Parameters Name="UseLauncher">False</Parameters>
+ <Parameters Name="LoadAllSymbols">True</Parameters>
+ <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+ </Parameters>
+ <Package_Options>
+ <Package_Options Name="PackageDescription">InstantObjects NexusDB 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">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="FileVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+ <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+ <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+
+
+
+
+ </Excluded_Packages>
+ <Source>
+ <Source Name="MainSource">IONexusDB.dpk</Source>
+ </Source>
+ </Delphi.Personality> </BorlandProject></BorlandProject>
+ </ProjectExtensions>
+ <ItemGroup />
+ <ItemGroup>
+ <DelphiCompile Include="IONexusDB.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantNexusDB.pas" />
+ <DCCReference Include="..\InstantNexusDBCatalog.pas" />
+ <DCCReference Include="..\InstantNexusDBConnectionDefEdit.pas">
+ <Form>InstantNexusDBConnectionDefEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantNexusDBConsts.pas" />
+ <DCCReference Include="..\InstantNexusDBEmbedded.pas" />
+ <DCCReference Include="..\InstantNexusDBEmbeddedConnectionDefEdit.pas">
+ <Form>InstantNexusDBEmbeddedConnectionDefEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="dbrtl.dcp" />
+ <DCCReference Include="IOCore.dcp" />
+ <DCCReference Include="rtl.dcp" />
+ <DCCReference Include="vcl.dcp" />
+ <DCCReference Include="vcldb.dcp" />
+ <DCCReference Include="vclx.dcp" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+</Project>
\ No newline at end of file
Property changes on: trunk/Source/Brokers/NexusDb/D2007/IONexusDB.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/NexusDb/D2007/IONexusDB.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/NexusDb/D2007/IONexusDB.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dpk
===================================================================
--- trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dpk (rev 0)
+++ trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dpk 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,40 @@
+package DclIONexusDB;
+
+{$R *.res}
+{$R '..\InstantNexusDB.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 NexusDB Design-Time Support (Delphi 2009)'}
+{$LIBSUFFIX '_D12'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vcldb,
+ IOCore,
+ IONexusDB;
+
+contains
+ InstantNexusDBReg in '..\InstantNexusDBReg.pas';
+
+end.
Property changes on: trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dproj
===================================================================
--- trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dproj (rev 0)
+++ trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,120 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{a31cfa5e-557a-458d-9886-cb0f00055264}</ProjectGuid>
+ <MainSource>DclIONexusDB.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\5.0\Bpl\DclIONexusDB_D11.bpl</DCC_DependencyCheckOutputName>
+ <ProjectVersion>12.0</ProjectVersion>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DesignOnlyPackage>true</DesignOnlyPackage>
+ <DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\6.0\Bpl\DclIONexusDB_D12.bpl</DCC_DependencyCheckOutputName>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DCC_Description>InstantObjects NexusDB Design-Time Support (Delphi 2009)</DCC_Description>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <GenDll>true</GenDll>
+ <GenPackage>true</GenPackage>
+ <DllSuffix>_D12</DllSuffix>
+ <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <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)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <Version>7.0</Version>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <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">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="FileVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"/>
+ <VersionInfoKeys Name="LegalCopyright"/>
+ <VersionInfoKeys Name="LegalTrademarks"/>
+ <VersionInfoKeys Name="OriginalFilename"/>
+ <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys>
+ </VersionInfoKeys>
+ <Excluded_Packages>
+ <Excluded_Packages Name="C:\Documents and Settings\carlo.PCCIBISOFT.001\Documenti\Borland Studio Projects\Bpl\ZComponent.bpl">Zeos Database Components</Excluded_Packages>
+ </Excluded_Packages>
+ <Source>
+ <Source Name="MainSource">DclIONexusDB.dpk</Source>
+ </Source>
+ </Delphi.Personality>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <ItemGroup>
+ <DelphiCompile Include="DclIONexusDB.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantNexusDB.dcr"/>
+ <DCCReference Include="vcl.dcp"/>
+ <DCCReference Include="vcldb.dcp"/>
+ <DCCReference Include="IOCore.dcp"/>
+ <DCCReference Include="IONexusDB.dcp"/>
+ <DCCReference Include="..\InstantNexusDBReg.pas"/>
+ <DCCReference Include="..\InstantNexusDB.dcr"/>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ItemGroup/>
+ <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
+ </Project>
Property changes on: trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.res
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/NexusDb/D2009/DclIONexusDB.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dpk
===================================================================
--- trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dpk (rev 0)
+++ trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dpk 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,46 @@
+package IONexusDB;
+
+{$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 NexusDB Run-Time Support (Delphi 2009)'}
+{$LIBSUFFIX '_D12'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl,
+ vclx,
+ dbrtl,
+ rtl,
+ vcldb,
+ IOCore;
+
+contains
+ InstantNexusDBCatalog in '..\InstantNexusDBCatalog.pas',
+ InstantNexusDBConnectionDefEdit in '..\InstantNexusDBConnectionDefEdit.pas' {InstantNexusDBConnectionDefEditForm},
+ InstantNexusDB in '..\InstantNexusDB.pas',
+ InstantNexusDBConsts in '..\InstantNexusDBConsts.pas',
+ InstantNexusDBEmbeddedConnectionDefEdit in '..\InstantNexusDBEmbeddedConnectionDefEdit.pas' {InstantNexusDBEmbeddedConnectionDefEditForm},
+ InstantNexusDBEmbedded in '..\InstantNexusDBEmbedded.pas';
+
+end.
Property changes on: trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dproj
===================================================================
--- trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dproj (rev 0)
+++ trunk/Source/Brokers/NexusDb/D2009/IONexusDB.dproj 2012-10-29 20:44:39 UTC (rev 961)
@@ -0,0 +1,128 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{12721f04-79f4-43a7-8bd3-6b28edcc949c}</ProjectGuid>
+ <MainSource>IONexusDB.dpk</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\5.0\Bpl\IONexusDB_D11.bpl</DCC_DependencyCheckOutputName>
+ <ProjectVersion>12.0</ProjectVersion>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <DCC_DependencyCheckOutputName>C:\Users\Public\Documents\RAD Studio\6.0\Bpl\IONexusDB_D12.bpl</DCC_DependencyCheckOutputName>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DCC_Description>InstantObjects NexusDB Run-Time Support (Delphi 2009)</DCC_Description>
+ <DesignOnlyPackage>false</DesignOnlyPackage>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <GenDll>true</GenDll>
+ <GenPackage>true</GenPackage>
+ <DllSuffix>_D12</DllSuffix>
+ <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <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)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <Version>7.0</Version>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ </PropertyGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <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">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="FileVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName">www.instantobjects.org</VersionInfoKeys>
+ <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys>
+ <VersionInfoKeys Name="InternalName"/>
+ <VersionInfoKeys Name="LegalCopyright"/>
+ <VersionInfoKeys Name="LegalTrademarks"/>
+ <VersionInfoKeys Name="OriginalFilename"/>
+ <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys>
+ </VersionInfoKeys>
+ <Excluded_Packages/>
+ <Source>
+ <Source Name="MainSource">IONexusDB.dpk</Source>
+ </Source>
+ </Delphi.Personality>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <ItemGroup>
+ <DelphiCompile Include="IONexusDB.dpk">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="vcl.dcp"/>
+ <DCCReference Include="vclx.dcp"/>
+ <DCCReference Include="dbrtl.dcp"/>
+ <DCCReference Include="rtl.dcp"/>
+ <DCCReference Include="vcldb.dcp"/>
+ <DCCReference Include="IOCore.dcp"/>
+ <DCCReference Include="..\InstantNexusDBCatalog.pas"/>
+ <DCCReference Include="..\InstantNexusDBConnectionDefEdit.pas">
+ <Form>InstantNexusDBConnectionDefEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantNexusDB.pas"/>
+ <DCCReference Include="..\InstantNexusDBConsts.pas"/>
+ <DCCReference Include="..\InstantNexusDBEmbeddedConnectionDefEdit.pas">
+ <Form>InstantNexusDBEmbeddedConnectionDefEditForm</Form>
+ </DCCReference>
+ <DCCReference Include="..\InstantNexusDBEmbedded.pas"/>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ItemGroup/>
+ <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(...
[truncated message content] |
|
From: <na...@us...> - 2012-10-29 20:37:46
|
Revision: 960
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=960&view=rev
Author: nandod
Date: 2012-10-29 20:37:39 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
* XML Broker: don't allow opening files that are being written to.
Modified Paths:
--------------
trunk/Source/Brokers/XML/InstantXML.pas
Modified: trunk/Source/Brokers/XML/InstantXML.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXML.pas 2012-07-19 05:10:42 UTC (rev 959)
+++ trunk/Source/Brokers/XML/InstantXML.pas 2012-10-29 20:37:39 UTC (rev 960)
@@ -327,6 +327,9 @@
uses
SysUtils, InstantConsts,
TypInfo, InstantXMLCatalog, InstantXMLConnectionDefEdit, InstantUtils,
+{$IFDEF D17+}
+ System.Types,
+{$ENDIF}
{$IFDEF MSWINDOWS}
{$IFNDEF D6+}
FileCtrl,
@@ -358,6 +361,7 @@
R: Integer;
PathWithWildCards: string;
begin
+
PathWithWildCards := IncludeTrailingPathDelimiter(Path) + XML_WILDCARD;
//Find the first file
R := SysUtils.FindFirst(PathWithWildCards, faAnyFile, SearchRec);
@@ -1200,7 +1204,7 @@
begin
if FileExists(AFileName) then
begin
- fileStream := TFileStream.Create(AFileName, fmOpenRead);
+ fileStream := TFileStream.Create(AFileName, fmShareDenyWrite);
try
InstantReadObject(fileStream, sfXML, AObject);
Result := True;
@@ -1219,7 +1223,7 @@
strUtf8: string;
strstream: TStringStream;
begin
- fileStream := TFileStream.Create(AFileName, fmOpenRead);
+ fileStream := TFileStream.Create(AFileName, fmShareDenyWrite);
try
SetLength(strUtf8, fileStream.Size);
Result := fileStream.Read(strUtf8[1], fileStream.Size) <> 0;
|
|
From: <dav...@us...> - 2012-07-19 05:10:49
|
Revision: 959
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=959&view=rev
Author: davidvtaylor
Date: 2012-07-19 05:10:42 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
* Fix mixed CR LF/LF line endings
Modified Paths:
--------------
trunk/Tests/MinimalModel.pas
trunk/Tests/TestInstantObjectReference.pas
trunk/Tests/ubmock/tests/TestMock.pas
Modified: trunk/Tests/MinimalModel.pas
===================================================================
--- trunk/Tests/MinimalModel.pas 2012-02-14 15:19:08 UTC (rev 958)
+++ trunk/Tests/MinimalModel.pas 2012-07-19 05:10:42 UTC (rev 959)
@@ -24,7 +24,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- * Steven Mitchell
+ * Steven Mitchell
*
* ***** END LICENSE BLOCK ***** *)
Modified: trunk/Tests/TestInstantObjectReference.pas
===================================================================
--- trunk/Tests/TestInstantObjectReference.pas 2012-02-14 15:19:08 UTC (rev 958)
+++ trunk/Tests/TestInstantObjectReference.pas 2012-07-19 05:10:42 UTC (rev 959)
@@ -24,8 +24,8 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- *
*
+ *
* ***** END LICENSE BLOCK ***** *)
unit TestInstantObjectReference;
Modified: trunk/Tests/ubmock/tests/TestMock.pas
===================================================================
--- trunk/Tests/ubmock/tests/TestMock.pas 2012-02-14 15:19:08 UTC (rev 958)
+++ trunk/Tests/ubmock/tests/TestMock.pas 2012-07-19 05:10:42 UTC (rev 959)
@@ -111,6 +111,6 @@
initialization
RegisterTests([TTestMock]);
-
+
end.
|
|
From: <na...@us...> - 2012-02-14 15:19:15
|
Revision: 958
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=958&view=rev
Author: nandod
Date: 2012-02-14 15:19:08 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
* Ability to generate both INNER and OUTER SQL joins. Fixes #3487574.
Modified Paths:
--------------
trunk/Source/Core/InstantBrokers.pas
Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas 2012-01-29 04:09:48 UTC (rev 957)
+++ trunk/Source/Core/InstantBrokers.pas 2012-02-14 15:19:08 UTC (rev 958)
@@ -799,6 +799,43 @@
property Query: TInstantQuery read GetQuery;
end;
+ // A table path with its list of join clauses.
+ // Helper class used by TInstantTranslationContext.
+ TInstantTablePath = class
+ private
+ FJoinClauses: TStrings;
+ FIsOuterJoin: Boolean;
+ FName: string;
+ function GetCount: Integer;
+ function GetJoinClause(I: Integer): string;
+ public
+ constructor Create(const AName: string);
+ procedure AfterConstruction; override;
+ destructor Destroy; override;
+ property Name: string read FName write FName;
+ property IsOuterJoin: Boolean read FIsOuterJoin write FIsOuterJoin;
+ function AddJoinClause(const AJoinClause: string): Integer;
+ property JoinClauses[I: Integer]: string read GetJoinClause; default;
+ property Count: Integer read GetCount;
+ end;
+
+ // A list of table paths. Helper class used by TInstantTranslationContext.
+ TInstantTablePathList = class
+ private
+ FPaths: TObjectList;
+ function GetPath(I: Integer): TInstantTablePath;
+ function GetCount: Integer;
+ public
+ procedure AfterConstruction; override;
+ destructor Destroy; override;
+ property Paths[I: Integer]: TInstantTablePath read GetPath; default;
+ property Count: Integer read GetCount;
+ function IndexOfName(const ATablePathName: string): Integer;
+ function Add(const ATablePathName: string): Integer;
+ function AddJoinClause(const ATablePathName, AJoinClause: string;
+ const AIsOuterJoin: Boolean): Integer;
+ end;
+
// 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.
@@ -813,12 +850,13 @@
FQuote: Char;
FSpecifier: TInstantIQLSpecifier;
FStatement: TInstantIQLObject;
- FTablePathList: TStringList;
+ FTablePathList: TInstantTablePathList;
FParentContext: TInstantTranslationContext;
FIdDataType: TInstantDataType;
FRequestedLoadMode: TInstantLoadMode;
FActualLoadMode: TInstantLoadMode;
- procedure AddJoin(const FromPath, FromField, ToPath, ToField: string);
+ procedure AddJoin(const FromPath, FromField, ToPath, ToField: string;
+ const IsOuter: Boolean);
function GetClassTablePath: string;
function GetChildContext(const AIndex: Integer): TInstantTranslationContext;
function GetChildContextCount: Integer;
@@ -830,7 +868,7 @@
function GetTableName: string;
function GetTablePathAliases(Index: Integer): string;
function GetTablePathCount: Integer;
- function GetTablePathList: TStringList;
+ function GetTablePathList: TInstantTablePathList;
function GetTablePaths(Index: Integer): string;
function PathToTablePath(const PathText: string): string;
function PathToTarget(const PathText: string;
@@ -842,6 +880,7 @@
function GetChildContextIndex: Integer;
function GetChildContextLevel: Integer;
function RootAttribToFieldName(const AttribName: string): string;
+ function IsRequiredAttribute(const AAttributeName: string): Boolean;
protected
function AddCriteria(const Criteria: string): Integer;
function AddTablePath(const TablePath: string): Integer;
@@ -852,7 +891,7 @@
procedure MakeJoins(Path: TInstantIQLPath);
procedure MakeTablePaths(Path: TInstantIQLPath);
property CriteriaList: TStringList read GetCriteriaList;
- property TablePathList: TStringList read GetTablePathList;
+ property TablePathList: TInstantTablePathList read GetTablePathList;
public
constructor Create(const AStatement: TInstantIQLObject; const AQuote: Char;
const ADelimiters: string; const AIdDataType: TInstantDataType;
@@ -1323,7 +1362,7 @@
begin
Map := StorageMaps[I];
if (Map <> RootMap) and (Info.Conflict or OperationRequired(Map)) then
- Operation(AObject, AObjectId, Map);
+ Operation(AObject, AObjectId, Map, ConflictAction, @Info);
end;
end;
end;
@@ -5590,8 +5629,8 @@
Writer.WriteString(Format('%s AS %s, %s AS %s', [ClassQual,
InstantClassFieldName, IdQual, InstantIdFieldName]));
- // Mind that LContext.ActualBurstLoadMode might be different than
- // Self.RequestedBurstLoadMode.
+ // Mind that LContext.ActualLoadMode might be different than
+ // Self.RequestedLoadMode.
if IsBurstLoadMode(LContext.ActualLoadMode) then
begin
// Use the Id just to get the table path needed to add the updatecount
@@ -6200,10 +6239,10 @@
end;
procedure TInstantTranslationContext.AddJoin(const FromPath, FromField, ToPath,
- ToField: string);
+ ToField: string; const IsOuter: Boolean);
begin
- AddCriteria(Format('%s = %s', [Qualify(FromPath, FromField),
- Qualify(ToPath, ToField)]));
+ TablePathList.AddJoinClause(ToPath, Format('%s = %s', [Qualify(FromPath, FromField),
+ Qualify(ToPath, ToField)]), IsOuter);
end;
function TInstantTranslationContext.AddTablePath(
@@ -6416,16 +6455,16 @@
Result := TablePathList.Count;
end;
-function TInstantTranslationContext.GetTablePathList: TStringList;
+function TInstantTranslationContext.GetTablePathList: TInstantTablePathList;
begin
if not Assigned(FTablePathList) then
- FTablePathList := TStringList.Create;
+ FTablePathList := TInstantTablePathList.Create;
Result := FTablePathList;
end;
function TInstantTranslationContext.GetTablePaths(Index: Integer): string;
begin
- Result := TablePathList[Index];
+ Result := TablePathList[Index].Name;
end;
function TInstantTranslationContext.HasParentContext: Boolean;
@@ -6448,7 +6487,7 @@
function TInstantTranslationContext.IndexOfTablePath(
const TablePath: string): Integer;
begin
- Result := TablePathList.IndexOf(TablePath);
+ Result := TablePathList.IndexOfName(TablePath);
end;
procedure TInstantTranslationContext.Initialize;
@@ -6530,8 +6569,8 @@
LTableName := LClassMeta.TableName;
if (LTableName <> TableName) and LClassMeta.IsStored then
begin
- AddJoin(TableName, InstantClassFieldName, LTableName, InstantClassFieldName);
- AddJoin(TableName, InstantIdFieldName, LTableName, InstantIdFieldName);
+ AddJoin(TableName, InstantClassFieldName, LTableName, InstantClassFieldName, False);
+ AddJoin(TableName, InstantIdFieldName, LTableName, InstantIdFieldName, False);
end;
end;
LClassMeta := LClassMeta.Parent;
@@ -6581,12 +6620,30 @@
end;
end;
+function TInstantTranslationContext.IsRequiredAttribute(const AAttributeName: string): Boolean;
+var
+ LClassMetadata: TInstantClassMetadata;
+ LAttributeMetadata: TInstantAttributeMetadata;
+begin
+ Assert(AAttributeName <> '');
+ Assert(Assigned(ClassRef));
+
+ Result := False;
+ LClassMetadata := InstantModel.ClassMetadatas.Find(ClassRef.ObjectClassName);
+ if Assigned(LClassMetadata) then begin
+ LAttributeMetadata := LClassMetadata.AttributeMetadatas.Find(AAttributeName);
+ if Assigned(LAttributeMetadata) then
+ Result := LAttributeMetadata.IsRequired;
+ end;
+end;
+
procedure TInstantTranslationContext.MakeJoins(Path: TInstantIQLPath);
procedure MakePathJoins(Path: TInstantIQLPath);
var
I: Integer;
PathText, FromPath, ToPath, FromField, ToField: string;
+ LIsRequiredAttribute: Boolean;
begin
if Path.AttributeCount > 1 then
begin
@@ -6597,10 +6654,11 @@
if not IsRootAttribute(ExtractTarget(PathText)) then
begin
PathToTarget(PathText, ToPath, ToField);
+ LIsRequiredAttribute := IsRequiredAttribute(FromField);
AddJoin(FromPath, FromField + InstantClassFieldName, ToPath,
- InstantClassFieldName);
+ InstantClassFieldName, not LIsRequiredAttribute);
AddJoin(FromPath, FromField + InstantIdFieldName, ToPath,
- InstantIdFieldName);
+ InstantIdFieldName, not LIsRequiredAttribute);
FromPath := ToPath;
FromField := ToField;
end;
@@ -6618,9 +6676,9 @@
if TablePath <> ClassTablePath then
begin
AddJoin(ClassTablePath, InstantClassFieldName,
- TablePath, InstantClassFieldName);
+ TablePath, InstantClassFieldName, False);
AddJoin(ClassTablePath, InstantIdFieldName,
- TablePath, InstantIdFieldName);
+ TablePath, InstantIdFieldName, False);
end;
end;
end;
@@ -6813,14 +6871,26 @@
procedure TInstantTranslationContext.WriteTables(Writer: TInstantIQLWriter);
var
- I: Integer;
+ I, J: Integer;
begin
for I := 0 to Pred(TablePathCount) do
begin
- if I > 0 then
- Writer.WriteString(', ');
+ if I > 0 then begin
+ if TablePathList[I].IsOuterJoin then
+ Writer.WriteString(' LEFT OUTER');
+ Writer.WriteString(' JOIN ');
+ end;
Writer.WriteString(Format('%s %s',[InstantEmbrace(
ExtractTarget(TablePaths[I]), Delimiters), TablePathAliases[I]]));
+ if (I > 0) and (TablePathList[I].Count > 0) then begin
+ Writer.WriteString(' ON (');
+ for J := 0 to TablePathList[I].Count - 1 do begin
+ if J > 0 then
+ Writer.WriteString(' AND ');
+ Writer.WriteString(TablePathList[I][J]);
+ end;
+ Writer.WriteString(')');
+ end;
end;
end;
@@ -6855,4 +6925,94 @@
FDataSet := nil;
end;
+{ TInstantTablePathList }
+
+function TInstantTablePathList.Add(const ATablePathName: string): Integer;
+begin
+ Result := IndexOfName(ATablePathName);
+ if Result < 0 then
+ Result := FPaths.Add(TInstantTablePath.Create(ATablePathName));
+end;
+
+function TInstantTablePathList.AddJoinClause(const ATablePathName,
+ AJoinClause: string; const AIsOuterJoin: Boolean): Integer;
+begin
+ Result := Add(ATablePathName);
+ Paths[Result].AddJoinClause(AJoinClause);
+ Paths[Result].IsOuterJoin := AIsOuterJoin;
+end;
+
+procedure TInstantTablePathList.AfterConstruction;
+begin
+ inherited;
+ FPaths := TObjectList.Create(True);
+end;
+
+destructor TInstantTablePathList.Destroy;
+begin
+ FreeAndNil(FPaths);
+ inherited;
+end;
+
+function TInstantTablePathList.GetCount: Integer;
+begin
+ Result := FPaths.Count;
+end;
+
+function TInstantTablePathList.GetPath(I: Integer): TInstantTablePath;
+begin
+ Result := TInstantTablePath(FPaths[I]);
+end;
+
+function TInstantTablePathList.IndexOfName(
+ const ATablePathName: string): Integer;
+var
+ I: Integer;
+begin
+ Result := -1;
+ for I := 0 to Count - 1 do begin
+ if Paths[I].Name = ATablePathName then begin
+ Result := I;
+ Break;
+ end;
+ end;
+end;
+
+{ TInstantTablePath }
+
+function TInstantTablePath.AddJoinClause(const AJoinClause: string): Integer;
+begin
+ Result := FJoinClauses.IndexOf(AJoinClause);
+ if Result < 0 then
+ Result := FJoinClauses.Add(AJoinClause);
+end;
+
+procedure TInstantTablePath.AfterConstruction;
+begin
+ inherited;
+ FJoinClauses := TStringList.Create;
+end;
+
+constructor TInstantTablePath.Create(const AName: string);
+begin
+ inherited Create;
+ FName := AName;
+end;
+
+destructor TInstantTablePath.Destroy;
+begin
+ FreeAndNil(FJoinClauses);
+ inherited;
+end;
+
+function TInstantTablePath.GetCount: Integer;
+begin
+ Result := FJoinClauses.Count;
+end;
+
+function TInstantTablePath.GetJoinClause(I: Integer): string;
+begin
+ Result := FJoinClauses[I];
+end;
+
end.
|
|
From: <dav...@us...> - 2012-01-29 04:09:54
|
Revision: 957
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=957&view=rev
Author: davidvtaylor
Date: 2012-01-29 04:09:48 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
* Disable Model Explorer "New" popup menu item to avoid an AV when the IO model is empty
Modified Paths:
--------------
trunk/Source/Design/InstantAttributeView.pas
Modified: trunk/Source/Design/InstantAttributeView.pas
===================================================================
--- trunk/Source/Design/InstantAttributeView.pas 2012-01-28 20:08:32 UTC (rev 956)
+++ trunk/Source/Design/InstantAttributeView.pas 2012-01-29 04:09:48 UTC (rev 957)
@@ -488,6 +488,7 @@
PopulateIntroducedAttributes;
PopulateInheritedAttributes;
end;
+ UpdateActions;
end;
procedure TInstantAttributeViewFrame.StoreLayout;
@@ -518,6 +519,7 @@
begin
inherited;
Attribute := FocusedAttribute;
+ AttributeNewItem.Enabled := Assigned(Subject);
AttributeEditAction.Enabled := Assigned(Attribute);
AttributeDeleteAction.Enabled := Assigned(Attribute);
end;
|
|
From: <dav...@us...> - 2012-01-28 20:08:39
|
Revision: 956
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=956&view=rev
Author: davidvtaylor
Date: 2012-01-28 20:08:32 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
+ Allow the "index" keyword to optionally followed by an index name (e.g. SomeField: String(50) index 'MyCustomIndexName')
* Modify the attribute designer to allow editing of the index name
Modified Paths:
--------------
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantMetadata.pas
trunk/Source/Design/InstantAttributeEditor.dfm
trunk/Source/Design/InstantAttributeEditor.pas
trunk/Source/ObjectFoundry/OFClasses.pas
Modified: trunk/Source/Core/InstantCode.pas
===================================================================
--- trunk/Source/Core/InstantCode.pas 2012-01-28 16:57:31 UTC (rev 955)
+++ trunk/Source/Core/InstantCode.pas 2012-01-28 20:08:32 UTC (rev 956)
@@ -605,6 +605,7 @@
function GetIsIndexed: Boolean;
function GetIsRequired: Boolean;
function GetIsUnique: Boolean;
+ function GetIndexName: string;
function GetMetadata: TInstantAttributeMetadata;
function GetMethodTypes: TInstantCodeContainerMethodTypes;
function GetObjectClass: TInstantCodeClass;
@@ -628,6 +629,7 @@
procedure SetIsIndexed(const Value: Boolean);
procedure SetIsRequired(const Value: Boolean);
procedure SetIsUnique(const Value: Boolean);
+ procedure SetIndexName(const Value: string);
procedure SetMethodTypes(const Value: TInstantCodeContainerMethodTypes);
procedure SetObjectClassName(const Value: string);
procedure SetPropTypeName(const Value: string);
@@ -716,6 +718,7 @@
property IsIndexed: Boolean read GetIsIndexed write SetIsIndexed;
property IsRequired: Boolean read GetIsRequired write SetIsRequired;
property IsUnique: Boolean read GetIsUnique write SetIsUnique;
+ property IndexName: string read GetIndexName write SetIndexName;
property Metadata: TInstantAttributeMetadata read GetMetadata;
property MethodTypes: TInstantCodeContainerMethodTypes read GetMethodTypes
write SetMethodTypes;
@@ -3952,6 +3955,11 @@
Result := Metadata.IsUnique;
end;
+function TInstantCodeAttribute.GetIndexName: string;
+begin
+ Result := Metadata.IndexName;
+end;
+
function TInstantCodeAttribute.GetMetadata: TInstantAttributeMetadata;
begin
if not Assigned(FMetadata) then
@@ -4135,7 +4143,10 @@
else if Token = MetaKeyUseNull then
Metadata.UseNull := True
else if Token = MetaKeyIndex then
- IsIndexed := True
+ begin
+ MetaData.IndexName := trim(Reader.ReadStringValue);
+ IsIndexed := True;
+ end
else if Token = MetaKeyRequired then
IsRequired := True
else if Token = MetaKeyUnique then
@@ -4190,7 +4201,11 @@
if Metadata.HasDisplayLabel then
WriteStr(MetaKeyLabel, Metadata.DisplayLabel);
if IsIndexed then
+ begin
Writer.Write(' ' + MetaKeyIndex);
+ if Metadata.HasIndexName then
+ Writer.Write(' ''' + Metadata.IndexName + '''');
+ end;
if IsUnique then
Writer.Write(' ' + MetaKeyUnique);
if IsRequired then
@@ -4306,6 +4321,11 @@
Metadata.IsUnique := Value;
end;
+procedure TInstantCodeAttribute.SetIndexName(const Value: string);
+begin
+ Metadata.IndexName := Value;
+end;
+
procedure TInstantCodeAttribute.SetMethodTypes(
const Value: TInstantCodeContainerMethodTypes);
begin
Modified: trunk/Source/Core/InstantMetadata.pas
===================================================================
--- trunk/Source/Core/InstantMetadata.pas 2012-01-28 16:57:31 UTC (rev 955)
+++ trunk/Source/Core/InstantMetadata.pas 2012-01-28 20:08:32 UTC (rev 956)
@@ -470,6 +470,7 @@
FIsIndexed: Boolean;
FIsRequired: Boolean;
FIsUnique: Boolean;
+ FIndexName: string;
FObjectClassName: string;
FSize: Integer;
FStorageName: string;
@@ -488,6 +489,7 @@
function GetFieldName: string;
function GetHasValidChars: Boolean;
function GetHasDisplayLabel: Boolean;
+ function GetHasIndexName: Boolean;
function GetIsDefault: Boolean;
function GetObjectClass: TInstantAbstractObjectClass;
function GetObjectClassMetadata: TInstantClassMetadata;
@@ -530,6 +532,7 @@
property FieldName: string read GetFieldName write SetFieldName;
property HasValidChars: Boolean read GetHasValidChars;
property HasDisplayLabel: Boolean read GetHasDisplayLabel;
+ property HasIndexName: Boolean read GetHasIndexName;
property TableName: string read GetTableName;
procedure ValidateAttribute(const AAttribute: TInstantAbstractAttribute;
const AValue: string);
@@ -552,6 +555,7 @@
property IsIndexed: Boolean read FIsIndexed write FIsIndexed;
property IsRequired: Boolean read FIsRequired write FIsRequired;
property IsUnique: Boolean read FIsUnique write FIsUnique;
+ property IndexName: string read FIndexName write FIndexName;
property ObjectClassName: string read FObjectClassName
write FObjectClassName;
property Size: Integer read FSize write FSize default 0;
@@ -1232,6 +1236,7 @@
TInstantTableMetadatas);
var
Maps: TInstantAttributeMaps;
+ IndexName: string;
I: Integer;
procedure AddMap(Map: TInstantAttributeMap);
@@ -1334,15 +1339,19 @@
begin
if AttributeMetadata.IsIndexed then
begin
+ if AttributeMetadata.HasIndexName then
+ IndexName := AttributeMetadata.IndexName else
+ IndexName := Map.Name + AttributeMetadata.FieldName;
+
if AttributeMetadata.IsUnique then
begin
- IndexMetadatas.AddIndexMetadata(Map.Name +
- AttributeMetadata.FieldName, AttributeMetadata.FieldName, [ixUnique]);
+ IndexMetadatas.AddIndexMetadata(IndexName,
+ AttributeMetadata.FieldName, [ixUnique]);
Options := Options + [foIndexed, foUnique];
end else
begin
- IndexMetadatas.AddIndexMetadata(Map.Name +
- AttributeMetadata.FieldName, AttributeMetadata.FieldName, []);
+ IndexMetadatas.AddIndexMetadata(IndexName,
+ AttributeMetadata.FieldName, []);
Options := Options + [foIndexed];
end;
end
@@ -1745,6 +1754,7 @@
FIsRequired := LSource.IsRequired;
FIsUnique := LSource.IsUnique;
FUseNull := LSource.UseNull;
+ FIndexName := LSource.IndexName;
FObjectClassName := LSource.ObjectClassName;
FSize := LSource.Size;
FStorageName := LSource.StorageName;
@@ -1881,6 +1891,11 @@
Result := FDisplayLabel <> '';
end;
+function TInstantAttributeMetadata.GetHasIndexName: Boolean;
+begin
+ Result := FIndexName <> '';
+end;
+
function TInstantAttributeMetadata.GetIsDefault: Boolean;
begin
Result := Assigned(ClassMetadata) and
Modified: trunk/Source/Design/InstantAttributeEditor.dfm
===================================================================
--- trunk/Source/Design/InstantAttributeEditor.dfm 2012-01-28 16:57:31 UTC (rev 955)
+++ trunk/Source/Design/InstantAttributeEditor.dfm 2012-01-28 20:08:32 UTC (rev 956)
@@ -207,6 +207,14 @@
Caption = '&Singular Name'
FocusControl = SingularNameEdit
end
+ object IndexNameLabel: TLabel
+ Left = 8
+ Top = 181
+ Width = 58
+ Height = 13
+ Caption = 'Index Name'
+ FocusControl = IndexNameEdit
+ end
object VisibilityEdit: TDBComboBox
Left = 8
Top = 24
@@ -313,6 +321,7 @@
Height = 17
Caption = 'Inde&xed'
TabOrder = 0
+ OnClick = OptionIndexedCheckBoxClick
end
object OptionRequiredCheckBox: TCheckBox
Left = 8
@@ -339,6 +348,15 @@
TabOrder = 4
end
end
+ object IndexNameEdit: TDBEdit
+ Left = 7
+ Top = 197
+ Width = 210
+ Height = 21
+ DataField = 'IndexName'
+ DataSource = SubjectSource
+ TabOrder = 4
+ end
end
object PresentationSheet: TTabSheet
Caption = 'Presentation'
Modified: trunk/Source/Design/InstantAttributeEditor.pas
===================================================================
--- trunk/Source/Design/InstantAttributeEditor.pas 2012-01-28 16:57:31 UTC (rev 955)
+++ trunk/Source/Design/InstantAttributeEditor.pas 2012-01-28 20:08:32 UTC (rev 956)
@@ -122,6 +122,8 @@
OptionUseNullCheckBox: TCheckBox;
EnumeratedTypeLabel: TLabel;
EnumeratedTypeEdit: TDBComboBox;
+ IndexNameLabel: TLabel;
+ IndexNameEdit: TDBEdit;
procedure NameEditKeyPress(Sender: TObject; var Key: Char);
procedure FormCreate(Sender: TObject);
procedure NameEditChange(Sender: TObject);
@@ -140,6 +142,7 @@
procedure StorageNameEditChange(Sender: TObject);
procedure EnumeratedTypeEditChange(Sender: TObject);
procedure EnumeratedTypeEditEnter(Sender: TObject);
+ procedure OptionIndexedCheckBoxClick(Sender: TObject);
private
FBaseClassStorageName: string;
FLimited: Boolean;
@@ -758,6 +761,8 @@
EnableCtrl(OptionRequiredCheckBox, True);
EnableCtrl(OptionUniqueCheckBox, True);
EnableCtrl(OptionUseNullCheckBox, not IsContainer);
+ EnableCtrl(IndexNameLabel, OptionIndexedCheckBox.Checked);
+ EnableCtrl(IndexNameEdit, OptionIndexedCheckBox.Checked);
EnableCtrl(OkButton, IsValid);
PresentationSheet.TabVisible := IsMaskable;
end;
@@ -844,6 +849,11 @@
end;
end;
+procedure TInstantAttributeEditorForm.OptionIndexedCheckBoxClick(Sender: TObject);
+begin
+ UpdateControls;
+end;
+
procedure TInstantAttributeEditorForm.StorageNameEditChange(Sender: TObject);
begin
inherited;
Modified: trunk/Source/ObjectFoundry/OFClasses.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFClasses.pas 2012-01-28 16:57:31 UTC (rev 955)
+++ trunk/Source/ObjectFoundry/OFClasses.pas 2012-01-28 20:08:32 UTC (rev 956)
@@ -342,6 +342,7 @@
TaggedBooleans['IsIndexed'] := IsIndexed;
TaggedBooleans['IsRequired'] := IsRequired;
TaggedBooleans['IsUnique'] := IsUnique;
+ TaggedStrings['IndexName'] := IndexName;
TaggedStrings['SingularName'] := SingularName;
TaggedStrings['EditMask'] := Metadata.EditMask;
TaggedStrings['ValidChars'] := Metadata.ValidCharsString;
@@ -547,6 +548,7 @@
IsIndexed := TaggedBooleans['IsIndexed'];
IsRequired := TaggedBooleans['IsRequired'];
IsUnique := TaggedBooleans['IsUnique'];
+ IndexName := TaggedStrings['IndexName'];
SingularName := TaggedStrings['SingularName'];
Metadata.Size := TaggedIntegers['Size'];
Metadata.EditMask := TaggedStrings['EditMask'];
|
|
From: <dav...@us...> - 2012-01-28 16:57:36
|
Revision: 955
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=955&view=rev
Author: davidvtaylor
Date: 2012-01-28 16:57:31 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
* Adjust Close button position on the evolver dialog
Modified Paths:
--------------
trunk/Source/Core/InstantCustomDBEvolverFormUnit.dfm
Modified: trunk/Source/Core/InstantCustomDBEvolverFormUnit.dfm
===================================================================
--- trunk/Source/Core/InstantCustomDBEvolverFormUnit.dfm 2012-01-28 16:52:07 UTC (rev 954)
+++ trunk/Source/Core/InstantCustomDBEvolverFormUnit.dfm 2012-01-28 16:57:31 UTC (rev 955)
@@ -114,8 +114,8 @@
TabOrder = 6
end
object CloseButton: TButton
- Left = 512
- Top = 304
+ Left = 502
+ Top = 303
Width = 75
Height = 25
Action = CloseAction
|
|
From: <dav...@us...> - 2012-01-28 16:52:14
|
Revision: 954
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=954&view=rev
Author: davidvtaylor
Date: 2012-01-28 16:52:07 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
+ Add "unique" attribute keyword to specify that the index created should be unique
Modified Paths:
--------------
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantMetadata.pas
trunk/Source/Core/InstantPersistence.pas
trunk/Source/Core/InstantTypes.pas
trunk/Source/Design/InstantAttributeEditor.dfm
trunk/Source/Design/InstantAttributeEditor.pas
trunk/Source/Design/InstantModelExplorer.pas
trunk/Source/ObjectFoundry/OFClasses.pas
Modified: trunk/Source/Core/InstantCode.pas
===================================================================
--- trunk/Source/Core/InstantCode.pas 2012-01-14 02:59:12 UTC (rev 953)
+++ trunk/Source/Core/InstantCode.pas 2012-01-28 16:52:07 UTC (rev 954)
@@ -604,6 +604,7 @@
function GetIsEnum: Boolean;
function GetIsIndexed: Boolean;
function GetIsRequired: Boolean;
+ function GetIsUnique: Boolean;
function GetMetadata: TInstantAttributeMetadata;
function GetMethodTypes: TInstantCodeContainerMethodTypes;
function GetObjectClass: TInstantCodeClass;
@@ -626,6 +627,7 @@
procedure SetIncludeRemoveMethod(const Value: Boolean);
procedure SetIsIndexed(const Value: Boolean);
procedure SetIsRequired(const Value: Boolean);
+ procedure SetIsUnique(const Value: Boolean);
procedure SetMethodTypes(const Value: TInstantCodeContainerMethodTypes);
procedure SetObjectClassName(const Value: string);
procedure SetPropTypeName(const Value: string);
@@ -713,6 +715,7 @@
write SetStorageKind;
property IsIndexed: Boolean read GetIsIndexed write SetIsIndexed;
property IsRequired: Boolean read GetIsRequired write SetIsRequired;
+ property IsUnique: Boolean read GetIsUnique write SetIsUnique;
property Metadata: TInstantAttributeMetadata read GetMetadata;
property MethodTypes: TInstantCodeContainerMethodTypes read GetMethodTypes
write SetMethodTypes;
@@ -1589,6 +1592,7 @@
MetaKeyFormat = 'format';
MetaKeyIndex = 'index';
MetaKeyRequired = 'required';
+ MetaKeyUnique = 'unique';
MetaKeyMask = 'mask';
MetaKeyStored = 'stored';
MetaKeyEmbedded = 'embedded';
@@ -3741,6 +3745,7 @@
Self.IsDefault := IsDefault;
Self.IsIndexed := IsIndexed;
Self.IsRequired := IsRequired;
+ Self.IsUnique := IsUnique;
Self.ReadOnly := ReadOnly;
Self.SingularName := SingularName;
Self.Visibility := Visibility;
@@ -3942,6 +3947,11 @@
Result := Metadata.IsRequired;
end;
+function TInstantCodeAttribute.GetIsUnique: Boolean;
+begin
+ Result := Metadata.IsUnique;
+end;
+
function TInstantCodeAttribute.GetMetadata: TInstantAttributeMetadata;
begin
if not Assigned(FMetadata) then
@@ -4128,6 +4138,8 @@
IsIndexed := True
else if Token = MetaKeyRequired then
IsRequired := True
+ else if Token = MetaKeyUnique then
+ IsUnique := True
else if Token = MetaKeyMask then
Metadata.EditMask := Reader.ReadStringValue
else if Token = MetaKeyValid then
@@ -4179,6 +4191,8 @@
WriteStr(MetaKeyLabel, Metadata.DisplayLabel);
if IsIndexed then
Writer.Write(' ' + MetaKeyIndex);
+ if IsUnique then
+ Writer.Write(' ' + MetaKeyUnique);
if IsRequired then
Writer.Write(' ' + MetaKeyRequired);
if Metadata.UseNull then
@@ -4287,6 +4301,11 @@
Metadata.IsRequired := Value;
end;
+procedure TInstantCodeAttribute.SetIsUnique(const Value: Boolean);
+begin
+ Metadata.IsUnique := Value;
+end;
+
procedure TInstantCodeAttribute.SetMethodTypes(
const Value: TInstantCodeContainerMethodTypes);
begin
Modified: trunk/Source/Core/InstantMetadata.pas
===================================================================
--- trunk/Source/Core/InstantMetadata.pas 2012-01-14 02:59:12 UTC (rev 953)
+++ trunk/Source/Core/InstantMetadata.pas 2012-01-28 16:52:07 UTC (rev 954)
@@ -469,6 +469,7 @@
FEditMask: string;
FIsIndexed: Boolean;
FIsRequired: Boolean;
+ FIsUnique: Boolean;
FObjectClassName: string;
FSize: Integer;
FStorageName: string;
@@ -550,6 +551,7 @@
write FStorageKind default skEmbedded;
property IsIndexed: Boolean read FIsIndexed write FIsIndexed;
property IsRequired: Boolean read FIsRequired write FIsRequired;
+ property IsUnique: Boolean read FIsUnique write FIsUnique;
property ObjectClassName: string read FObjectClassName
write FObjectClassName;
property Size: Integer read FSize write FSize default 0;
@@ -1332,9 +1334,17 @@
begin
if AttributeMetadata.IsIndexed then
begin
- IndexMetadatas.AddIndexMetadata(Map.Name +
- AttributeMetadata.FieldName, AttributeMetadata.FieldName, []);
- Options := Options + [foIndexed];
+ if AttributeMetadata.IsUnique then
+ begin
+ IndexMetadatas.AddIndexMetadata(Map.Name +
+ AttributeMetadata.FieldName, AttributeMetadata.FieldName, [ixUnique]);
+ Options := Options + [foIndexed, foUnique];
+ end else
+ begin
+ IndexMetadatas.AddIndexMetadata(Map.Name +
+ AttributeMetadata.FieldName, AttributeMetadata.FieldName, []);
+ Options := Options + [foIndexed];
+ end;
end
else if AttributeMetadata.IsRequired then
begin
@@ -1733,6 +1743,7 @@
FEditMask := LSource.EditMask;
FIsIndexed := LSource.IsIndexed;
FIsRequired := LSource.IsRequired;
+ FIsUnique := LSource.IsUnique;
FUseNull := LSource.UseNull;
FObjectClassName := LSource.ObjectClassName;
FSize := LSource.Size;
Modified: trunk/Source/Core/InstantPersistence.pas
===================================================================
--- trunk/Source/Core/InstantPersistence.pas 2012-01-14 02:59:12 UTC (rev 953)
+++ trunk/Source/Core/InstantPersistence.pas 2012-01-28 16:52:07 UTC (rev 954)
@@ -160,6 +160,7 @@
FIsChanged: Boolean;
function GetIsIndexed: Boolean;
function GetIsRequired: Boolean;
+ function GetIsUnique: Boolean;
function GetMetadata: TInstantAttributeMetadata;
function GetName: string;
function GetValue: Variant;
@@ -224,6 +225,7 @@
property IsIndexed: Boolean read GetIsIndexed;
property IsMandatory: Boolean read GetIsMandatory;
property IsRequired: Boolean read GetIsRequired;
+ property IsUnique: Boolean read GetIsUnique;
property IsNull: Boolean read GetIsNull;
property Name: string read GetName;
property Metadata: TInstantAttributeMetadata read GetMetadata write SetMetadata;
@@ -2464,6 +2466,11 @@
Result := Assigned(Metadata) and Metadata.IsRequired;
end;
+function TInstantAttribute.GetIsUnique: Boolean;
+begin
+ Result := Assigned(Metadata) and Metadata.IsUnique;
+end;
+
function TInstantAttribute.GetMetadata: TInstantAttributeMetadata;
begin
Result := inherited GetMetadata as TInstantAttributeMetadata;
Modified: trunk/Source/Core/InstantTypes.pas
===================================================================
--- trunk/Source/Core/InstantTypes.pas 2012-01-14 02:59:12 UTC (rev 953)
+++ trunk/Source/Core/InstantTypes.pas 2012-01-28 16:52:07 UTC (rev 954)
@@ -65,7 +65,7 @@
TInstantDataType = (dtInteger, dtFloat, dtCurrency, dtBoolean, dtString,
dtMemo, dtDateTime, dtBlob, dtDate, dtTime, dtEnum);
TInstantDataTypes = set of TInstantDataType;
- TInstantFieldOption = (foRequired, foIndexed);
+ TInstantFieldOption = (foRequired, foIndexed, foUnique);
TInstantFieldOptions = set of TInstantFieldOption;
TInstantCatalogFeature = (cfReadTableInfo, cfReadColumnInfo, cfReadIndexInfo);
Modified: trunk/Source/Design/InstantAttributeEditor.dfm
===================================================================
--- trunk/Source/Design/InstantAttributeEditor.dfm 2012-01-14 02:59:12 UTC (rev 953)
+++ trunk/Source/Design/InstantAttributeEditor.dfm 2012-01-28 16:52:07 UTC (rev 954)
@@ -292,7 +292,7 @@
TabOrder = 2
object OptionReadOnlyCheckBox: TCheckBox
Left = 8
- Top = 48
+ Top = 64
Width = 73
Height = 17
Caption = '&Read only'
@@ -300,7 +300,7 @@
end
object OptionDefaultCheckBox: TCheckBox
Left = 8
- Top = 64
+ Top = 80
Width = 73
Height = 17
Caption = '&Default'
@@ -316,15 +316,23 @@
end
object OptionRequiredCheckBox: TCheckBox
Left = 8
+ Top = 48
+ Width = 73
+ Height = 17
+ Caption = 'Req&uired'
+ TabOrder = 5
+ end
+ object OptionUniqueCheckBox: TCheckBox
+ Left = 8
Top = 32
Width = 73
Height = 17
- Caption = 'Req&uired'
+ Caption = 'Uni&que'
TabOrder = 1
end
object OptionUseNullCheckBox: TCheckBox
Left = 8
- Top = 80
+ Top = 96
Width = 73
Height = 17
Caption = 'Use &Null'
@@ -346,7 +354,7 @@
object DisplayWidthLabel: TLabel
Left = 8
Top = 88
- Width = 65
+ Width = 64
Height = 13
Caption = 'Display &Width'
FocusControl = DisplayWidthEdit
Modified: trunk/Source/Design/InstantAttributeEditor.pas
===================================================================
--- trunk/Source/Design/InstantAttributeEditor.pas 2012-01-14 02:59:12 UTC (rev 953)
+++ trunk/Source/Design/InstantAttributeEditor.pas 2012-01-28 16:52:07 UTC (rev 954)
@@ -96,6 +96,7 @@
OptionIndexedCheckBox: TCheckBox;
OptionReadOnlyCheckBox: TCheckBox;
OptionRequiredCheckBox: TCheckBox;
+ OptionUniqueCheckBox: TCheckBox;
OptionsGroupBox: TGroupBox;
PageControl: TPageControl;
PresentationSheet: TTabSheet;
@@ -255,6 +256,7 @@
begin
OptionIndexedCheckBox.Checked := Subject.IsIndexed;
OptionRequiredCheckBox.Checked := Subject.IsRequired;
+ OptionUniqueCheckBox.Checked := Subject.IsUnique;
OptionReadOnlyCheckBox.Checked := Subject.ReadOnly;
OptionDefaultCheckBox.Checked := Subject.IsDefault;
OptionUseNullCheckBox.Checked := Subject.UseNull;
@@ -529,6 +531,8 @@
Result := True;
if SetChangedField('IsRequired', OptionRequiredCheckBox.Checked) then
Result := True;
+ if SetChangedField('IsUnique', OptionUniqueCheckBox.Checked) then
+ Result := True;
if SetChangedField('ReadOnly', OptionReadOnlyCheckBox.Checked) then
Result := True;
if SetChangedField('IsDefault', OptionDefaultCheckBox.Checked) then
@@ -752,6 +756,7 @@
EnableCtrl(OptionsGroupBox, True);
EnableCtrl(OptionIndexedCheckBox, True);
EnableCtrl(OptionRequiredCheckBox, True);
+ EnableCtrl(OptionUniqueCheckBox, True);
EnableCtrl(OptionUseNullCheckBox, not IsContainer);
EnableCtrl(OkButton, IsValid);
PresentationSheet.TabVisible := IsMaskable;
Modified: trunk/Source/Design/InstantModelExplorer.pas
===================================================================
--- trunk/Source/Design/InstantModelExplorer.pas 2012-01-14 02:59:12 UTC (rev 953)
+++ trunk/Source/Design/InstantModelExplorer.pas 2012-01-28 16:52:07 UTC (rev 954)
@@ -489,6 +489,7 @@
NewAttribute := NewClass.AddAttribute;
NewAttribute.IsIndexed := ImportAttributeMetadata.IsIndexed;
NewAttribute.IsRequired := ImportAttributeMetadata.IsRequired;
+ NewAttribute.IsUnique := ImportAttributeMetadata.IsUnique;
NewAttribute.IsDefault := ImportAttributeMetadata.IsDefault;
NewAttribute.AttributeType := ImportAttributeMetadata.AttributeType;
NewAttribute.AttributeTypeName := ImportAttributeMetadata.AttributeTypeName;
Modified: trunk/Source/ObjectFoundry/OFClasses.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFClasses.pas 2012-01-14 02:59:12 UTC (rev 953)
+++ trunk/Source/ObjectFoundry/OFClasses.pas 2012-01-28 16:52:07 UTC (rev 954)
@@ -341,6 +341,7 @@
TaggedBooleans['IsDefault'] := IsDefault;
TaggedBooleans['IsIndexed'] := IsIndexed;
TaggedBooleans['IsRequired'] := IsRequired;
+ TaggedBooleans['IsUnique'] := IsUnique;
TaggedStrings['SingularName'] := SingularName;
TaggedStrings['EditMask'] := Metadata.EditMask;
TaggedStrings['ValidChars'] := Metadata.ValidCharsString;
@@ -545,6 +546,7 @@
IsDefault := TaggedBooleans['IsDefault'];
IsIndexed := TaggedBooleans['IsIndexed'];
IsRequired := TaggedBooleans['IsRequired'];
+ IsUnique := TaggedBooleans['IsUnique'];
SingularName := TaggedStrings['SingularName'];
Metadata.Size := TaggedIntegers['Size'];
Metadata.EditMask := TaggedStrings['EditMask'];
|
|
From: <dav...@us...> - 2012-01-14 02:59:19
|
Revision: 953
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=953&view=rev
Author: davidvtaylor
Date: 2012-01-14 02:59:12 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
+ Implement support for setting the Display Label for model attributes
Modified Paths:
--------------
trunk/Source/Core/InstantCode.pas
trunk/Source/Core/InstantMetadata.pas
trunk/Source/Core/InstantPresentation.pas
trunk/Source/Design/InstantAttributeEditor.dfm
trunk/Source/Design/InstantAttributeEditor.pas
trunk/Source/ObjectFoundry/OFClasses.pas
trunk/Tests/TestInstantAttributeMetadata.pas
Modified: trunk/Source/Core/InstantCode.pas
===================================================================
--- trunk/Source/Core/InstantCode.pas 2012-01-09 23:06:34 UTC (rev 952)
+++ trunk/Source/Core/InstantCode.pas 2012-01-14 02:59:12 UTC (rev 953)
@@ -1594,6 +1594,7 @@
MetaKeyEmbedded = 'embedded';
MetaKeyValid = 'valid';
MetaKeyWidth = 'width';
+ MetaKeyLabel = 'label';
ModuleTypeNames: array[TInstantCodeModuleType] of string =
('program', 'unit', 'library');
@@ -4133,6 +4134,8 @@
Metadata.ValidCharsString := Reader.ReadStringValue
else if Token = MetaKeyWidth then
Metadata.DisplayWidth := Reader.ReadInteger
+ else if Token = MetaKeyLabel then
+ Metadata.Displaylabel := Reader.ReadStringValue
else
Reader.ErrorMessage('Unknown parameter: ' + Token);
end;
@@ -4172,6 +4175,8 @@
if Metadata.HasValidChars then
WriteStr(MetaKeyValid, Metadata.ValidCharsString);
WriteInt(MetaKeyWidth, Metadata.DisplayWidth);
+ if Metadata.HasDisplayLabel then
+ WriteStr(MetaKeyLabel, Metadata.DisplayLabel);
if IsIndexed then
Writer.Write(' ' + MetaKeyIndex);
if IsRequired then
Modified: trunk/Source/Core/InstantMetadata.pas
===================================================================
--- trunk/Source/Core/InstantMetadata.pas 2012-01-09 23:06:34 UTC (rev 952)
+++ trunk/Source/Core/InstantMetadata.pas 2012-01-14 02:59:12 UTC (rev 953)
@@ -465,6 +465,7 @@
FDefaultValue: string;
FUseNull: Boolean;
FDisplayWidth: Integer;
+ FDisplayLabel: string;
FEditMask: string;
FIsIndexed: Boolean;
FIsRequired: Boolean;
@@ -485,6 +486,7 @@
function GetCollection: TInstantAttributeMetadatas;
function GetFieldName: string;
function GetHasValidChars: Boolean;
+ function GetHasDisplayLabel: Boolean;
function GetIsDefault: Boolean;
function GetObjectClass: TInstantAbstractObjectClass;
function GetObjectClassMetadata: TInstantClassMetadata;
@@ -526,6 +528,7 @@
read GetObjectClassMetadata;
property FieldName: string read GetFieldName write SetFieldName;
property HasValidChars: Boolean read GetHasValidChars;
+ property HasDisplayLabel: Boolean read GetHasDisplayLabel;
property TableName: string read GetTableName;
procedure ValidateAttribute(const AAttribute: TInstantAbstractAttribute;
const AValue: string);
@@ -539,6 +542,7 @@
property UseNull: Boolean read FUseNull write FUseNull default False;
property DisplayWidth: Integer read FDisplayWidth write FDisplayWidth
default 0;
+ property DisplayLabel: string read FDisplayLabel write FDisplayLabel;
property EditMask: string read FEditMask write FEditMask;
property ExternalStorageName: string read FExternalStorageName
write FExternalStorageName;
@@ -1725,6 +1729,7 @@
FAttributeType := LSource.AttributeType;
FDefaultValue := LSource.DefaultValue;
FDisplayWidth := LSource.DisplayWidth;
+ FDisplayLabel := LSource.DisplayLabel;
FEditMask := LSource.EditMask;
FIsIndexed := LSource.IsIndexed;
FIsRequired := LSource.IsRequired;
@@ -1860,6 +1865,11 @@
Result := FValidCharsString <> '';
end;
+function TInstantAttributeMetadata.GetHasDisplayLabel: Boolean;
+begin
+ Result := FDisplayLabel <> '';
+end;
+
function TInstantAttributeMetadata.GetIsDefault: Boolean;
begin
Result := Assigned(ClassMetadata) and
Modified: trunk/Source/Core/InstantPresentation.pas
===================================================================
--- trunk/Source/Core/InstantPresentation.pas 2012-01-09 23:06:34 UTC (rev 952)
+++ trunk/Source/Core/InstantPresentation.pas 2012-01-14 02:59:12 UTC (rev 953)
@@ -24,7 +24,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- * Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Joao Morais,
+ * Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Joao Morais,
* Steven Mitchell, Brian Andersen, David Taylor
*
* ***** END LICENSE BLOCK ***** *)
@@ -3192,6 +3192,8 @@
begin
(Field as TBCDField).Currency := True;
end;
+ if Assigned(Metadata) and (Metadata.HasDisplayLabel) then
+ Field.DisplayLabel := Metadata.DisplayLabel;
if Assigned(FOnInitField) then
FOnInitField(Self, Field);
end;
Modified: trunk/Source/Design/InstantAttributeEditor.dfm
===================================================================
--- trunk/Source/Design/InstantAttributeEditor.dfm 2012-01-09 23:06:34 UTC (rev 952)
+++ trunk/Source/Design/InstantAttributeEditor.dfm 2012-01-14 02:59:12 UTC (rev 953)
@@ -351,6 +351,14 @@
Caption = 'Display &Width'
FocusControl = DisplayWidthEdit
end
+ object DisplayLabelLabel: TLabel
+ Left = 8
+ Top = 128
+ Width = 64
+ Height = 13
+ Caption = 'Display &Label'
+ FocusControl = DisplayLabelEdit
+ end
object ValidCharsLabel: TLabel
Left = 8
Top = 48
@@ -361,7 +369,7 @@
end
object DefaultValueLabel: TLabel
Left = 8
- Top = 128
+ Top = 168
Width = 64
Height = 13
Caption = '&Default Value'
@@ -385,6 +393,15 @@
DataSource = SubjectSource
TabOrder = 2
end
+ object DisplayLabelEdit: TDBEdit
+ Left = 8
+ Top = 144
+ Width = 209
+ Height = 21
+ DataField = 'Metadata.DisplayLabel'
+ DataSource = SubjectSource
+ TabOrder = 3
+ end
object ValidCharsEdit: TDBEdit
Left = 8
Top = 64
@@ -396,12 +413,12 @@
end
object DefaultValueEdit: TDBEdit
Left = 8
- Top = 144
+ Top = 184
Width = 209
Height = 21
DataField = 'Metadata.DefaultValue'
DataSource = SubjectSource
- TabOrder = 3
+ TabOrder = 4
end
end
end
Modified: trunk/Source/Design/InstantAttributeEditor.pas
===================================================================
--- trunk/Source/Design/InstantAttributeEditor.pas 2012-01-09 23:06:34 UTC (rev 952)
+++ trunk/Source/Design/InstantAttributeEditor.pas 2012-01-14 02:59:12 UTC (rev 953)
@@ -77,6 +77,8 @@
DefinitionSheet: TTabSheet;
DisplayWidthEdit: TDBEdit;
DisplayWidthLabel: TLabel;
+ DisplayLabelEdit: TDBEdit;
+ DisplayLabelLabel: TLabel;
EditMaskEdit: TDBEdit;
EdtMaskLabel: TLabel;
MethodAddCheckBox: TCheckBox;
Modified: trunk/Source/ObjectFoundry/OFClasses.pas
===================================================================
--- trunk/Source/ObjectFoundry/OFClasses.pas 2012-01-09 23:06:34 UTC (rev 952)
+++ trunk/Source/ObjectFoundry/OFClasses.pas 2012-01-14 02:59:12 UTC (rev 953)
@@ -345,6 +345,7 @@
TaggedStrings['EditMask'] := Metadata.EditMask;
TaggedStrings['ValidChars'] := Metadata.ValidCharsString;
TaggedIntegers['DisplayWidth'] := Metadata.DisplayWidth;
+ TaggedString['DisplayLabel'] := Metadata.DisplayLabel;
TaggedStrings['DefaultValue'] := Metadata.DefaultValue;
WasReadOnly := Prop.WriteAccess = rwNone;
if ReadOnly <> WasReadOnly then
@@ -549,6 +550,7 @@
Metadata.EditMask := TaggedStrings['EditMask'];
Metadata.ValidCharsString := TaggedStrings['ValidChars'];
Metadata.DisplayWidth := TaggedIntegers['DisplayWidth'];
+ Metadata.DisplayLabel := TaggedStrings['DisplayLabel'];
Metadata.DefaultValue := TaggedStrings['DefaultValue'];
DetectContainerMethods;
FOldName := Name;
Modified: trunk/Tests/TestInstantAttributeMetadata.pas
===================================================================
--- trunk/Tests/TestInstantAttributeMetadata.pas 2012-01-09 23:06:34 UTC (rev 952)
+++ trunk/Tests/TestInstantAttributeMetadata.pas 2012-01-14 02:59:12 UTC (rev 953)
@@ -231,6 +231,7 @@
FInstantAttributeMetadata.AttributeType := atString;
FInstantAttributeMetadata.DefaultValue := 'Default';
FInstantAttributeMetadata.DisplayWidth := 10;
+ FInstantAttributeMetadata.DisplayLabel := '';
FInstantAttributeMetadata.EditMask := '';
FInstantAttributeMetadata.IsIndexed := False;
FInstantAttributeMetadata.IsRequired := True;
@@ -262,6 +263,7 @@
vSource.AttributeType := atString;
vSource.DefaultValue := 'Default';
vSource.DisplayWidth := 10;
+ vSource.DisplayLabel := 'FieldLabel';
vSource.EditMask := '';
vSource.IsIndexed := False;
vSource.IsRequired := True;
@@ -278,6 +280,7 @@
AssertEquals('AttributeType incorrect', 'atString', vStr);
AssertEquals('DefaultValue incorrect', 'Default', vDest.DefaultValue);
AssertEquals('DisplayWidth incorrect', 10, vDest.DisplayWidth);
+ AssertEquals('DisplayLabel incorrect', 'FieldLabel', vDest.DisplayLabel);
AssertEquals('EditMask incorrect', '', vDest.EditMask);
AssertEquals('IsIndexed incorrect', False, vDest.IsIndexed);
AssertEquals('IsRequired incorrect', True, vDest.IsRequired);
|
|
From: <dav...@us...> - 2012-01-09 23:06:40
|
Revision: 952
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=952&view=rev
Author: davidvtaylor
Date: 2012-01-09 23:06:34 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
+ Add AnyDAC broker package for Delphi XE2
Added Paths:
-----------
trunk/Source/Brokers/AnyDAC/DXE2/
trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dpk
trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dproj
trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC_Icon.ico
trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dpk
trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dproj
trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC_Icon.ico
Added: trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dpk
===================================================================
--- trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dpk (rev 0)
+++ trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dpk 2012-01-09 23:06:34 UTC (rev 952)
@@ -0,0 +1,41 @@
+package DclIOAnyDAC;
+
+{$R *.res}
+{$R '..\InstantAnyDAC.dcr'}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects AnyDAC Design-Time Support (Delphi XE2)'}
+{$LIBSUFFIX '_D16'}
+{$DESIGNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ IOAnyDAC;
+
+contains
+ InstantAnyDACReg in '..\InstantAnyDACReg.pas';
+
+end.
+
Property changes on: trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dproj
===================================================================
--- trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dproj (rev 0)
+++ trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dproj 2012-01-09 23:06:34 UTC (rev 952)
@@ -0,0 +1,141 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{7ECBEBD9-43A5-439E-8FBB-4B27DC40A0DD}</ProjectGuid>
+ <MainSource>DclIOAnyDAC.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>13.4</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+ <Base_Win64>true</Base_Win64>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DesignOnlyPackage>true</DesignOnlyPackage>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DllSuffix>_D16</DllSuffix>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects AnyDAC Design-Time Support (Delphi XE2)</DCC_Description>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <GenPackage>true</GenPackage>
+ <DCC_F>false</DCC_F>
+ <DCC_E>false</DCC_E>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win64)'!=''">
+ <Icon_MainIcon>DclIOAnyDAC_Icon.ico</Icon_MainIcon>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <DCC_UsePackage>IOAnyDAC;$(DCC_UsePackage)</DCC_UsePackage>
+ <Icon_MainIcon>DclIOAnyDAC_Icon.ico</Icon_MainIcon>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>false</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="..\InstantAnyDAC.dcr"/>
+ <DCCReference Include="IOAnyDAC.dcp"/>
+ <DCCReference Include="..\InstantAnyDACReg.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">DclIOAnyDAC.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Win64">False</Platform>
+ <Platform value="OSX32">False</Platform>
+ <Platform value="Win32">True</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+ </Project>
Property changes on: trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC_Icon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/AnyDAC/DXE2/DclIOAnyDAC_Icon.ico
___________________________________________________________________
Added: svn:mime-type
+ image/x-icon
Added: trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dpk
===================================================================
--- trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dpk (rev 0)
+++ trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dpk 2012-01-09 23:06:34 UTC (rev 952)
@@ -0,0 +1,45 @@
+package IOAnyDAC;
+
+{$R *.res}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO ON}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS ON}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'InstantObjects AnyDAC Run-Time Support (Delphi XE2)'}
+{$LIBSUFFIX '_D16'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ IOCore,
+ xmlrtl,
+ AnyDAC_Phys_D16,
+ AnyDAC_ComI_D16,
+ AnyDAC_Comp_D16;
+
+contains
+ InstantAnyDAC in '..\InstantAnyDAC.pas',
+ InstantAnyDACCatalog in '..\InstantAnyDACCatalog.pas',
+ InstantAnyDACConnectionDefEdit in '..\InstantAnyDACConnectionDefEdit.pas' {InstantAnyDACConnectionDefEditForm};
+
+end.
Property changes on: trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dpk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dproj
===================================================================
--- trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dproj (rev 0)
+++ trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dproj 2012-01-09 23:06:34 UTC (rev 952)
@@ -0,0 +1,147 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{50885E3B-26BC-4A4D-B07A-520421576DE5}</ProjectGuid>
+ <MainSource>IOAnyDAC.dpk</MainSource>
+ <Base>True</Base>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ <AppType>Package</AppType>
+ <FrameworkType>None</FrameworkType>
+ <ProjectVersion>13.4</ProjectVersion>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+ <Base_Win64>true</Base_Win64>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <DCC_ImageBase>00400000</DCC_ImageBase>
+ <DCC_TypedAtParameter>true</DCC_TypedAtParameter>
+ <DllSuffix>_D16</DllSuffix>
+ <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+ <DCC_Description>InstantObjects AnyDAC Run-Time Support (Delphi XE2)</DCC_Description>
+ <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+ <RuntimeOnlyPackage>true</RuntimeOnlyPackage>
+ <DCC_N>false</DCC_N>
+ <DCC_K>false</DCC_K>
+ <GenDll>true</GenDll>
+ <DCC_S>false</DCC_S>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <GenPackage>true</GenPackage>
+ <DCC_F>false</DCC_F>
+ <DCC_E>false</DCC_E>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win64)'!=''">
+ <Icon_MainIcon>IOAnyDAC_Icon.ico</Icon_MainIcon>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <Icon_MainIcon>IOAnyDAC_Icon.ico</Icon_MainIcon>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+ <DCC_DebugInformation>false</DCC_DebugInformation>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ <DCC_Optimize>false</DCC_Optimize>
+ <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="IOCore.dcp"/>
+ <DCCReference Include="xmlrtl.dcp"/>
+ <DCCReference Include="AnyDAC_Phys_D16.dcp"/>
+ <DCCReference Include="AnyDAC_ComI_D16.dcp"/>
+ <DCCReference Include="AnyDAC_Comp_D16.dcp"/>
+ <DCCReference Include="..\InstantAnyDAC.pas"/>
+ <DCCReference Include="..\InstantAnyDACCatalog.pas"/>
+ <DCCReference Include="..\InstantAnyDACConnectionDefEdit.pas">
+ <Form>InstantAnyDACConnectionDefEditForm</Form>
+ </DCCReference>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>Package</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">IOAnyDAC.dpk</Source>
+ </Source>
+ <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">1033</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Win64">False</Platform>
+ <Platform value="OSX32">False</Platform>
+ <Platform value="Win32">True</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+ </Project>
Property changes on: trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC_Icon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Source/Brokers/AnyDAC/DXE2/IOAnyDAC_Icon.ico
___________________________________________________________________
Added: svn:mime-type
+ image/x-icon
|
|
From: <dav...@us...> - 2012-01-09 23:03:39
|
Revision: 951
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=951&view=rev
Author: davidvtaylor
Date: 2012-01-09 23:03:33 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
* Fix icon transparency problem with Delphi XE and XE2
Modified Paths:
--------------
trunk/Source/Design/InstantModelExpert.pas
Modified: trunk/Source/Design/InstantModelExpert.pas
===================================================================
--- trunk/Source/Design/InstantModelExpert.pas 2012-01-04 22:16:02 UTC (rev 950)
+++ trunk/Source/Design/InstantModelExpert.pas 2012-01-09 23:03:33 UTC (rev 951)
@@ -856,6 +856,7 @@
ActionImage := TBitmap.Create;
try
+ ActionImage.PixelFormat := pf24bit;
FResourceModule.ToolImages.GetBitmap(AImageIndex,ActionImage);
Assert(Assigned(ActionImage));
NewAction.ImageIndex := NTAServices.AddMasked(ActionImage,
|
|
From: <dav...@us...> - 2012-01-04 22:16:08
|
Revision: 950
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=950&view=rev
Author: davidvtaylor
Date: 2012-01-04 22:16:02 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
* Removed MessageServices.ClearAllMessages call in TInstantOTAIDEInterface to fix an AV in Delphi XE2 on shutdown
Modified Paths:
--------------
trunk/Source/Design/InstantOTA.pas
Modified: trunk/Source/Design/InstantOTA.pas
===================================================================
--- trunk/Source/Design/InstantOTA.pas 2011-09-28 13:51:18 UTC (rev 949)
+++ trunk/Source/Design/InstantOTA.pas 2012-01-04 22:16:02 UTC (rev 950)
@@ -341,7 +341,6 @@
destructor TInstantOTAIDEInterface.Destroy;
begin
- MessageServices.ClearAllMessages;
FIDENotifier5.Free;
inherited;
end;
|
|
From: <dav...@us...> - 2011-09-28 13:51:24
|
Revision: 949
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=949&view=rev
Author: davidvtaylor
Date: 2011-09-28 13:51:18 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
+ Add a MSSQL 2005 protocol to the AnyDAC broker. The new protocol uses VARCHAR(MAX) and VARBINARY(MAX) for Memo and Blob fields respectively
* Revise GetSQLDelimiters to accommodate changes in AnyDAC
Modified Paths:
--------------
trunk/Source/Brokers/AnyDAC/InstantAnyDAC.pas
Modified: trunk/Source/Brokers/AnyDAC/InstantAnyDAC.pas
===================================================================
--- trunk/Source/Brokers/AnyDAC/InstantAnyDAC.pas 2011-09-28 13:47:46 UTC (rev 948)
+++ trunk/Source/Brokers/AnyDAC/InstantAnyDAC.pas 2011-09-28 13:51:18 UTC (rev 949)
@@ -20,7 +20,7 @@
*
* The Initial Developer of the Original Code is: David Taylor
*
- * Portions created by the Initial Developer are Copyright (C) 2009
+ * Portions created by the Initial Developer are Copyright (C) 2009-2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
@@ -50,7 +50,7 @@
uses
Classes, Db, InstantPersistence, InstantCommand, InstantDBBuild,
InstantBrokers, InstantMetadata, InstantTypes, uADCompClient,
- uADStanOption, uADStanParam, uADStanIntf, uADStanConst,
+ uADStanOption, uADStanParam, uADStanIntf, uADStanConst, uADPhysIntf,
uADDAptIntf, uADStanAsync, uADDAptManager, uADCompDataSet
{$IFDEF D10+}, Variants, DBCommonTypes{$ENDIF};
@@ -199,6 +199,11 @@
function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
function UseBooleanFields: Boolean; override;
end;
+
+ TInstantAnyDACMSSQL2005Broker = class(TInstantAnyDACMSSQLBroker)
+ protected
+ function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
+ end;
{$ENDIF}
{ Interbase and Firebird brokers }
@@ -316,6 +321,9 @@
STmpTableSuffix = '_IOTmp_';
{$ENDIF}
+{$IFDEF MSSQL_SUPPORT}
+ S_AD_MSSQL2005Id = S_AD_MSSQLId + ' 2005';
+{$ENDIF}
procedure AssignAnyDACProtocols(Strings: TStrings);
begin
@@ -329,6 +337,7 @@
{$IFDEF MSSQL_SUPPORT}
Strings.Add(S_AD_MSSQLId);
+ Strings.Add(S_AD_MSSQL2005Id);
{$ENDIF}
{$IFDEF IBFB_SUPPORT}
@@ -403,7 +412,12 @@
ADConnector.Connection := Connection;
ADConnector.LoginPrompt := LoginPrompt;
ADConnector.UseDelimitedIdents := UseDelimitedIdents;
- Connection.DriverName := Protocol;
+
+ // Use AnyDAC MSSQL driver name for MSSQL 2005 protocol
+ if (SameText(Protocol, S_AD_MSSQL2005Id)) then
+ Connection.DriverName := S_AD_MSSQLId else
+ Connection.DriverName := Protocol;
+
Connection.TxOptions.AutoCommit := false;
Connection.TxOptions.Isolation := xiReadCommitted;
Connection.Params.Values['User_Name'] := UserName;
@@ -417,8 +431,6 @@
if (Port <= 0) then
Connection.Params.Values['Server'] := HostName else
Connection.Params.Values['Server'] := HostName + ', ' + IntToStr(Port)
-
- // Connection.Properties.Text := Properties;
except
Connection.Free;
raise;
@@ -479,6 +491,9 @@
{$IFDEF MSSQL_SUPPORT}
if SameText(FConnection.DriverName, S_AD_MSSQLId) then
Result := TInstantAnyDACMSSQLBroker.Create(Self);
+
+ if SameText(FConnection.DriverName, S_AD_MSSQL2005Id) then
+ Result := TInstantAnyDACMSSQL2005Broker.Create(Self);
{$ENDIF}
{$IFDEF IBFB_SUPPORT}
@@ -712,11 +727,8 @@
TargetParam.Assign(SourceParam) else
TargetParam.AsInteger := ord(SourceParam.AsBoolean);
ftBlob:
- // Temporary workaround for AnyDAC blob issue with MSSQL
{$IFDEF D12+}
- if (VarArrayHighBound(SourceParam.Value,1) <> -1) then
- TargetParam.AsBlob := ConvertBlobData(SourceParam.AsBlob) else
- TargetParam.AsBlob := '';
+ TargetParam.AsBlob := ConvertBlobData(SourceParam.AsBlob);
{$ELSE}
TargetParam.AsBlob := SourceParam.AsBlob;
{$ENDIF}
@@ -832,21 +844,23 @@
end;
function TInstantAnyDACBroker.GetSQLDelimiters: string;
+var
+ LeftCh : char;
+ RightCh : char;
begin
if not Connector.UseDelimitedIdents then
Result := ''
else
begin
with Connector.Connection do
- begin
- if (ConnectionMetaDataIntf.NameQuotaChar1 <> #0) and
- (ConnectionMetaDataIntf.NameQuotaChar1 <> ' ') then
- Result := ConnectionMetaDataIntf.NameQuotaChar1 else
- Result := '';
- if (ConnectionMetaDataIntf.NameQuotaChar2 <> #0) and
- (ConnectionMetaDataIntf.NameQuotaChar2 <> ' ') then
- Result := Result + ConnectionMetaDataIntf.NameQuotaChar2;
- end;
+ begin
+ LeftCh := ConnectionMetaDataIntf.NameQuoteChar[ncDefault, nsLeft];
+ RightCh := ConnectionMetaDataIntf.NameQuoteChar[ncDefault, nsRight];
+ end;
+
+ if (LeftCh = #0) or (RightCh = #0) or (LeftCh = ' ') or (RightCh = ' ') then
+ Result := '' else
+ Result := LeftCh + RightCh;
end;
end;
@@ -960,6 +974,25 @@
begin
Result := True;
end;
+
+function TInstantAnyDACMSSQL2005Broker.InternalDataTypeToColumnType(
+ DataType: TInstantDataType): string;
+const
+ Types: array[TInstantDataType] of string = (
+ 'INTEGER',
+ 'FLOAT',
+ 'MONEY',
+ 'BIT',
+ 'VARCHAR',
+ 'VARBINARY(MAX)',
+ 'DATETIME',
+ 'VARCHAR(MAX)',
+ 'DATETIME',
+ 'DATETIME',
+ 'INTEGER');
+begin
+ Result := Types[DataType];
+end;
{$ENDIF}
{ TInstantAnyDACIbFbBroker }
|
|
From: <dav...@us...> - 2011-09-28 13:47:52
|
Revision: 948
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=948&view=rev
Author: davidvtaylor
Date: 2011-09-28 13:47:46 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
+ Add a MSSQL 2005 protocol to the AnyDAC broker. The new protocol uses VARCHAR(MAX) and VARBINARY(MAX) for Memo and Blob fields respectively
Modified Paths:
--------------
trunk/Source/Brokers/AnyDAC/InstantAnyDACCatalog.pas
trunk/Source/Brokers/AnyDAC/InstantAnyDACConnectionDefEdit.pas
Modified: trunk/Source/Brokers/AnyDAC/InstantAnyDACCatalog.pas
===================================================================
--- trunk/Source/Brokers/AnyDAC/InstantAnyDACCatalog.pas 2011-09-17 04:58:48 UTC (rev 947)
+++ trunk/Source/Brokers/AnyDAC/InstantAnyDACCatalog.pas 2011-09-28 13:47:46 UTC (rev 948)
@@ -20,7 +20,7 @@
*
* The Initial Developer of the Original Code is: David Taylor
*
- * Portions created by the Initial Developer are Copyright (C) 2009
+ * Portions created by the Initial Developer are Copyright (C) 2009-2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
@@ -54,7 +54,8 @@
const Catalog : string; Schema : string);
procedure AddTableMetadatas(TableMetadatas: TInstantTableMetadatas);
function ColumnTypeToDataType(const ColumnType: TADDataType;
- out DataType: TInstantDataType; out AlternateDataTypes: TInstantDataTypes): Boolean;
+ const ColumnLength : variant; out DataType: TInstantDataType;
+ out AlternateDataTypes: TInstantDataTypes): Boolean;
function GetBroker: TInstantAnyDACBroker;
function GetConnector: TInstantAnyDACConnector;
public
@@ -95,17 +96,19 @@
ADFieldName := VarToStr(FieldRow.GetData('COLUMN_NAME'));
ADFieldType := TADDataType(FieldRow.GetData('COLUMN_DATATYPE'));
IntValue := FieldRow.GetData('COLUMN_ATTRIBUTES');
+ ColumnLength := FieldRow.GetData('COLUMN_LENGTH');
ADFieldAttrib := TADDataAttributes(pointer(@IntValue)^);
- if ColumnTypeToDataType(ADFieldType, FieldDataType, FieldAltDataTypes) then
+ if ColumnTypeToDataType(ADFieldType, ColumnLength, FieldDataType, FieldAltDataTypes) then
begin
FieldMetadata := TableMetadata.FieldMetadatas.Add;
FieldMetadata.Name := ADFieldName;
FieldMetadata.DataType := FieldDataType;
FieldMetadata.AlternateDataTypes := FieldAltDataTypes;
- ColumnLength := FieldRow.GetData('COLUMN_LENGTH');
+
if VarIsOrdinal(ColumnLength) then
- FieldMetadata.Size := Integer(ColumnLength);
+ FieldMetadata.Size := Integer(ColumnLength);
+
FieldMetadata.Options := [];
if (not (caAllowNull in ADFieldAttrib)) then
@@ -203,7 +206,7 @@
// This is a bit of hack since each segment in the index defines
// its own sort order. IO does not support this so we record the
- // sort order of the first s(and possibly only) key field.
+ // sort order of the first (and possibly only) key field.
if (J = 0) then
begin
if (VarToStr(IndexFieldRow.GetData('SORT_ORDER')) = 'D') then
@@ -252,15 +255,31 @@
end;
function TInstantAnyDACCatalog.ColumnTypeToDataType(const ColumnType: TADDataType;
- out DataType: TInstantDataType; out AlternateDataTypes: TInstantDataTypes): Boolean;
+ const ColumnLength : variant; out DataType: TInstantDataType;
+ out AlternateDataTypes: TInstantDataTypes): Boolean;
begin
Result := True;
AlternateDataTypes := [];
-
+
case ColumnType of
- uADStanIntf.dtAnsiString: DataType := InstantTypes.dtString;
- uADStanIntf.dtWideString: DataType := InstantTypes.dtString;
- uADStanIntf.dtByteString: DataType := InstantTypes.dtString;
+ uADStanIntf.dtAnsiString,
+ uADStanIntf.dtWideString:
+ begin
+ if VarIsOrdinal(ColumnLength) and (Integer(ColumnLength) = MAXINT) then
+ begin
+ DataType := InstantTypes.dtMemo;
+ Include(AlternateDataTypes, InstantTypes.dtString);
+ end else
+ begin
+ DataType := InstantTypes.dtString;
+ end;
+ end;
+ uADStanIntf.dtByteString:
+ begin
+ if VarIsOrdinal(ColumnLength) and (Integer(ColumnLength) = MAXINT) then
+ DataType := InstantTypes.dtBlob else
+ Result := False;
+ end;
uADStanIntf.dtBoolean: DataType := InstantTypes.dtBoolean;
uADStanIntf.dtDateTime: DataType := InstantTypes.dtDateTime;
uADStanIntf.dtTime: DataType := InstantTypes.dtTime;
Modified: trunk/Source/Brokers/AnyDAC/InstantAnyDACConnectionDefEdit.pas
===================================================================
--- trunk/Source/Brokers/AnyDAC/InstantAnyDACConnectionDefEdit.pas 2011-09-17 04:58:48 UTC (rev 947)
+++ trunk/Source/Brokers/AnyDAC/InstantAnyDACConnectionDefEdit.pas 2011-09-28 13:47:46 UTC (rev 948)
@@ -20,7 +20,7 @@
*
* The Initial Developer of the Original Code is: David Taylor
*
- * Portions created by the Initial Developer are Copyright (C) 2009
+ * Portions created by the Initial Developer are Copyright (C) 2009-2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
|
|
From: <dav...@us...> - 2011-09-17 04:58:54
|
Revision: 947
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=947&view=rev
Author: davidvtaylor
Date: 2011-09-17 04:58:48 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
* Change CorePackages project group to reference the Delphi XE2 unit test project
Modified Paths:
--------------
trunk/Source/PackageGroups/DXE2/CorePackages.groupproj
Modified: trunk/Source/PackageGroups/DXE2/CorePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/DXE2/CorePackages.groupproj 2011-09-17 04:53:47 UTC (rev 946)
+++ trunk/Source/PackageGroups/DXE2/CorePackages.groupproj 2011-09-17 04:58:48 UTC (rev 947)
@@ -21,7 +21,7 @@
<Projects Include="..\..\Brokers\XML\DXE2\DclIOXML.dproj">
<Dependencies/>
</Projects>
- <Projects Include="..\..\..\Tests\TestIO_DXE.dproj">
+ <Projects Include="..\..\..\Tests\TestIO_DXE2.dproj">
<Dependencies/>
</Projects>
</ItemGroup>
@@ -86,23 +86,23 @@
<Target Name="DclIOXML:Make">
<MSBuild Targets="Make" Projects="..\..\Brokers\XML\DXE2\DclIOXML.dproj"/>
</Target>
- <Target Name="TestIO_DXE">
- <MSBuild Projects="..\..\..\Tests\TestIO_DXE.dproj"/>
+ <Target Name="TestIO_DXE2">
+ <MSBuild Projects="..\..\..\Tests\TestIO_DXE2.dproj"/>
</Target>
- <Target Name="TestIO_DXE:Clean">
- <MSBuild Targets="Clean" Projects="..\..\..\Tests\TestIO_DXE.dproj"/>
+ <Target Name="TestIO_DXE2:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\..\Tests\TestIO_DXE2.dproj"/>
</Target>
- <Target Name="TestIO_DXE:Make">
- <MSBuild Targets="Make" Projects="..\..\..\Tests\TestIO_DXE.dproj"/>
+ <Target Name="TestIO_DXE2:Make">
+ <MSBuild Targets="Make" Projects="..\..\..\Tests\TestIO_DXE2.dproj"/>
</Target>
<Target Name="Build">
- <CallTarget Targets="IOCore;DclIOCore;IOBDE;DclIOBDE;IOXML;DclIOXML;TestIO_DXE"/>
+ <CallTarget Targets="IOCore;DclIOCore;IOBDE;DclIOBDE;IOXML;DclIOXML;TestIO_DXE2"/>
</Target>
<Target Name="Clean">
- <CallTarget Targets="IOCore:Clean;DclIOCore:Clean;IOBDE:Clean;DclIOBDE:Clean;IOXML:Clean;DclIOXML:Clean;TestIO_DXE:Clean"/>
+ <CallTarget Targets="IOCore:Clean;DclIOCore:Clean;IOBDE:Clean;DclIOBDE:Clean;IOXML:Clean;DclIOXML:Clean;TestIO_DXE2:Clean"/>
</Target>
<Target Name="Make">
- <CallTarget Targets="IOCore:Make;DclIOCore:Make;IOBDE:Make;DclIOBDE:Make;IOXML:Make;DclIOXML:Make;TestIO_DXE:Make"/>
+ <CallTarget Targets="IOCore:Make;DclIOCore:Make;IOBDE:Make;DclIOBDE:Make;IOXML:Make;DclIOXML:Make;TestIO_DXE2:Make"/>
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project>
|
|
From: <dav...@us...> - 2011-09-17 04:53:54
|
Revision: 946
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=946&view=rev
Author: davidvtaylor
Date: 2011-09-17 04:53:47 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
+ Add unit tests for Delphi XE2 (Win32 platform)
Added Paths:
-----------
trunk/Tests/TestIO_DXE2.dpr
trunk/Tests/TestIO_DXE2.dproj
trunk/Tests/TestIO_DXE2.mdr
trunk/Tests/TestIO_DXE2.mdrt
trunk/Tests/TestIO_DXE2.mdx
trunk/Tests/TestIO_DXE2.mdxt
trunk/Tests/TestIO_DXE2.res
trunk/Tests/TestIO_DXE2_Icon.ico
Added: trunk/Tests/TestIO_DXE2.dpr
===================================================================
--- trunk/Tests/TestIO_DXE2.dpr (rev 0)
+++ trunk/Tests/TestIO_DXE2.dpr 2011-09-17 04:53:47 UTC (rev 946)
@@ -0,0 +1,68 @@
+program TestIO_DXE2;
+
+{$I '..\Source\InstantDefines.inc'}
+
+{$IFDEF FPC}
+{$mode objfpc}{$H+}
+{$ENDIF}
+
+uses
+ Forms,
+ guitestrunner,
+ fpcunit,
+ testregistry,
+ testutils,
+ testreport,
+ InstantPersistence,
+ InstantMock in 'InstantMock.pas',
+ TestMockConnector in 'TestMockConnector.pas',
+ TestMockBroker in 'TestMockBroker.pas',
+ TestModel in 'TestModel.pas',
+ TestInstantMetadata in 'TestInstantMetadata.pas',
+ TestInstantFieldMetadata in 'TestInstantFieldMetadata.pas',
+ TestInstantClassMetadata in 'TestInstantClassMetadata.pas',
+ TestInstantAttributeMetadata in 'TestInstantAttributeMetadata.pas',
+ TestInstantIndexMetadata in 'TestInstantIndexMetadata.pas',
+ TestInstantTableMetadata in 'TestInstantTableMetadata.pas',
+ TestInstantScheme in 'TestInstantScheme.pas',
+ TestInstantClasses in 'TestInstantClasses.pas',
+ TestInstantRtti in 'TestInstantRtti.pas',
+ TestMinimalModel in 'TestMinimalModel.pas',
+ TestInstantAttributeMap in 'TestInstantAttributeMap.pas',
+ TestInstantAttribute in 'TestInstantAttribute.pas',
+ TestInstantNumeric in 'TestInstantNumeric.pas',
+ TestInstantInteger in 'TestInstantInteger.pas',
+ TestInstantString in 'TestInstantString.pas',
+ TestInstantDateTime in 'TestInstantDateTime.pas',
+ TestInstantDate in 'TestInstantDate.pas',
+ TestInstantTime in 'TestInstantTime.pas',
+ TestInstantBoolean in 'TestInstantBoolean.pas',
+ TestInstantFloat in 'TestInstantFloat.pas',
+ TestInstantCurrency in 'TestInstantCurrency.pas',
+ TestInstantBlob in 'TestInstantBlob.pas',
+ TestInstantComplex in 'TestInstantComplex.pas',
+ TestInstantPart in 'TestInstantPart.pas',
+ TestInstantReference in 'TestInstantReference.pas',
+ TestInstantObject in 'TestInstantObject.pas',
+ TestInstantObjectState in 'TestInstantObjectState.pas',
+ TestInstantCache in 'TestInstantCache.pas',
+ TestInstantObjectStore in 'TestInstantObjectStore.pas',
+ TestInstantParts in 'TestInstantParts.pas',
+ TestInstantReferences in 'TestInstantReferences.pas',
+ TestInstantCircularReferences in 'TestInstantCircularReferences.pas',
+ TestInstantObjectReference in 'TestInstantObjectReference.pas',
+ MinimalModel in 'MinimalModel.pas',
+ TestXMLBroker in 'TestXMLBroker.pas',
+ TestInstantCode in 'TestInstantCode.pas';
+
+{$R *.res}
+{$R *.mdr} {TestModel}
+
+begin
+ Application.Initialize;
+ InstantModel.ClassMetadatas.Clear;
+ Application.CreateForm(TGUITestRunner, TestRunner);
+ //Application.CreateForm(TTestRunner, TestRunner);
+ Application.Run;
+end.
+
Property changes on: trunk/Tests/TestIO_DXE2.dpr
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/Tests/TestIO_DXE2.dproj
===================================================================
--- trunk/Tests/TestIO_DXE2.dproj (rev 0)
+++ trunk/Tests/TestIO_DXE2.dproj 2011-09-17 04:53:47 UTC (rev 946)
@@ -0,0 +1,190 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{015d41df-eb42-4172-b75c-3e0f464f00cc}</ProjectGuid>
+ <MainSource>TestIO_DXE2.dpr</MainSource>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+ <DCC_DependencyCheckOutputName>TestIO_DXE2.exe</DCC_DependencyCheckOutputName>
+ <ProjectVersion>13.4</ProjectVersion>
+ <Config Condition="'$(Config)'==''">Debug</Config>
+ <Base>True</Base>
+ <AppType>Application</AppType>
+ <FrameworkType>VCL</FrameworkType>
+ <Platform Condition="'$(Platform)'==''">Win32</Platform>
+ <TargetedPlatforms>1</TargetedPlatforms>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+ <Base_Win64>true</Base_Win64>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+ <Base_Win32>true</Base_Win32>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+ <Cfg_1>true</Cfg_1>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+ <Cfg_2>true</Cfg_2>
+ <CfgParent>Base</CfgParent>
+ <Base>true</Base>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base)'!=''">
+ <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_Locale>3081</VerInfo_Locale>
+ <DCC_UnitSearchPath>..\Source\Core;..\Source\Brokers\XML;.\ubmock\src;.\DUnit\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+ <DCC_DebugDCUs>true</DCC_DebugDCUs>
+ <DCC_DependencyCheckOutputName>TestIO_DXE2.exe</DCC_DependencyCheckOutputName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win64)'!=''">
+ <Icon_MainIcon>TestIO_DXE2_Icon.ico</Icon_MainIcon>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Base_Win32)'!=''">
+ <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+ <Icon_MainIcon>TestIO_DXE2_Icon.ico</Icon_MainIcon>
+ <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_Locale>1033</VerInfo_Locale>
+ <Debugger_DebugSourcePath>..\Source\Core;$(Debugger_DebugSourcePath)</Debugger_DebugSourcePath>
+ <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
+ <Version>7.0</Version>
+ <DCC_DebugInformation>False</DCC_DebugInformation>
+ <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+ <DCC_Optimize>False</DCC_Optimize>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+ <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+ <DCC_ResourcePath>..\Source\Core;.\ubmock\src;$(DCC_ResourcePath)</DCC_ResourcePath>
+ <DCC_ObjPath>..\Source\Core;.\ubmock\src;$(DCC_ObjPath)</DCC_ObjPath>
+ <DCC_IncludePath>..\Source\Core;.\ubmock\src;$(DCC_IncludePath)</DCC_IncludePath>
+ <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
+ <Version>7.0</Version>
+ <DCC_Optimize>False</DCC_Optimize>
+ <DCC_TypedAtParameter>True</DCC_TypedAtParameter>
+ <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+ <DCC_ResourcePath>..\Source\Core;.\ubmock\src;$(DCC_ResourcePath)</DCC_ResourcePath>
+ <DCC_ObjPath>..\Source\Core;.\ubmock\src;$(DCC_ObjPath)</DCC_ObjPath>
+ <DCC_IncludePath>..\Source\Core;.\ubmock\src;$(DCC_IncludePath)</DCC_IncludePath>
+ <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+ </PropertyGroup>
+ <ItemGroup>
+ <DelphiCompile Include="$(MainSource)">
+ <MainSource>MainSource</MainSource>
+ </DelphiCompile>
+ <DCCReference Include="InstantMock.pas"/>
+ <DCCReference Include="TestMockConnector.pas"/>
+ <DCCReference Include="TestMockBroker.pas"/>
+ <DCCReference Include="TestModel.pas"/>
+ <DCCReference Include="TestInstantMetadata.pas"/>
+ <DCCReference Include="TestInstantFieldMetadata.pas"/>
+ <DCCReference Include="TestInstantClassMetadata.pas"/>
+ <DCCReference Include="TestInstantAttributeMetadata.pas"/>
+ <DCCReference Include="TestInstantIndexMetadata.pas"/>
+ <DCCReference Include="TestInstantTableMetadata.pas"/>
+ <DCCReference Include="TestInstantScheme.pas"/>
+ <DCCReference Include="TestInstantClasses.pas"/>
+ <DCCReference Include="TestInstantRtti.pas"/>
+ <DCCReference Include="TestMinimalModel.pas"/>
+ <DCCReference Include="TestInstantAttributeMap.pas"/>
+ <DCCReference Include="TestInstantAttribute.pas"/>
+ <DCCReference Include="TestInstantNumeric.pas"/>
+ <DCCReference Include="TestInstantInteger.pas"/>
+ <DCCReference Include="TestInstantString.pas"/>
+ <DCCReference Include="TestInstantDateTime.pas"/>
+ <DCCReference Include="TestInstantDate.pas"/>
+ <DCCReference Include="TestInstantTime.pas"/>
+ <DCCReference Include="TestInstantBoolean.pas"/>
+ <DCCReference Include="TestInstantFloat.pas"/>
+ <DCCReference Include="TestInstantCurrency.pas"/>
+ <DCCReference Include="TestInstantBlob.pas"/>
+ <DCCReference Include="TestInstantComplex.pas"/>
+ <DCCReference Include="TestInstantPart.pas"/>
+ <DCCReference Include="TestInstantReference.pas"/>
+ <DCCReference Include="TestInstantObject.pas"/>
+ <DCCReference Include="TestInstantObjectState.pas"/>
+ <DCCReference Include="TestInstantCache.pas"/>
+ <DCCReference Include="TestInstantObjectStore.pas"/>
+ <DCCReference Include="TestInstantParts.pas"/>
+ <DCCReference Include="TestInstantReferences.pas"/>
+ <DCCReference Include="TestInstantCircularReferences.pas"/>
+ <DCCReference Include="TestInstantObjectReference.pas"/>
+ <DCCReference Include="MinimalModel.pas"/>
+ <DCCReference Include="TestXMLBroker.pas"/>
+ <DCCReference Include="TestInstantCode.pas"/>
+ <BuildConfiguration Include="Debug">
+ <Key>Cfg_2</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Base">
+ <Key>Base</Key>
+ </BuildConfiguration>
+ <BuildConfiguration Include="Release">
+ <Key>Cfg_1</Key>
+ <CfgParent>Base</CfgParent>
+ </BuildConfiguration>
+ </ItemGroup>
+ <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+ <ProjectExtensions>
+ <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+ <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+ <BorlandProject>
+ <Delphi.Personality>
+ <Compiler>
+ <Compiler Name="UsePackages">False</Compiler>
+ <Compiler Name="Packages">vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;adortl;vclactnband;vclshlctrls;CS30Logging70;Rz30Ctls70;Rz30DBCtls70;ip4000v7;Rave60VCL;Rave60CLX;madBasic_;madDisAsm_;CLXIB;ibxpress;VCLIB;IOCore;IOIBX</Compiler>
+ </Compiler>
+ <Parameters>
+ <Parameters Name="DebugSourceDirs">..\Source\Core</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">3081</VersionInfo>
+ <VersionInfo Name="CodePage">1252</VersionInfo>
+ </VersionInfo>
+ <VersionInfoKeys>
+ <VersionInfoKeys Name="CompanyName"/>
+ <VersionInfoKeys Name="FileDescription"/>
+ <VersionInfoKeys Name="FileVersion">1.0.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="Comments"/>
+ </VersionInfoKeys>
+ <Source>
+ <Source Name="MainSource">TestIO_DXE2.dpr</Source>
+ </Source>
+ </Delphi.Personality>
+ <Platforms>
+ <Platform value="Win64">False</Platform>
+ <Platform value="Win32">True</Platform>
+ </Platforms>
+ </BorlandProject>
+ <ProjectFileVersion>12</ProjectFileVersion>
+ </ProjectExtensions>
+ <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+ </Project>
Property changes on: trunk/Tests/TestIO_DXE2.dproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Tests/TestIO_DXE2.mdr
===================================================================
(Binary files differ)
Property changes on: trunk/Tests/TestIO_DXE2.mdr
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tests/TestIO_DXE2.mdrt
===================================================================
(Binary files differ)
Property changes on: trunk/Tests/TestIO_DXE2.mdrt
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tests/TestIO_DXE2.mdx
===================================================================
--- trunk/Tests/TestIO_DXE2.mdx (rev 0)
+++ trunk/Tests/TestIO_DXE2.mdx 2011-09-17 04:53:47 UTC (rev 946)
@@ -0,0 +1,461 @@
+<TInstantClassMetadatas>
+ <TInstantClassMetadata>
+ <Name>TAddress</Name>
+ <Persistence>peEmbedded</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>City</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>TRUE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Country</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCountry</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>State</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>4</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Street</Name>
+ <AttributeType>atMemo</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Zip</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>10</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TCountry</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TPhone</Name>
+ <Persistence>peEmbedded</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>20</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Number</Name>
+ <AttributeType>atString</AttributeType>
+ <EditMask>(000) 000-0000;0;_</EditMask>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>20</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TEmail</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Address</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>100</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TCategory</Name>
+ <Persistence>peStored</Persistence>
+ <StorageName>Categories</StorageName>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TContact</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Address</Name>
+ <AttributeType>atPart</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TAddress</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Category</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCategory</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>City</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>TRUE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>TRUE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>50</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Phones</Name>
+ <AttributeType>atParts</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TPhone</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Projects</Name>
+ <AttributeType>atReferences</AttributeType>
+ <ExternalStorageName>Contact_Projects</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProject</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>ExternalAddress</Name>
+ <AttributeType>atPart</AttributeType>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TExternalAddress</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>ExternalPhones</Name>
+ <AttributeType>atParts</AttributeType>
+ <ExternalStorageName>Contact_ExternalPhones</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TExternalPhone</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TContactFilter</Name>
+ <ParentName>TContact</ParentName>
+ <Persistence>peEmbedded</Persistence>
+ <AttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TPerson</Name>
+ <ParentName>TContact</ParentName>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>BirthDate</Name>
+ <AttributeType>atDateTime</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Emails</Name>
+ <AttributeType>atParts</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TEmail</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Employer</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCompany</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Picture</Name>
+ <AttributeType>atBlob</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Salary</Name>
+ <AttributeType>atCurrency</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ValidCharsString>,.0..9€</ValidCharsString>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Employed</Name>
+ <AttributeType>atBoolean</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>AL_hours</Name>
+ <AttributeType>atFloat</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>EmploymentDate</Name>
+ <AttributeType>atDate</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>BirthTime</Name>
+ <AttributeType>atTime</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TCompany</Name>
+ <ParentName>TContact</ParentName>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Employees</Name>
+ <AttributeType>atReferences</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TPerson</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>NoOfBranches</Name>
+ <AttributeType>atInteger</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Subsidiaries</Name>
+ <AttributeType>atReferences</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCompany</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TProject</Name>
+ <Persistence>peStored</Persistence>
+ <StorageName>Projects</StorageName>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>SubProjects</Name>
+ <AttributeType>atParts</AttributeType>
+ <ExternalStorageName>Project_SubProjects</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProject</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Addresses</Name>
+ <AttributeType>atParts</AttributeType>
+ <ExternalStorageName>Project_Addresses</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TExternalAddress</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Manager</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TContact</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Participants</Name>
+ <AttributeType>atReferences</AttributeType>
+ <ExternalStorageName>Project_Participants</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TContact</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Items</Name>
+ <AttributeType>atPart</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProjectItems</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TExternalAddress</Name>
+ <Persistence>peStored</Persistence>
+ <StorageName>ExternalAddresses</StorageName>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Category</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCategory</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Site_Contact</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TPerson</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TExternalPhone</Name>
+ <Persistence>peStored</Persistence>
+ <StorageName>ExternalPhones</StorageName>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>20</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Number</Name>
+ <AttributeType>atString</AttributeType>
+ <EditMask>(000) 000-0000;0;_</EditMask>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>20</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TProjectBox</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Project</Name>
+ <AttributeType>atPart</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProject</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>RelatedProjectBoxes</Name>
+ <AttributeType>atReferences</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProjectBox</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TProjectItem</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Description</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>50</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Country</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCountry</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TProjectItems</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Items</Name>
+ <AttributeType>atParts</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProjectItem</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+</TInstantClassMetadatas>
Property changes on: trunk/Tests/TestIO_DXE2.mdx
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Tests/TestIO_DXE2.mdxt
===================================================================
--- trunk/Tests/TestIO_DXE2.mdxt (rev 0)
+++ trunk/Tests/TestIO_DXE2.mdxt 2011-09-17 04:53:47 UTC (rev 946)
@@ -0,0 +1,445 @@
+<TInstantClassMetadatas>
+ <TInstantClassMetadata>
+ <Name>TAddress</Name>
+ <Persistence>peEmbedded</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>City</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>TRUE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Country</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCountry</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>State</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>4</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Street</Name>
+ <AttributeType>atMemo</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Zip</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>10</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TCountry</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TPhone</Name>
+ <Persistence>peEmbedded</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>20</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Number</Name>
+ <AttributeType>atString</AttributeType>
+ <EditMask>(000) 000-0000;0;_</EditMask>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>20</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TEmail</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Address</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>100</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TContact</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Address</Name>
+ <AttributeType>atPart</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TAddress</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Category</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCategory</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>City</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>TRUE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>TRUE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>50</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Phones</Name>
+ <AttributeType>atParts</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TPhone</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Projects</Name>
+ <AttributeType>atReferences</AttributeType>
+ <ExternalStorageName>Contact_Projects</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProject</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>ExternalAddress</Name>
+ <AttributeType>atPart</AttributeType>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TExternalAddress</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>ExternalPhones</Name>
+ <AttributeType>atParts</AttributeType>
+ <ExternalStorageName>Contact_ExternalPhones</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TExternalPhone</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TContactFilter</Name>
+ <ParentName>TContact</ParentName>
+ <Persistence>peEmbedded</Persistence>
+ <AttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TPerson</Name>
+ <ParentName>TContact</ParentName>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>BirthDate</Name>
+ <AttributeType>atDateTime</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Emails</Name>
+ <AttributeType>atParts</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TEmail</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Employer</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCompany</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Picture</Name>
+ <AttributeType>atBlob</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Salary</Name>
+ <AttributeType>atCurrency</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ValidCharsString>,.0..9€</ValidCharsString>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Employed</Name>
+ <AttributeType>atBoolean</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>AL_hours</Name>
+ <AttributeType>atFloat</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>EmploymentDate</Name>
+ <AttributeType>atDate</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>BirthTime</Name>
+ <AttributeType>atTime</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TCompany</Name>
+ <ParentName>TContact</ParentName>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Employees</Name>
+ <AttributeType>atReferences</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TPerson</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>NoOfBranches</Name>
+ <AttributeType>atInteger</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Subsidiaries</Name>
+ <AttributeType>atReferences</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCompany</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TProject</Name>
+ <Persistence>peStored</Persistence>
+ <StorageName>Projects</StorageName>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>SubProjects</Name>
+ <AttributeType>atParts</AttributeType>
+ <ExternalStorageName>Project_SubProjects</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProject</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Addresses</Name>
+ <AttributeType>atParts</AttributeType>
+ <ExternalStorageName>Project_Addresses</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TExternalAddress</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Manager</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TContact</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Participants</Name>
+ <AttributeType>atReferences</AttributeType>
+ <ExternalStorageName>Project_Participants</ExternalStorageName>
+ <StorageKind>skExternal</StorageKind>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TContact</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Items</Name>
+ <AttributeType>atPart</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProjectItems</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TExternalAddress</Name>
+ <Persistence>peStored</Persistence>
+ <StorageName>ExternalAddresses</StorageName>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>30</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Category</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCategory</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Site_Contact</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TPerson</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TExternalPhone</Name>
+ <Persistence>peStored</Persistence>
+ <StorageName>ExternalPhones</StorageName>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Name</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>20</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Number</Name>
+ <AttributeType>atString</AttributeType>
+ <EditMask>(000) 000-0000;0;_</EditMask>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>20</Size>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TProjectBox</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Project</Name>
+ <AttributeType>atPart</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProject</ObjectClassName>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>RelatedProjectBoxes</Name>
+ <AttributeType>atReferences</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProjectBox</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TProjectItem</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Description</Name>
+ <AttributeType>atString</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <Size>50</Size>
+ </TInstantAttributeMetadata>
+ <TInstantAttributeMetadata>
+ <Name>Country</Name>
+ <AttributeType>atReference</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TCountry</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+ <TInstantClassMetadata>
+ <Name>TProjectItems</Name>
+ <Persistence>peStored</Persistence>
+ <AttributeMetadatas>
+ <TInstantAttributeMetadatas>
+ <TInstantAttributeMetadata>
+ <Name>Items</Name>
+ <AttributeType>atParts</AttributeType>
+ <IsIndexed>FALSE</IsIndexed>
+ <IsRequired>FALSE</IsRequired>
+ <ObjectClassName>TProjectItem</ObjectClassName>
+ </TInstantAttributeMetadata>
+ </TInstantAttributeMetadatas>
+ </AttributeMetadatas>
+ </TInstantClassMetadata>
+</TInstantClassMetadatas>
Property changes on: trunk/Tests/TestIO_DXE2.mdxt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Tests/TestIO_DXE2.res
===================================================================
(Binary files differ)
Property changes on: trunk/Tests/TestIO_DXE2.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tests/TestIO_DXE2_Icon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tests/TestIO_DXE2_Icon.ico
___________________________________________________________________
Added: svn:mime-type
+ image/x-icon
|
|
From: <dav...@us...> - 2011-09-17 04:47:27
|
Revision: 945
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=945&view=rev
Author: davidvtaylor
Date: 2011-09-17 04:47:20 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
+ Add package groups for Delphi XE2 (Win32 platform)
Added Paths:
-----------
trunk/Source/PackageGroups/DXE2/
trunk/Source/PackageGroups/DXE2/CorePackages.groupproj
trunk/Source/PackageGroups/DXE2/DesignTimePackages.groupproj
trunk/Source/PackageGroups/DXE2/RunTimePackages.groupproj
Added: trunk/Source/PackageGroups/DXE2/CorePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/DXE2/CorePackages.groupproj (rev 0)
+++ trunk/Source/PackageGroups/DXE2/CorePackages.groupproj 2011-09-17 04:47:20 UTC (rev 945)
@@ -0,0 +1,108 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{BF17374A-C537-4CFB-A0D4-41C4565CB15A}</ProjectGuid>
+ </PropertyGroup>
+ <ItemGroup>
+ <Projects Include="..\..\Core\DXE2\IOCore.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Design\DXE2\DclIOCore.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\BDE\DXE2\IOBDE.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\BDE\DXE2\DclIOBDE.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\XML\DXE2\IOXML.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\XML\DXE2\DclIOXML.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\..\Tests\TestIO_DXE.dproj">
+ <Dependencies/>
+ </Projects>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Default.Personality.12</Borland.Personality>
+ <Borland.ProjectType/>
+ <BorlandProject>
+ <Default.Personality/>
+ </BorlandProject>
+ </ProjectExtensions>
+ <Target Name="IOCore">
+ <MSBuild Projects="..\..\Core\DXE2\IOCore.dproj"/>
+ </Target>
+ <Target Name="IOCore:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Core\DXE2\IOCore.dproj"/>
+ </Target>
+ <Target Name="IOCore:Make">
+ <MSBuild Targets="Make" Projects="..\..\Core\DXE2\IOCore.dproj"/>
+ </Target>
+ <Target Name="DclIOCore">
+ <MSBuild Projects="..\..\Design\DXE2\DclIOCore.dproj"/>
+ </Target>
+ <Target Name="DclIOCore:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Design\DXE2\DclIOCore.dproj"/>
+ </Target>
+ <Target Name="DclIOCore:Make">
+ <MSBuild Targets="Make" Projects="..\..\Design\DXE2\DclIOCore.dproj"/>
+ </Target>
+ <Target Name="IOBDE">
+ <MSBuild Projects="..\..\Brokers\BDE\DXE2\IOBDE.dproj"/>
+ </Target>
+ <Target Name="IOBDE:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\BDE\DXE2\IOBDE.dproj"/>
+ </Target>
+ <Target Name="IOBDE:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\BDE\DXE2\IOBDE.dproj"/>
+ </Target>
+ <Target Name="DclIOBDE">
+ <MSBuild Projects="..\..\Brokers\BDE\DXE2\DclIOBDE.dproj"/>
+ </Target>
+ <Target Name="DclIOBDE:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\BDE\DXE2\DclIOBDE.dproj"/>
+ </Target>
+ <Target Name="DclIOBDE:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\BDE\DXE2\DclIOBDE.dproj"/>
+ </Target>
+ <Target Name="IOXML">
+ <MSBuild Projects="..\..\Brokers\XML\DXE2\IOXML.dproj"/>
+ </Target>
+ <Target Name="IOXML:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\XML\DXE2\IOXML.dproj"/>
+ </Target>
+ <Target Name="IOXML:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\XML\DXE2\IOXML.dproj"/>
+ </Target>
+ <Target Name="DclIOXML">
+ <MSBuild Projects="..\..\Brokers\XML\DXE2\DclIOXML.dproj"/>
+ </Target>
+ <Target Name="DclIOXML:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\XML\DXE2\DclIOXML.dproj"/>
+ </Target>
+ <Target Name="DclIOXML:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\XML\DXE2\DclIOXML.dproj"/>
+ </Target>
+ <Target Name="TestIO_DXE">
+ <MSBuild Projects="..\..\..\Tests\TestIO_DXE.dproj"/>
+ </Target>
+ <Target Name="TestIO_DXE:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\..\Tests\TestIO_DXE.dproj"/>
+ </Target>
+ <Target Name="TestIO_DXE:Make">
+ <MSBuild Targets="Make" Projects="..\..\..\Tests\TestIO_DXE.dproj"/>
+ </Target>
+ <Target Name="Build">
+ <CallTarget Targets="IOCore;DclIOCore;IOBDE;DclIOBDE;IOXML;DclIOXML;TestIO_DXE"/>
+ </Target>
+ <Target Name="Clean">
+ <CallTarget Targets="IOCore:Clean;DclIOCore:Clean;IOBDE:Clean;DclIOBDE:Clean;IOXML:Clean;DclIOXML:Clean;TestIO_DXE:Clean"/>
+ </Target>
+ <Target Name="Make">
+ <CallTarget Targets="IOCore:Make;DclIOCore:Make;IOBDE:Make;DclIOBDE:Make;IOXML:Make;DclIOXML:Make;TestIO_DXE:Make"/>
+ </Target>
+ <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
+ </Project>
Property changes on: trunk/Source/PackageGroups/DXE2/CorePackages.groupproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/PackageGroups/DXE2/DesignTimePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/DXE2/DesignTimePackages.groupproj (rev 0)
+++ trunk/Source/PackageGroups/DXE2/DesignTimePackages.groupproj 2011-09-17 04:47:20 UTC (rev 945)
@@ -0,0 +1,98 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{b0beaee6-5b6a-420d-a1e5-7be9568cd5a2}</ProjectGuid>
+ </PropertyGroup>
+ <ItemGroup>
+ <Projects Include="..\..\Design\DXE2\DclIOCore.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\ADO\DXE2\DclIOADO.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\BDE\DXE2\DclIOBDE.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\DBX\DXE2\DclIODBX.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\IBX\DXE2\DclIOIBX.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\XML\DXE2\DclIOXML.dproj">
+ <Dependencies/>
+ </Projects>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Default.Personality.12</Borland.Personality>
+ <Borland.ProjectType/>
+ <BorlandProject>
+ <BorlandProject>
+ <Default.Personality/>
+ </BorlandProject>
+ </BorlandProject>
+ </ProjectExtensions>
+ <Target Name="DclIOCore">
+ <MSBuild Projects="..\..\Design\DXE2\DclIOCore.dproj"/>
+ </Target>
+ <Target Name="DclIOCore:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Design\DXE2\DclIOCore.dproj"/>
+ </Target>
+ <Target Name="DclIOCore:Make">
+ <MSBuild Targets="Make" Projects="..\..\Design\DXE2\DclIOCore.dproj"/>
+ </Target>
+ <Target Name="DclIOADO">
+ <MSBuild Projects="..\..\Brokers\ADO\DXE2\DclIOADO.dproj"/>
+ </Target>
+ <Target Name="DclIOADO:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\ADO\DXE2\DclIOADO.dproj"/>
+ </Target>
+ <Target Name="DclIOADO:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\ADO\DXE2\DclIOADO.dproj"/>
+ </Target>
+ <Target Name="DclIOBDE">
+ <MSBuild Projects="..\..\Brokers\BDE\DXE2\DclIOBDE.dproj"/>
+ </Target>
+ <Target Name="DclIOBDE:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\BDE\DXE2\DclIOBDE.dproj"/>
+ </Target>
+ <Target Name="DclIOBDE:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\BDE\DXE2\DclIOBDE.dproj"/>
+ </Target>
+ <Target Name="DclIODBX">
+ <MSBuild Projects="..\..\Brokers\DBX\DXE2\DclIODBX.dproj"/>
+ </Target>
+ <Target Name="DclIODBX:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\DBX\DXE2\DclIODBX.dproj"/>
+ </Target>
+ <Target Name="DclIODBX:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\DBX\DXE2\DclIODBX.dproj"/>
+ </Target>
+ <Target Name="DclIOIBX">
+ <MSBuild Projects="..\..\Brokers\IBX\DXE2\DclIOIBX.dproj"/>
+ </Target>
+ <Target Name="DclIOIBX:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\IBX\DXE2\DclIOIBX.dproj"/>
+ </Target>
+ <Target Name="DclIOIBX:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\IBX\DXE2\DclIOIBX.dproj"/>
+ </Target>
+ <Target Name="DclIOXML">
+ <MSBuild Projects="..\..\Brokers\XML\DXE2\DclIOXML.dproj"/>
+ </Target>
+ <Target Name="DclIOXML:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\XML\DXE2\DclIOXML.dproj"/>
+ </Target>
+ <Target Name="DclIOXML:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\XML\DXE2\DclIOXML.dproj"/>
+ </Target>
+ <Target Name="Build">
+ <CallTarget Targets="DclIOCore;DclIOADO;DclIOBDE;DclIODBX;DclIOIBX;DclIOXML"/>
+ </Target>
+ <Target Name="Clean">
+ <CallTarget Targets="DclIOCore:Clean;DclIOADO:Clean;DclIOBDE:Clean;DclIODBX:Clean;DclIOIBX:Clean;DclIOXML:Clean"/>
+ </Target>
+ <Target Name="Make">
+ <CallTarget Targets="DclIOCore:Make;DclIOADO:Make;DclIOBDE:Make;DclIODBX:Make;DclIOIBX:Make;DclIOXML:Make"/>
+ </Target>
+ <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
+ </Project>
Property changes on: trunk/Source/PackageGroups/DXE2/DesignTimePackages.groupproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/Source/PackageGroups/DXE2/RunTimePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/DXE2/RunTimePackages.groupproj (rev 0)
+++ trunk/Source/PackageGroups/DXE2/RunTimePackages.groupproj 2011-09-17 04:47:20 UTC (rev 945)
@@ -0,0 +1,134 @@
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{aa24332a-6806-448c-ab3d-ab0790ceec13}</ProjectGuid>
+ </PropertyGroup>
+ <ItemGroup>
+ <Projects Include="..\..\Core\DXE2\IOCore.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Catalogs\IBFb\DXE2\IOIBFbCatalog.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Catalogs\MSSql\DXE2\IOMSSqlCatalog.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Catalogs\MySQL\DXE2\IOMySQLCatalog.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\ADO\DXE2\IOADO.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\BDE\DXE2\IOBDE.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\DBX\DXE2\IODBX.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\IBX\DXE2\IOIBX.dproj">
+ <Dependencies/>
+ </Projects>
+ <Projects Include="..\..\Brokers\XML\DXE2\IOXML.dproj">
+ <Dependencies/>
+ </Projects>
+ </ItemGroup>
+ <ProjectExtensions>
+ <Borland.Personality>Default.Personality.12</Borland.Personality>
+ <Borland.ProjectType/>
+ <BorlandProject>
+ <BorlandProject>
+ <Default.Personality/>
+ </BorlandProject>
+ </BorlandProject>
+ </ProjectExtensions>
+ <Target Name="IOCore">
+ <MSBuild Projects="..\..\Core\DXE2\IOCore.dproj"/>
+ </Target>
+ <Target Name="IOCore:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Core\DXE2\IOCore.dproj"/>
+ </Target>
+ <Target Name="IOCore:Make">
+ <MSBuild Targets="Make" Projects="..\..\Core\DXE2\IOCore.dproj"/>
+ </Target>
+ <Target Name="IOIBFbCatalog">
+ <MSBuild Projects="..\..\Catalogs\IBFb\DXE2\IOIBFbCatalog.dproj"/>
+ </Target>
+ <Target Name="IOIBFbCatalog:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Catalogs\IBFb\DXE2\IOIBFbCatalog.dproj"/>
+ </Target>
+ <Target Name="IOIBFbCatalog:Make">
+ <MSBuild Targets="Make" Projects="..\..\Catalogs\IBFb\DXE2\IOIBFbCatalog.dproj"/>
+ </Target>
+ <Target Name="IOMSSqlCatalog">
+ <MSBuild Projects="..\..\Catalogs\MSSql\DXE2\IOMSSqlCatalog.dproj"/>
+ </Target>
+ <Target Name="IOMSSqlCatalog:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Catalogs\MSSql\DXE2\IOMSSqlCatalog.dproj"/>
+ </Target>
+ <Target Name="IOMSSqlCatalog:Make">
+ <MSBuild Targets="Make" Projects="..\..\Catalogs\MSSql\DXE2\IOMSSqlCatalog.dproj"/>
+ </Target>
+ <Target Name="IOMySQLCatalog">
+ <MSBuild Projects="..\..\Catalogs\MySQL\DXE2\IOMySQLCatalog.dproj"/>
+ </Target>
+ <Target Name="IOMySQLCatalog:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Catalogs\MySQL\DXE2\IOMySQLCatalog.dproj"/>
+ </Target>
+ <Target Name="IOMySQLCatalog:Make">
+ <MSBuild Targets="Make" Projects="..\..\Catalogs\MySQL\DXE2\IOMySQLCatalog.dproj"/>
+ </Target>
+ <Target Name="IOADO">
+ <MSBuild Projects="..\..\Brokers\ADO\DXE2\IOADO.dproj"/>
+ </Target>
+ <Target Name="IOADO:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\ADO\DXE2\IOADO.dproj"/>
+ </Target>
+ <Target Name="IOADO:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\ADO\DXE2\IOADO.dproj"/>
+ </Target>
+ <Target Name="IOBDE">
+ <MSBuild Projects="..\..\Brokers\BDE\DXE2\IOBDE.dproj"/>
+ </Target>
+ <Target Name="IOBDE:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\BDE\DXE2\IOBDE.dproj"/>
+ </Target>
+ <Target Name="IOBDE:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\BDE\DXE2\IOBDE.dproj"/>
+ </Target>
+ <Target Name="IODBX">
+ <MSBuild Projects="..\..\Brokers\DBX\DXE2\IODBX.dproj"/>
+ </Target>
+ <Target Name="IODBX:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\DBX\DXE2\IODBX.dproj"/>
+ </Target>
+ <Target Name="IODBX:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\DBX\DXE2\IODBX.dproj"/>
+ </Target>
+ <Target Name="IOIBX">
+ <MSBuild Projects="..\..\Brokers\IBX\DXE2\IOIBX.dproj"/>
+ </Target>
+ <Target Name="IOIBX:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\IBX\DXE2\IOIBX.dproj"/>
+ </Target>
+ <Target Name="IOIBX:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\IBX\DXE2\IOIBX.dproj"/>
+ </Target>
+ <Target Name="IOXML">
+ <MSBuild Projects="..\..\Brokers\XML\DXE2\IOXML.dproj"/>
+ </Target>
+ <Target Name="IOXML:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\Brokers\XML\DXE2\IOXML.dproj"/>
+ </Target>
+ <Target Name="IOXML:Make">
+ <MSBuild Targets="Make" Projects="..\..\Brokers\XML\DXE2\IOXML.dproj"/>
+ </Target>
+ <Target Name="Build">
+ <CallTarget Targets="IOCore;IOIBFbCatalog;IOMSSqlCatalog;IOMySQLCatalog;IOADO;IOBDE;IODBX;IOIBX;IOXML"/>
+ </Target>
+ <Target Name="Clean">
+ <CallTarget Targets="IOCore:Clean;IOIBFbCatalog:Clean;IOMSSqlCatalog:Clean;IOMySQLCatalog:Clean;IOADO:Clean;IOBDE:Clean;IODBX:Clean;IOIBX:Clean;IOXML:Clean"/>
+ </Target>
+ <Target Name="Make">
+ <CallTarget Targets="IOCore:Make;IOIBFbCatalog:Make;IOMSSqlCatalog:Make;IOMySQLCatalog:Make;IOADO:Make;IOBDE:Make;IODBX:Make;IOIBX:Make;IOXML:Make"/>
+ </Target>
+ <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
+ </Project>
Property changes on: trunk/Source/PackageGroups/DXE2/RunTimePackages.groupproj
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
|
