From: <na...@us...> - 2010-09-18 08:07:13
|
Revision: 926 http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=926&view=rev Author: nandod Date: 2010-09-18 08:07:06 +0000 (Sat, 18 Sep 2010) Log Message: ----------- * UIB broker update for D2010 from Marcos E. Yanes. Modified Paths: -------------- trunk/Source/Brokers/UIB/InstantUIB.pas trunk/Source/Brokers/UIB/InstantUIBConnectionDefEdit.dfm trunk/Source/Brokers/UIB/InstantUIBConnectionDefEdit.pas Added Paths: ----------- trunk/Source/Brokers/UIB/D2010/ trunk/Source/Brokers/UIB/D2010/DclIOUIB.dpk trunk/Source/Brokers/UIB/D2010/DclIOUIB.dproj trunk/Source/Brokers/UIB/D2010/IOUIB.dpk trunk/Source/Brokers/UIB/D2010/IOUIB.dproj trunk/Source/Brokers/UIB/D2010/IOUIB.res Property Changed: ---------------- trunk/Source/Brokers/UIB/ Property changes on: trunk/Source/Brokers/UIB ___________________________________________________________________ Modified: svn:ignore - *.dcu + *.dcu __history Property changes on: trunk/Source/Brokers/UIB/D2010 ___________________________________________________________________ Added: svn:ignore + *.local *.identcache Added: trunk/Source/Brokers/UIB/D2010/DclIOUIB.dpk =================================================================== --- trunk/Source/Brokers/UIB/D2010/DclIOUIB.dpk (rev 0) +++ trunk/Source/Brokers/UIB/D2010/DclIOUIB.dpk 2010-09-18 08:07:06 UTC (rev 926) @@ -0,0 +1,40 @@ +package DclIOUIB; + +{$R *.res} +{$R '..\InstantUIB.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 UIB Design-Time Support (Delphi 2010)'} +{$LIBSUFFIX '_D14'} +{$DESIGNONLY} +{$IMPLICITBUILD ON} + +requires + vcl, + vcldb, + IOCore, + IOUIB; + +contains + InstantUIBReg in '..\InstantUIBReg.pas'; + +end. Property changes on: trunk/Source/Brokers/UIB/D2010/DclIOUIB.dpk ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/Source/Brokers/UIB/D2010/DclIOUIB.dproj =================================================================== --- trunk/Source/Brokers/UIB/D2010/DclIOUIB.dproj (rev 0) +++ trunk/Source/Brokers/UIB/D2010/DclIOUIB.dproj 2010-09-18 08:07:06 UTC (rev 926) @@ -0,0 +1,115 @@ + <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{D1DE4743-7AD6-4FC8-AF51-4420127DA195}</ProjectGuid> + <MainSource>DclIOUIB.dpk</MainSource> + <Config Condition="'$(Config)'==''">Debug</Config> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <ProjectVersion>12.0</ProjectVersion> + </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> + <DCC_DependencyCheckOutputName>..\..\..\..\..\..\7.0\Bpl\DclIOUIB_D14.bpl</DCC_DependencyCheckOutputName> + <DllSuffix>_D14</DllSuffix> + <DesignOnlyPackage>true</DesignOnlyPackage> + <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias> + <DCC_TypedAtParameter>true</DCC_TypedAtParameter> + <DCC_Description>InstantObjects UIB Design-Time Support (Delphi 2010)</DCC_Description> + <DCC_Platform>x86</DCC_Platform> + <DCC_N>false</DCC_N> + <DCC_K>false</DCC_K> + <GenDll>true</GenDll> + <DCC_S>false</DCC_S> + <GenPackage>true</GenPackage> + <DCC_F>false</DCC_F> + <DCC_E>false</DCC_E> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_DebugInformation>false</DCC_DebugInformation> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="DclIOUIB.dpk"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="..\InstantUIB.dcr"/> + <DCCReference Include="vcl.dcp"/> + <DCCReference Include="vcldb.dcp"/> + <DCCReference Include="IOCore.dcp"/> + <DCCReference Include="IOUIB.dcp"/> + <DCCReference Include="..\InstantUIBReg.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> + <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>Package</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Source> + <Source Name="MainSource">DclIOUIB.dpk</Source> + </Source> + <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="CompanyName">www.instantobjects.org</VersionInfoKeys> + <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"/> + <VersionInfoKeys Name="LegalCopyright"/> + <VersionInfoKeys Name="LegalTrademarks"/> + <VersionInfoKeys Name="OriginalFilename"/> + <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"/> + </VersionInfoKeys> + </Delphi.Personality> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + </Project> Property changes on: trunk/Source/Brokers/UIB/D2010/DclIOUIB.dproj ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/Source/Brokers/UIB/D2010/IOUIB.dpk =================================================================== --- trunk/Source/Brokers/UIB/D2010/IOUIB.dpk (rev 0) +++ trunk/Source/Brokers/UIB/D2010/IOUIB.dpk 2010-09-18 08:07:06 UTC (rev 926) @@ -0,0 +1,42 @@ +package IOUIB; + +{$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 UIB Run-Time Support (Delphi 2010)'} +{$LIBSUFFIX '_D14'} +{$RUNONLY} +{$IMPLICITBUILD ON} + +requires + vcl, + vcldb, + ibxpress, + IOCore, + IOIBFbCatalog, + UIBD14Win32R; + +contains + InstantUIBConnectionDefEdit in '..\InstantUIBConnectionDefEdit.pas' {InstantUIBConnectionDefEditForm}, + InstantUIB in '..\InstantUIB.pas'; + +end. Property changes on: trunk/Source/Brokers/UIB/D2010/IOUIB.dpk ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/Source/Brokers/UIB/D2010/IOUIB.dproj =================================================================== --- trunk/Source/Brokers/UIB/D2010/IOUIB.dproj (rev 0) +++ trunk/Source/Brokers/UIB/D2010/IOUIB.dproj 2010-09-18 08:07:06 UTC (rev 926) @@ -0,0 +1,121 @@ + <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{09490061-D1E0-4A09-ADC5-4D5E3621E954}</ProjectGuid> + <MainSource>IOUIB.dpk</MainSource> + <Config Condition="'$(Config)'==''">Debug</Config> + <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> + <ProjectVersion>12.0</ProjectVersion> + </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>..\..\..\..\..\..\..\..\Public\Documents\RAD Studio\7.0\Bpl\IOUIB_D14.bpl</DCC_DependencyCheckOutputName> + <RuntimeOnlyPackage>true</RuntimeOnlyPackage> + <DesignOnlyPackage>false</DesignOnlyPackage> + <DCC_ImageBase>00400000</DCC_ImageBase> + <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias> + <DCC_TypedAtParameter>true</DCC_TypedAtParameter> + <DCC_Description>InstantObjects UIB Run-Time Support (Delphi 2010)</DCC_Description> + <DCC_Platform>x86</DCC_Platform> + <DllSuffix>_D14</DllSuffix> + <DCC_N>false</DCC_N> + <DCC_K>false</DCC_K> + <GenDll>true</GenDll> + <DCC_S>false</DCC_S> + <GenPackage>true</GenPackage> + <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo> + <DCC_F>false</DCC_F> + <DCC_E>false</DCC_E> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_1)'!=''"> + <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> + <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> + <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> + <DCC_DebugInformation>false</DCC_DebugInformation> + </PropertyGroup> + <PropertyGroup Condition="'$(Cfg_2)'!=''"> + <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> + </PropertyGroup> + <ItemGroup> + <DelphiCompile Include="IOUIB.dpk"> + <MainSource>MainSource</MainSource> + </DelphiCompile> + <DCCReference Include="vcl.dcp"/> + <DCCReference Include="vcldb.dcp"/> + <DCCReference Include="ibxpress.dcp"/> + <DCCReference Include="IOCore.dcp"/> + <DCCReference Include="IOIBFbCatalog.dcp"/> + <DCCReference Include="UIBD14Win32R.dcp"/> + <DCCReference Include="..\InstantUIBConnectionDefEdit.pas"> + <Form>InstantUIBConnectionDefEditForm</Form> + </DCCReference> + <DCCReference Include="..\InstantUIB.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> + <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> + <ProjectExtensions> + <Borland.Personality>Delphi.Personality.12</Borland.Personality> + <Borland.ProjectType>Package</Borland.ProjectType> + <BorlandProject> + <Delphi.Personality> + <Source> + <Source Name="MainSource">IOUIB.dpk</Source> + </Source> + <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="CompanyName">www.instantobjects.org</VersionInfoKeys> + <VersionInfoKeys Name="FileDescription">InstantObjects</VersionInfoKeys> + <VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys> + <VersionInfoKeys Name="InternalName"/> + <VersionInfoKeys Name="LegalCopyright"/> + <VersionInfoKeys Name="LegalTrademarks"/> + <VersionInfoKeys Name="OriginalFilename"/> + <VersionInfoKeys Name="ProductName">InstantObjects</VersionInfoKeys> + <VersionInfoKeys Name="ProductVersion">2.1.0.0</VersionInfoKeys> + <VersionInfoKeys Name="Comments"/> + </VersionInfoKeys> + </Delphi.Personality> + </BorlandProject> + <ProjectFileVersion>12</ProjectFileVersion> + </ProjectExtensions> + </Project> Property changes on: trunk/Source/Brokers/UIB/D2010/IOUIB.dproj ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: trunk/Source/Brokers/UIB/D2010/IOUIB.res =================================================================== (Binary files differ) Property changes on: trunk/Source/Brokers/UIB/D2010/IOUIB.res ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/Source/Brokers/UIB/InstantUIB.pas =================================================================== --- trunk/Source/Brokers/UIB/InstantUIB.pas 2010-09-18 07:09:11 UTC (rev 925) +++ trunk/Source/Brokers/UIB/InstantUIB.pas 2010-09-18 08:07:06 UTC (rev 926) @@ -21,7 +21,7 @@ * The Initial Developer of the Original Code is: Andrea Petrelli * * Contributor(s): - * Carlo Barazzetta, Nando Dessena, Joao Morais + * Carlo Barazzetta, Nando Dessena, Joao Morais, Marcos E. Yanes * * ***** END LICENSE BLOCK ***** *) @@ -36,7 +36,7 @@ interface uses - Classes, Db, jvuib, jvuibdataset, jvuiblib, SysUtils, + Classes, Db, uib, uibdataset, uiblib, SysUtils, InstantPersistence, InstantBrokers, InstantClasses, InstantCommand, InstantMetadata, InstantTypes; @@ -57,7 +57,7 @@ FOptions: TInstantUIBOptions; FParams: string; protected - function CreateDataBase(AOwner: TComponent): TJvUIBDataBase; + function CreateDataBase(AOwner: TComponent): TUIBDataBase; procedure InitConnector(Connector: TInstantConnector); override; public class function ConnectionTypeName: string; override; @@ -75,13 +75,13 @@ TInstantUIBConnector = class(TInstantRelationalConnector) private - FDataBase: TJvUIBDataBase; - FTransaction: TJvUIBTransaction; + FDataBase: TUIBDataBase; + FTransaction: TUIBTransaction; FOptions: TInstantUIBOptions; FLoginPrompt: Boolean; - function GetDataBase: TJvUIBDataBase; - function GetTransaction: TJvUIBTransaction; - procedure SetDataBase(const Value: TJvUIBDataBase); + function GetDataBase: TUIBDataBase; + function GetTransaction: TUIBTransaction; + procedure SetDataBase(const Value: TUIBDataBase); procedure DataBaseLogin; protected procedure CheckDataBase; @@ -100,10 +100,10 @@ destructor Destroy; override; class function ConnectionDefClass: TInstantConnectionDefClass; override; procedure Notification(AComponent: TComponent; Operation: TOperation); override; - property Transaction: TJvUIBTransaction read GetTransaction; + property Transaction: TUIBTransaction read GetTransaction; function HasDataBase: Boolean; published - property DataBase: TJvUIBDataBase read GetDataBase write SetDataBase; + property DataBase: TUIBDataBase read GetDataBase write SetDataBase; property LoginPrompt: Boolean read FLoginPrompt write FLoginPrompt; property Options: TInstantUIBOptions read FOptions write FOptions default DefaultInstantUIBOptions; end; @@ -176,9 +176,9 @@ end; function TInstantUIBConnectionDef.CreateDataBase( - AOwner: TComponent): TJvUIBDataBase; + AOwner: TComponent): TUIBDataBase; begin - Result := TJvUIBDataBase.Create(AOwner); + Result := TUIBDataBase.Create(AOwner); try Result.CharacterSet := CharacterSet; Result.LibraryName := LibraryName; @@ -206,7 +206,7 @@ procedure TInstantUIBConnectionDef.InitConnector(Connector: TInstantConnector); var - DataBase: TJvUIBDataBase; + DataBase: TUIBDataBase; begin inherited; DataBase := CreateDatabase(Connector); @@ -245,19 +245,19 @@ inherited; end; -function TInstantUIBConnector.GetDataBase: TJvUIBDataBase; +function TInstantUIBConnector.GetDataBase: TUIBDataBase; begin if not (csDesigning in ComponentState) then CheckDataBase; Result := FDataBase; end; -function TInstantUIBConnector.GetTransaction: TJvUIBTransaction; +function TInstantUIBConnector.GetTransaction: TUIBTransaction; begin if not Assigned(FTransaction) then begin CheckDataBase; - FTransaction := TJvUIBTransaction.Create(nil); + FTransaction := TUIBTransaction.Create(nil); try FTransaction.DataBase := FDatabase; FTransaction.AutoStart := True; @@ -301,7 +301,7 @@ Transaction.StartTransaction; end; -procedure TInstantUIBConnector.SetDataBase(const Value: TJvUIBDataBase); +procedure TInstantUIBConnector.SetDataBase(const Value: TUIBDataBase); begin if Value <> FDataBase then begin @@ -320,7 +320,7 @@ if DataBase.Connected then raise EInstantError.Create(SDatabaseOpen); try - DataBase.CreateDatabase(4096); + DataBase.CreateDatabase(csUTF8, 8192); finally Disconnect; end; @@ -409,7 +409,7 @@ TargetParams: TSQLParams; begin //don't call inherited! - TargetParams := TJvUIBDataset(DataSet).Params; + TargetParams := TUIBDataset(DataSet).Params; for I := 0 to Pred(AParams.Count) do begin SourceParam := AParams[I]; @@ -420,7 +420,7 @@ else begin case SourceParam.DataType of - ftString: + ftString, ftWideString: TargetParams.ByNameAsString[SourceParam.Name] := SourceParam.AsString; ftInteger: TargetParams.ByNameAsInteger[SourceParam.Name] := SourceParam.AsInteger; @@ -435,7 +435,7 @@ ftBlob, ftMemo: begin BlobContent := SourceParam.AsString; - TJvUIBDataset(DataSet).ParamsSetBlob(SourceParam.Name, BlobContent); + TUIBDataset(DataSet).ParamsSetBlob(SourceParam.Name, BlobContent); end; else raise Exception.Create('Parameter data type not supported: ' + @@ -456,7 +456,8 @@ 'TIMESTAMP', 'BLOB', 'DATE', - 'TIME'); + 'TIME', + 'INTEGER'); function TInstantUIBBroker.DataTypeToColumnType( DataType: TInstantDataType; Size: Integer): string; @@ -469,9 +470,9 @@ function TInstantUIBBroker.CreateDataSet(const AStatement: string; AParams: TParams): TDataSet; var - Query: TJvUIBDataSet; + Query: TUIBDataset; begin - Query := TJvUIBDataSet.Create(nil); + Query := TUIBDataset.Create(nil); try Query.Database := Connector.DataBase; Query.FetchBlobs := True; @@ -503,9 +504,9 @@ function TInstantUIBBroker.Execute(const AStatement: string; AParams: TParams): Integer; var - DataSet: TJvUIBDataSet; + DataSet: TUIBDataset; begin - DataSet := AcquireDataSet(AStatement, AParams) as TJvUIBDataSet; + DataSet := AcquireDataSet(AStatement, AParams) as TUIBDataset; try DataSet.Execute; Result := DataSet.RowsAffected; Modified: trunk/Source/Brokers/UIB/InstantUIBConnectionDefEdit.dfm =================================================================== --- trunk/Source/Brokers/UIB/InstantUIBConnectionDefEdit.dfm 2010-09-18 07:09:11 UTC (rev 925) +++ trunk/Source/Brokers/UIB/InstantUIBConnectionDefEdit.dfm 2010-09-18 08:07:06 UTC (rev 926) @@ -134,7 +134,6 @@ Width = 113 Height = 21 Style = csDropDownList - ItemHeight = 13 Sorted = True TabOrder = 10 end @@ -159,7 +158,6 @@ Width = 113 Height = 21 Style = csDropDownList - ItemHeight = 13 TabOrder = 11 end object IdSizeEdit: TEdit @@ -207,7 +205,6 @@ Width = 113 Height = 21 Style = csDropDownList - ItemHeight = 13 TabOrder = 7 OnChange = CharacterSetComboBoxChange end @@ -216,7 +213,6 @@ Top = 256 Width = 113 Height = 21 - ItemHeight = 13 TabOrder = 8 OnChange = SQLRoleEditChange Items.Strings = ( Modified: trunk/Source/Brokers/UIB/InstantUIBConnectionDefEdit.pas =================================================================== --- trunk/Source/Brokers/UIB/InstantUIBConnectionDefEdit.pas 2010-09-18 07:09:11 UTC (rev 925) +++ trunk/Source/Brokers/UIB/InstantUIBConnectionDefEdit.pas 2010-09-18 08:07:06 UTC (rev 926) @@ -21,7 +21,7 @@ * The Initial Developer of the Original Code is: Andrea Petrelli * * Contributor(s): - * Nando Dessena, Joao Morais + * Nando Dessena, Joao Morais, Marcos E. Yanes * * ***** END LICENSE BLOCK ***** *) @@ -90,7 +90,7 @@ {$R *.DFM} uses - InstantPersistence, InstantClasses, InstantConsts, jvuiblib; + InstantPersistence, InstantClasses, InstantConsts, uiblib; { TInstantUIBConnectionDefEditForm } @@ -100,7 +100,7 @@ I: TCharacterSet; begin for I := low(TCharacterSet) to high(TCharacterSet) do - AItems.Add(CharacterSetStr[I]); + AItems.Add(string(CharacterSetStr[I])); end; procedure TInstantUIBConnectionDefEditForm.ConnectionStringButtonClick( |