instantobjects-cvscommit — Generates a message for every commit made on CVS

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO/D5 DclIOZeosDBO_D5.dpk,1.1,1.2 IOZeosDBO_D5.dpk,1.1,1.2

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9978/Brokers/ZeosDBO/D5

Modified Files:
	DclIOZeosDBO_D5.dpk IOZeosDBO_D5.dpk 
Log Message:
D7 support
Zeos 6.5.1 (unstable) support
Broker improvements

Index: IOZeosDBO_D5.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D5/IOZeosDBO_D5.dpk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IOZeosDBO_D5.dpk	2 Oct 2005 01:53:01 -0000	1.1
--- IOZeosDBO_D5.dpk	5 Oct 2005 03:22:22 -0000	1.2
***************
*** 1,6 ****
  package IOZeosDBO_D5;
  
! {$I '..\..\..\InstantVersion.inc'}
! 
  {$ALIGN ON}
  {$ASSERTIONS ON}
--- 1,5 ----
  package IOZeosDBO_D5;
  
! {$R *.RES}
  {$ALIGN ON}
  {$ASSERTIONS ON}
***************
*** 21,25 ****
  {$TYPEDADDRESS ON}
  {$VARSTRINGCHECKS ON}
! {$WRITEABLECONST ON}
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
--- 20,24 ----
  {$TYPEDADDRESS ON}
  {$VARSTRINGCHECKS ON}
! {$WRITEABLECONST OFF}
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
***************
*** 30,43 ****
  requires
    IOCore,
!   IOIbFbCatalog_D5,
!   IOMSSQLCatalog_D5,
!   ZCore,
!   ZComponent,
!   ZParseSql,
!   ZParse,
!   ZDbc,
!   ZPlain;
  
  contains
    InstantZeosDBOConnectionDefEdit in '..\InstantZeosDBOConnectionDefEdit.pas' {InstantZeosDBOConnectionDefEditForm},
    InstantZeosDBO in '..\InstantZeosDBO.pas';
--- 29,37 ----
  requires
    IOCore,
!   ZComponent;
  
  contains
+   InstantIBFbCatalog in '..\..\..\Catalogs\IBFb\InstantIBFbCatalog.pas',
+   InstantMSSqlCatalog in '..\..\..\Catalogs\MSSql\InstantMSSqlCatalog.pas',
    InstantZeosDBOConnectionDefEdit in '..\InstantZeosDBOConnectionDefEdit.pas' {InstantZeosDBOConnectionDefEditForm},
    InstantZeosDBO in '..\InstantZeosDBO.pas';

Index: DclIOZeosDBO_D5.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D5/DclIOZeosDBO_D5.dpk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DclIOZeosDBO_D5.dpk	2 Oct 2005 01:53:01 -0000	1.1
--- DclIOZeosDBO_D5.dpk	5 Oct 2005 03:22:22 -0000	1.2
***************
*** 22,26 ****
  {$TYPEDADDRESS ON}
  {$VARSTRINGCHECKS ON}
! {$WRITEABLECONST ON}
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
--- 22,26 ----
  {$TYPEDADDRESS ON}
  {$VARSTRINGCHECKS ON}
! {$WRITEABLECONST OFF}
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
***************
*** 30,34 ****
  
  requires
-   IOCore,
    IOZeosDBO_D5;
  
--- 30,33 ----
***************
*** 37,38 ****
--- 36,38 ----
  
  end.
+ 

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO/D7 DclIOZeosDBO.dpk,NONE,1.1 IOZeosDBO.dpk,NONE,1.1

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D7
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9532/Brokers/ZeosDBO/D7

Added Files:
	DclIOZeosDBO.dpk IOZeosDBO.dpk 
Log Message:
D7 packages for ZeosDBO broker

--- NEW FILE: DclIOZeosDBO.dpk ---
package DclIOZeosDBO;

{$I '..\..\..\InstantVersion.inc'}

{$R '..\InstantZeosDBO.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 ZeosDBO Design-Time Support (Delphi 7)'}
{$LIBSUFFIX '_D7'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}

requires
  IOZeosDBO_D7;

contains
  InstantZeosDBOReg in '..\InstantZeosDBOReg.pas';

end.


--- NEW FILE: IOZeosDBO.dpk ---
package IOZeosDBO;

{$I '..\..\..\InstantVersion.inc'}

{$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 ZeosDBO Run-Time Support (Delphi 7)'}
{$LIBSUFFIX '_D7'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

requires
  IOCore,
  ZComponent;

contains
  InstantIBFbCatalog in '..\..\..\Catalogs\IBFb\InstantIBFbCatalog.pas',
  InstantMSSqlCatalog in '..\..\..\Catalogs\MSSql\InstantMSSqlCatalog.pas',
  InstantZeosDBOConnectionDefEdit in '..\InstantZeosDBOConnectionDefEdit.pas' {InstantZeosDBOConnectionDefEditForm},
  InstantZeosDBO in '..\InstantZeosDBO.pas';

end.

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO/D7 - New directory

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D7
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9357/D7

Log Message:
Directory /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D7 added to the repository

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO - New directory

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8620/ZeosDBO

Log Message:
Directory /cvsroot/instantobjects/Source/Brokers/ZeosDBO added to the repository

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO/D5 - New directory

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8669/D5

Log Message:
Directory /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D5 added to the repository

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO/D5 DclIOZeosDBO_D5.dpk,NONE,1.1 IOZeosDBO_D5.dpk,NONE,1.1

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO/D5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8958/Brokers/ZeosDBO/D5

Added Files:
	DclIOZeosDBO_D5.dpk IOZeosDBO_D5.dpk 
Log Message:
Zeos Database Objects support

--- NEW FILE: IOZeosDBO_D5.dpk ---
package IOZeosDBO_D5;

{$I '..\..\..\InstantVersion.inc'}

{$ALIGN ON}
{$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 ON}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects ZeosDBO Run-Time Support (Delphi 5)'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

requires
  IOCore,
  IOIbFbCatalog_D5,
  IOMSSQLCatalog_D5,
  ZCore,
  ZComponent,
  ZParseSql,
  ZParse,
  ZDbc,
  ZPlain;

contains
  InstantZeosDBOConnectionDefEdit in '..\InstantZeosDBOConnectionDefEdit.pas' {InstantZeosDBOConnectionDefEditForm},
  InstantZeosDBO in '..\InstantZeosDBO.pas';

end.


--- NEW FILE: DclIOZeosDBO_D5.dpk ---
package DclIOZeosDBO_D5;

{$I '..\..\..\InstantVersion.inc'}

{$R '..\InstantZeosDBO.dcr'}
{$ALIGN ON}
{$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 ON}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects ZeosDBO Design-Time Support (Delphi 5)'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}

requires
  IOCore,
  IOZeosDBO_D5;

contains
  InstantZeosDBOReg in '..\InstantZeosDBOReg.pas';

end.

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO InstantZeosDBO.dcr,NONE,1.1 InstantZeosDBO.pas,NONE,1.1 InstantZeosDBOConnectionDefEdit.dfm,NONE,1.1 InstantZeosDBOConnectionDefEdit.pas,NONE,1.1 InstantZeosDBOReg.pas,NONE,1.1

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8958/Brokers/ZeosDBO

Added Files:
	InstantZeosDBO.dcr InstantZeosDBO.pas 
	InstantZeosDBOConnectionDefEdit.dfm 
	InstantZeosDBOConnectionDefEdit.pas InstantZeosDBOReg.pas 
Log Message:
Zeos Database Objects support

--- NEW FILE: InstantZeosDBO.dcr ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: InstantZeosDBOConnectionDefEdit.dfm ---
object InstantZeosDBOConnectionDefEditForm: TInstantZeosDBOConnectionDefEditForm
  Left = 214
  Top = 165
  BorderStyle = bsDialog
  Caption = 'ZeosDBO Connection'
  ClientHeight = 343
  ClientWidth = 372
  Color = clBtnFace
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
  Font.Height = -11
  Font.Name = 'MS Sans Serif'
  Font.Style = []
  OldCreateOrder = False
  Position = poScreenCenter
  OnCreate = FormCreate
  PixelsPerInch = 96
  TextHeight = 13
  object BottomBevel: TBevel
    Left = 0
    Top = 306
    Width = 372
    Height = 2
    Align = alBottom
    Shape = bsBottomLine
  end
  object ClientPanel: TPanel
    Left = 0
    Top = 0
    Width = 372
    Height = 306
    Align = alClient
    BevelOuter = bvNone
    TabOrder = 0
    object HostNameLabel: TLabel
      Left = 16
      Top = 16
      Width = 53
      Height = 13
      Caption = '&Host Name'
      FocusControl = HostNameEdit
    end
    object PortLabel: TLabel
      Left = 176
      Top = 16
      Width = 19
      Height = 13
      Caption = '&Port'
      FocusControl = PortEdit
    end
    object ProtocolLabel: TLabel
      Left = 240
      Top = 16
      Width = 42
      Height = 13
      Caption = '&Protocol:'
      FocusControl = ProtocolComboBox
    end
    object DatabaseLabel: TLabel
      Left = 16
      Top = 56
      Width = 46
      Height = 13
      Caption = '&Database'
      FocusControl = DatabaseEdit
    end
    object UserNameLabel: TLabel
      Left = 16
      Top = 96
      Width = 51
      Height = 13
      Caption = '&User name'
      FocusControl = UserNameEdit
    end
    object PasswordLabel: TLabel
      Left = 168
      Top = 96
      Width = 46
      Height = 13
      Caption = '&Password'
      FocusControl = PasswordEdit
    end
    object PropertiesLabel: TLabel
      Left = 16
      Top = 144
      Width = 50
      Height = 13
      Caption = 'Pr&operties:'
      FocusControl = PropertiesEditor
    end
    object StreamFormatLabel: TLabel
      Left = 216
      Top = 144
      Width = 53
      Height = 13
      Caption = 'Blob &format'
      FocusControl = StreamFormatComboBox
    end
    object IdDataTypeLabel: TLabel
      Left = 216
      Top = 184
      Width = 62
      Height = 13
      Caption = 'Id Data Type'
      FocusControl = IdDataTypeComboBox
    end
    object IdSizeLabel: TLabel
      Left = 216
      Top = 224
      Width = 32
      Height = 13
      Caption = 'Id Size'
      FocusControl = IdSizeEdit
    end
    object HostNameEdit: TEdit
      Left = 16
      Top = 32
      Width = 153
      Height = 21
      TabOrder = 0
    end
    object PortEdit: TEdit
      Left = 176
      Top = 32
      Width = 57
      Height = 21
      TabOrder = 1
    end
    object ProtocolComboBox: TComboBox
      Left = 240
      Top = 32
      Width = 113
      Height = 21
      Style = csDropDownList
      ItemHeight = 13
      Sorted = True
      TabOrder = 2
    end
    object DatabaseEdit: TEdit
      Left = 16
      Top = 72
      Width = 305
      Height = 21
      TabOrder = 3
    end
    object DatabaseButton: TButton
      Left = 330
      Top = 72
      Width = 21
      Height = 21
      Caption = '...'
      TabOrder = 4
    end
    object UserNameEdit: TEdit
      Left = 16
      Top = 112
      Width = 145
      Height = 21
      TabOrder = 5
    end
    object PasswordEdit: TEdit
      Left = 168
      Top = 112
      Width = 89
      Height = 21
      PasswordChar = '*'
      TabOrder = 6
    end
    object LoginPromptCheckBox: TCheckBox
      Left = 272
      Top = 112
      Width = 81
      Height = 17
      Caption = '&Login Prompt'
      TabOrder = 7
    end
    object PropertiesEditor: TMemo
      Left = 16
      Top = 160
      Width = 185
      Height = 129
      TabOrder = 8
    end
    object StreamFormatComboBox: TComboBox
      Left = 216
      Top = 160
      Width = 137
      Height = 21
      Style = csDropDownList
      ItemHeight = 13
      Sorted = True
      TabOrder = 9
    end
    object IdDataTypeComboBox: TComboBox
      Left = 216
      Top = 200
      Width = 137
      Height = 21
      Style = csDropDownList
      ItemHeight = 13
      TabOrder = 10
    end
    object IdSizeEdit: TEdit
      Left = 216
      Top = 240
      Width = 65
      Height = 21
      TabOrder = 11
    end
    object UseDelimitedIdentsCheckBox: TCheckBox
      Left = 216
      Top = 272
      Width = 137
      Height = 17
      Caption = '&Use delimited identifiers'
      TabOrder = 12
    end
  end
  object BottomPanel: TPanel
    Left = 0
    Top = 308
    Width = 372
    Height = 35
    Align = alBottom
    BevelOuter = bvNone
    TabOrder = 1
    object OkButton: TButton
      Left = 209
      Top = 6
      Width = 75
      Height = 25
      Caption = 'OK'
      Default = True
      ModalResult = 1
      TabOrder = 0
    end
    object CancelButton: TButton
      Left = 289
      Top = 6
      Width = 75
      Height = 25
      Cancel = True
      Caption = 'Cancel'
      ModalResult = 2
      TabOrder = 1
    end
  end
end

--- NEW FILE: InstantZeosDBO.pas ---
(*
 *   InstantObjects
 *   Zeos Database Objects 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: Joao Morais
 *
 * The Initial Developer of the Original Code is: Joao Morais
 *
 * Portions created by the Initial Developer are Copyright (C) 2005
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
 *
 * ***** END LICENSE BLOCK ***** *)

unit InstantZeosDBO;

interface

uses
  Classes, Db, InstantPersistence, InstantCommand, ZConnection;

type
  TInstantZeosDBOConnectionDef = class(TInstantRelationalConnectionDef)
  private
    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 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;

  TInstantZeosDBOConnector = class(TInstantRelationalConnector)
  private
    FConnection: TZConnection;
    FLoginPrompt: Boolean;
    FOnLogin: TLoginEvent;
    FUseDelimitedIdents: Boolean;
    procedure DoAfterConnectionChange;
    procedure DoBeforeConnectionChange;
    procedure SetConnection(Value: TZConnection);
    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;
    function GetConnected: Boolean; override;
    procedure InternalBuildDatabase(Scheme: TInstantScheme); override;
    procedure InternalCommitTransaction; override;
    procedure InternalConnect; 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;
  published
    property Connection: TZConnection read FConnection write SetConnection;
    property LoginPrompt: Boolean read FLoginPrompt write SetLoginPrompt default False;
    property OnLogin: TLoginEvent read FOnLogin write FOnLogin;
    property UseDelimitedIdents: Boolean read FUseDelimitedIdents write SetUseDelimitedIdents default False;
  end;

  TInstantZeosDBOBroker = class(TInstantSQLBroker)
  private
    function GetConnector: TInstantZeosDBOConnector;
  protected
    procedure AssignDataSetParams(DataSet: TDataSet; AParams: TParams); override;
    procedure AssignParam(SourceParam, TargetParam: TParam); virtual;
    function InternalDataTypeToColumnType(DataType: TInstantDataType): string; virtual; abstract;
    function CreateResolver(Map: TInstantAttributeMap): TInstantSQLResolver; override;
    function GetDatabaseName: string; override;
    function GetSQLQuote: Char; override;
    function InternalCreateQuery: TInstantQuery; override;
  public
    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;
    property Connector: TInstantZeosDBOConnector read GetConnector;
  end;

  TInstantZeosDBOResolver = class(TInstantSQLResolver)
  protected
    function ReadBooleanField(DataSet: TDataSet; const FieldName: string): Boolean; override;
  end;

  TInstantZeosDBOTranslator = class(TInstantRelationalTranslator)
  protected
    function TranslateConstant(Constant: TInstantIQLConstant; Writer: TInstantIQLWriter): Boolean; override;
  end;

  TInstantZeosDBOQuery = class(TInstantSQLQuery)
  protected
    class function TranslatorClass: TInstantRelationalTranslatorClass; override;
  end;

  TInstantZeosDBOSybaseBroker = class(TInstantZeosDBOBroker)
  protected
    function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
    function GetDBMSName: string; override;
  end;

  TInstantZeosDBOMSSQLBroker = class(TInstantZeosDBOBroker)
  protected
    function CreateCatalog(const AScheme: TInstantScheme): TInstantCatalog; override;
    procedure AssignParam(SourceParam, TargetParam: TParam); override;
    function CreateResolver(Map: TInstantAttributeMap): TInstantSQLResolver; override;
    function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
    function GetDBMSName: string; override;
    function InternalCreateQuery: TInstantQuery; override;
  end;

  TInstantZeosDBOMSSQLResolver = class(TInstantSQLResolver)
  end;

  TInstantZeosDBOMSSQLQuery = class(TInstantSQLQuery)
  end;

  TInstantZeosDBOIbFbBroker = class(TInstantZeosDBOBroker)
  protected
    function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
    function CreateCatalog(const AScheme: TInstantScheme): TInstantCatalog; override;
  end;

  TInstantZeosDBOInterbaseBroker = class(TInstantZeosDBOIbFbBroker)
  protected
    function GetDBMSName: string; override;
  end;

  TInstantZeosDBOFirebirdBroker = class(TInstantZeosDBOIbFbBroker)
  protected
    function GetDBMSName: string; override;
  end;

  TInstantZeosDBOPGSQLBroker = class(TInstantZeosDBOBroker)
  protected
    function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
    function GetDBMSName: string; override;
  end;

  TInstantZeosDBOMySQLBroker = class(TInstantZeosDBOBroker)
  protected
    function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
    function GetDBMSName: string; override;
  end;

  procedure AssignZeosDBOProtocols(Strings: TStrings);

implementation

uses
  SysUtils, Controls, InstantConsts, InstantClasses, InstantDBBuild,
  InstantIbFbCatalog, InstantMSSQLCatalog, InstantZeosDBOConnectionDefEdit,
  InstantUtils, ZClasses, ZCompatibility, ZDbcIntfs, ZDataset;

{ Global routines }

procedure AssignZeosDBOProtocols(Strings: TStrings);
var
  i, j: Integer;
  Drivers: IZCollection;
  Protocols: TStringDynArray;
begin
  Strings.Clear;
  Drivers := DriverManager.GetDrivers;
  Protocols := nil;
  for i := 0 to Pred(Drivers.Count) do
  begin
    Protocols := (Drivers[i] as IZDriver).GetSupportedProtocols;
    for j := Low(Protocols) to High(Protocols) do
      Strings.Add(Protocols[j]);
  end;
end;

{ TInstantZeosDBOConnectionDef }

class function TInstantZeosDBOConnectionDef.ConnectionTypeName: string;
begin
  Result := 'ZeosDBO';
end;

class function TInstantZeosDBOConnectionDef.ConnectorClass: TInstantConnectorClass;
begin
  Result := TInstantZeosDBOConnector;
end;

function TInstantZeosDBOConnectionDef.Edit: Boolean;
begin
  with TInstantZeosDBOConnectionDefEditForm.Create(nil) do
  try
    LoadData(Self);
    Result := ShowModal = mrOk;
    if Result then
      SaveData(Self);
  finally
    Free;
  end;
end;

procedure TInstantZeosDBOConnectionDef.InitConnector(Connector: TInstantConnector);
var
  Connection: TZConnection;
begin
  inherited;
  Connection := TZConnection.Create(Connector);
  try
    (Connector as TInstantZeosDBOConnector).Connection := Connection;
    (Connector as TInstantZeosDBOConnector).LoginPrompt := LoginPrompt;
    (Connector as TInstantZeosDBOConnector).UseDelimitedIdents := UseDelimitedIdents;
    Connection.AutoCommit := False;
    Connection.Database := Database;
    Connection.HostName := HostName;
    Connection.Port := Port;
    Connection.Properties.Text := Properties;
    Connection.Protocol := Protocol;
    Connection.TransactIsolationLevel := tiReadCommitted;
    Connection.User := UserName;
    Connection.Password := Password;
  except
    Connection.Free;
    raise;
  end;
end;

{ TInstantZeosDBOConnector }

procedure TInstantZeosDBOConnector.AfterConnectionChange;
begin
  { TODO : It is a good idea changes Connection properties after assignment? }
  if HasConnection then
  begin
    FConnection.Connected := False;
    FConnection.AutoCommit := False;
    FConnection.TransactIsolationLevel := tiReadCommitted;
  end;
end;

procedure TInstantZeosDBOConnector.AssignLoginOptions;
begin
  if HasConnection then
  begin
    Connection.LoginPrompt := FLoginPrompt;
    if Assigned(FOnLogin) and not Assigned(Connection.OnLogin) then
      Connection.OnLogin := FOnLogin;
  end;
end;

procedure TInstantZeosDBOConnector.BeforeConnectionChange;
begin
end;

procedure TInstantZeosDBOConnector.CheckConnection;
begin
  if not HasConnection then
    raise EInstantError.Create(SUnassignedConnection);
end;

class function TInstantZeosDBOConnector.ConnectionDefClass: TInstantConnectionDefClass;
begin
  Result := TInstantZeosDBOConnectionDef;
end;

constructor TInstantZeosDBOConnector.Create(AOwner: TComponent);
begin
  inherited Create(AOwner);
  FLoginPrompt := False;
  FUseDelimitedIdents := False;
end;

function TInstantZeosDBOConnector.CreateBroker: TInstantBroker;
begin
  CheckConnection;
  if SameText(Connection.Protocol, 'sybase') then
    Result := TInstantZeosDBOSybaseBroker.Create(Self)
  else if SameText(Connection.Protocol, 'mssql') then
    Result := TInstantZeosDBOMSSQLBroker.Create(Self)
  else if SameText(Connection.Protocol, 'interbase-5') then
    Result := TInstantZeosDBOInterbaseBroker.Create(Self)
  else if SameText(Connection.Protocol, 'interbase-6') then
    Result := TInstantZeosDBOInterbaseBroker.Create(Self)
  else if SameText(Connection.Protocol, 'firebird-1.0') then
    Result := TInstantZeosDBOFirebirdBroker.Create(Self)
  else if SameText(Connection.Protocol, 'firebird-1.5') then
    Result := TInstantZeosDBOFirebirdBroker.Create(Self)
  else if SameText(Connection.Protocol, 'postgresql') then
    Result := TInstantZeosDBOPGSQLBroker.Create(Self)
  else if SameText(Connection.Protocol, 'postgresql-6.5') then
    Result := TInstantZeosDBOPGSQLBroker.Create(Self)
  else if SameText(Connection.Protocol, 'postgresql-7.2') then
    Result := TInstantZeosDBOPGSQLBroker.Create(Self)
  else if SameText(Connection.Protocol, 'mysql') then
    Result := TInstantZeosDBOMySQLBroker.Create(Self)
  else if SameText(Connection.Protocol, 'mysql-3.20') then
    Result := TInstantZeosDBOMySQLBroker.Create(Self)
  else if SameText(Connection.Protocol, 'mysql-3.23') then
    Result := TInstantZeosDBOMySQLBroker.Create(Self)
  else if SameText(Connection.Protocol, 'mysql-4.0') then
    Result := TInstantZeosDBOMySQLBroker.Create(Self)
  else
    raise EInstantError.CreateFmt('ZeosDBO protocol "%s" not supported yet',
     [Connection.Protocol]);
end;

procedure TInstantZeosDBOConnector.DoAfterConnectionChange;
begin
  if HasConnection then
    FConnection.FreeNotification(Self);
  AfterConnectionChange;
end;

procedure TInstantZeosDBOConnector.DoBeforeConnectionChange;
begin
  try
    BeforeConnectionChange;
  finally
    if HasConnection then
      FConnection.RemoveFreeNotification(Self);
  end;
end;

function TInstantZeosDBOConnector.GetConnected: Boolean;
begin
  if HasConnection then
    Result := Connection.Connected
  else
    Result := inherited GetConnected;
end;

function TInstantZeosDBOConnector.HasConnection: Boolean;
begin
  Result := Assigned(FConnection);
end;

procedure TInstantZeosDBOConnector.InternalBuildDatabase(Scheme: TInstantScheme);
begin
  try
    inherited;
    CommitTransaction;
  except
    RollbackTransaction;
    raise;
  end;
end;

procedure TInstantZeosDBOConnector.InternalCommitTransaction;
begin
  if HasConnection and not Connection.AutoCommit then
    Connection.Commit;
end;

procedure TInstantZeosDBOConnector.InternalConnect;
begin
  CheckConnection;
  AssignLoginOptions;
  Connection.Connect;
end;

procedure TInstantZeosDBOConnector.InternalDisconnect;
begin
  if HasConnection then
    Connection.Disconnect;
end;

procedure TInstantZeosDBOConnector.InternalRollbackTransaction;
begin
  if HasConnection and not Connection.AutoCommit then
    Connection.Rollback;
end;

procedure TInstantZeosDBOConnector.InternalStartTransaction;
begin
  // ZeosDBO starts new transaction when necessary
end;

procedure TInstantZeosDBOConnector.Notification(AComponent: TComponent;
  Operation: TOperation);
begin
  inherited;
  if (AComponent = FConnection) and (Operation = opRemove) then
  begin
    Disconnect;
    FConnection := nil;
  end;
end;

function TInstantZeosDBOConnector.ParamByName(const AName: string): string;
begin
  { TODO : Check }
  Result := Connection.Properties.Values[AName];
end;

procedure TInstantZeosDBOConnector.SetConnection(Value: TZConnection);
begin
  if Value <> FConnection then
  begin
    Disconnect;
    DoBeforeConnectionChange;
    FConnection := Value;
    DoAfterConnectionChange;
  end;
end;

procedure TInstantZeosDBOConnector.SetLoginPrompt(const Value: Boolean);
begin
  FLoginPrompt := Value;
end;

procedure TInstantZeosDBOConnector.SetUseDelimitedIdents(const Value: Boolean);
begin
  FUseDelimitedIdents := Value;
end;

{ TInstantZeosDBOBroker }

procedure TInstantZeosDBOBroker.AssignDataSetParams(DataSet: TDataSet; AParams: TParams);
var
  i: Integer;
  TargetParams : TParams;
  SourceParam, TargetParam: TParam;
begin
  //don't call inherited
  TargetParams := (DataSet as TZReadOnlyQuery).Params;
  for i := 0 to Pred(AParams.Count) do
  begin
    SourceParam := AParams[i];
    TargetParam := TargetParams.FindParam(SourceParam.Name);
    if Assigned(TargetParam) then
      AssignParam(SourceParam, TargetParam);
  end;
end;

procedure TInstantZeosDBOBroker.AssignParam(SourceParam, TargetParam: TParam);
begin
  case SourceParam.DataType of
    ftBoolean:
      TargetParam.AsInteger := Integer(SourceParam.AsBoolean);
    (*
    ftDateTime:
    begin
      TargetParam.DataType := ftTimeStamp;
      TargetParam.Value := SourceParam.AsDateTime;
    end;
    ftCurrency:
    begin
      TargetParam.DataType := ftBCD;
      TargetParam.Value := SourceParam.AsCurrency;
    end;
    *)
    else
      TargetParam.Assign(SourceParam);
  end;
end;

function TInstantZeosDBOBroker.CreateDataSet(const AStatement: string;
  AParams: TParams): TDataSet;
var
  Query: TZReadOnlyQuery;
begin
  Query := TZReadOnlyQuery.Create(nil);
  Query.Connection := Connector.Connection;
  Query.SQL.Text := AStatement;
  if Assigned(AParams) then
    AssignDatasetParams(Query, AParams);
  Result := Query;
end;

function TInstantZeosDBOBroker.CreateDBBuildCommand(
  const CommandType: TInstantDBBuildCommandType): TInstantDBBuildCommand;
begin
  if CommandType = ctAddTable then
    Result := TInstantDBBuildAddTableSQLCommand.Create(CommandType, Connector)
  else if CommandType = ctDropTable then
    Result := TInstantDBBuildDropTableSQLCommand.Create(CommandType, Connector)
  else if CommandType = ctAddField then
    Result := TInstantDBBuildAddFieldSQLCommand.Create(CommandType, Connector)
  else if CommandType = ctAlterField then
    Result := TInstantDBBuildAlterFieldSQLCommand.Create(CommandType, Connector)
  else if CommandType = ctDropField then
    Result := TInstantDBBuildDropFieldSQLCommand.Create(CommandType, Connector)
  else if CommandType = ctAddIndex then
    Result := TInstantDBBuildAddIndexSQLCommand.Create(CommandType, Connector)
  else if CommandType = ctAlterIndex then
    Result := TInstantDBBuildAlterIndexSQLCommand.Create(CommandType, Connector)
  else if CommandType = ctDropIndex then
    Result := TInstantDBBuildDropIndexSQLCommand.Create(CommandType, Connector)
  else
    Result := inherited CreateDBBuildCommand(CommandType);
end;

function TInstantZeosDBOBroker.CreateResolver(
  Map: TInstantAttributeMap): TInstantSQLResolver;
begin
  Result := TInstantZeosDBOResolver.Create(Self, Map);
end;

function TInstantZeosDBOBroker.DataTypeToColumnType(DataType: TInstantDataType;
  Size: Integer): string;
begin
  Result := InternalDataTypeToColumnType(DataType);
  if (DataType = dtString) and (Size > 0) then
    Result := Result + InstantEmbrace(IntToStr(Size), '()');
end;

function TInstantZeosDBOBroker.Execute(const AStatement: string;
  AParams: TParams): Integer;
var
  DataSet: TZReadOnlyQuery;
begin
  DataSet := AcquireDataSet(AStatement, AParams) as TZReadOnlyQuery;
  try
    DataSet.ExecSQL;
    Result := DataSet.RowsAffected;
  finally
    ReleaseDataSet(DataSet);
  end;
end;

function TInstantZeosDBOBroker.GetConnector: TInstantZeosDBOConnector;
begin
  Result := inherited Connector as TInstantZeosDBOConnector;
end;

function TInstantZeosDBOBroker.GetDatabaseName: string;
begin
  Result := Connector.Connection.Database;
end;

function TInstantZeosDBOBroker.GetSQLQuote: Char;
begin
  Result := '''';
end;

function TInstantZeosDBOBroker.InternalCreateQuery: TInstantQuery;
begin
  Result := TInstantZeosDBOQuery.Create(Connector);
end;

{ TInstantZeosDBOResolver }

function TInstantZeosDBOResolver.ReadBooleanField(DataSet: TDataSet;
  const FieldName: string): Boolean;
begin
  Result := Boolean(DataSet.FieldByName(FieldName).AsInteger);
end;

{ TInstantZeosDBOTranslator }

function TInstantZeosDBOTranslator.TranslateConstant(
  Constant: TInstantIQLConstant; Writer: TInstantIQLWriter): Boolean;
begin
  if SameText(Constant.Value, InstantTrueString) then
  begin
    Writer.WriteChar('1');
    Result := True;
  end else if SameText(Constant.Value, InstantFalseString) then
  begin
    Writer.WriteChar('0');
    Result := True;
  end else
    Result := inherited TranslateConstant(Constant, Writer);
end;

{ TInstantZeosDBOQuery }

class function TInstantZeosDBOQuery.TranslatorClass: TInstantRelationalTranslatorClass;
begin
  Result := TInstantZeosDBOTranslator;
end;

{ TInstantZeosDBOSybaseBroker }

function TInstantZeosDBOSybaseBroker.InternalDataTypeToColumnType(
  DataType: TInstantDataType): string;
(*
const
  //dtInteger, dtFloat, dtCurrency, dtBoolean, dtString, dtMemo, dtDateTime, dtBlob
  Types: array[TInstantDataType] of string = (
    '',
    '',
    '',
    '',
    '',
    '',
    '',
    '');
*)
begin
  //Result := Types[DataType];
  raise EInstantError.Create('Sybase protocol not implemented yet');
end;

function TInstantZeosDBOSybaseBroker.GetDBMSName: string;
begin
  Result := 'Sybase';
end;

{ TInstantZeosDBOMSSQLBroker }

procedure TInstantZeosDBOMSSQLBroker.AssignParam(SourceParam, TargetParam: TParam);
begin
  if SourceParam.DataType = ftBoolean then
    TargetParam.Assign(SourceParam)
  else
    inherited;
end;

function TInstantZeosDBOMSSQLBroker.InternalDataTypeToColumnType(
  DataType: TInstantDataType): string;
const
  Types: array[TInstantDataType] of string = (
    'INTEGER',
    'FLOAT',
    'MONEY',
    'BIT',
    'VARCHAR',
    'TEXT',
    'DATETIME',
    'IMAGE');
begin
  Result := Types[DataType];
end;

function TInstantZeosDBOMSSQLBroker.CreateCatalog(
  const AScheme: TInstantScheme): TInstantCatalog;
begin
  Result := TInstantMSSQLCatalog.Create(AScheme, Self);
end;

function TInstantZeosDBOMSSQLBroker.CreateResolver(
  Map: TInstantAttributeMap): TInstantSQLResolver;
begin
  Result := TInstantZeosDBOMSSQLResolver.Create(Self, Map);
end;

function TInstantZeosDBOMSSQLBroker.GetDBMSName: string;
begin
  Result := 'MS SQL Server';
end;

function TInstantZeosDBOMSSQLBroker.InternalCreateQuery: TInstantQuery;
begin
  Result := TInstantZeosDBOMSSQLQuery.Create(Connector);
end;

{ TInstantZeosDBOIbFbBrokerBroker }

function TInstantZeosDBOIbFbBroker.InternalDataTypeToColumnType(
  DataType: TInstantDataType): string;
const
  Types: array[TInstantDataType] of string = (
    'INTEGER',
    'DOUBLE PRECISION',
    'DECIMAL(14,4)',
    'SMALLINT',
    'VARCHAR',
    'BLOB SUB_TYPE 1',
    'TIMESTAMP',
    'BLOB');
begin
  Result := Types[DataType];
end;

function TInstantZeosDBOIbFbBroker.CreateCatalog(
  const AScheme: TInstantScheme): TInstantCatalog;
begin
  Result := TInstantIbFbCatalog.Create(AScheme, Self);
end;

{ TInstantZeosDBOInterBaseBroker }

function TInstantZeosDBOInterbaseBroker.GetDBMSName: string;
begin
  Result := 'InterBase';
end;

{ TInstantZeosDBOFirebirdUIBBroker }

function TInstantZeosDBOFirebirdBroker.GetDBMSName: string;
begin
  Result := 'Firebird';
end;

{ TInstantZeosDBOPGSQLBroker }

function TInstantZeosDBOPGSQLBroker.InternalDataTypeToColumnType(
  DataType: TInstantDataType): string;
(*
const
  //dtInteger, dtFloat, dtCurrency, dtBoolean, dtString, dtMemo, dtDateTime, dtBlob
  Types: array[TInstantDataType] of string = (
    '',
    '',
    '',
    '',
    '',
    '',
    '',
    '');
*)
begin
  //Result := Types[DataType];
  raise EInstantError.Create('PostgreeSQL protocol not implemented yet');
end;

function TInstantZeosDBOPGSQLBroker.GetDBMSName: string;
begin
  Result := 'PostgreSQL';
end;

{ TInstantZeosDBOMySQLBroker }

function TInstantZeosDBOMySQLBroker.InternalDataTypeToColumnType(
  DataType: TInstantDataType): string;
const
  Types: array[TInstantDataType] of string = (
    'INTEGER',
    'FLOAT',
    'DECIMAL(14,4)',
    'TINYINT(1)',
    'VARCHAR',
    'TEXT',
    'DATETIME',
    'BLOB');
begin
  Result := Types[DataType];
end;

function TInstantZeosDBOMySQLBroker.GetDBMSName: string;
begin
  Result := 'MySQL';
end;

initialization
  RegisterClass(TInstantZeosDBOConnectionDef);
  TInstantZeosDBOConnector.RegisterClass;

finalization
  TInstantZeosDBOConnector.UnregisterClass;

end.


--- NEW FILE: InstantZeosDBOReg.pas ---
(*
 *   InstantObjects
 *   Zeos Database Objects 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: Joao Morais
 *
 * The Initial Developer of the Original Code is: Joao Morais
 *
 * Portions created by the Initial Developer are Copyright (C) 2005
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
 *
 * ***** END LICENSE BLOCK ***** *)

unit InstantZeosDBOReg;

interface

procedure Register;

implementation

uses
  Classes, InstantZeosDBO;

procedure Register;
begin
  RegisterComponents('InstantObjects', [TInstantZeosDBOConnector]);
end;

end.


--- NEW FILE: InstantZeosDBOConnectionDefEdit.pas ---
(*
 *   InstantObjects
 *   Zeos Database Objects Connection Editor
 *)

(* ***** 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: Joao Morais
 *
 * The Initial Developer of the Original Code is: Joao Morais
 *
 * Portions created by the Initial Developer are Copyright (C) 2005
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
 *
 * ***** END LICENSE BLOCK ***** *)

unit InstantZeosDBOConnectionDefEdit;

interface

uses
  Forms, Dialogs, StdCtrls, Controls, ExtCtrls, SysUtils, Classes,
  ZConnection, InstantZeosDBO;

type
  TInstantZeosDBOConnectionDefEditForm = class(TForm)
    ClientPanel: TPanel;
    HostNameLabel: TLabel;
    PortLabel: TLabel;
    ProtocolLabel: TLabel;
    DatabaseLabel: TLabel;
    UserNameLabel: TLabel;
    PasswordLabel: TLabel;
    PropertiesLabel: TLabel;
    StreamFormatLabel: TLabel;
    IdDataTypeLabel: TLabel;
    IdSizeLabel: TLabel;
    HostNameEdit: TEdit;
    PortEdit: TEdit;
    ProtocolComboBox: TComboBox;
    DatabaseEdit: TEdit;
    DatabaseButton: TButton;
    UserNameEdit: TEdit;
    PasswordEdit: TEdit;
    LoginPromptCheckBox: TCheckBox;
    PropertiesEditor: TMemo;
    StreamFormatComboBox: TComboBox;
    IdDataTypeComboBox: TComboBox;
    IdSizeEdit: TEdit;
    UseDelimitedIdentsCheckBox: TCheckBox;
    BottomBevel: TBevel;
    BottomPanel: TPanel;
    OkButton: TButton;
    CancelButton: TButton;
    procedure FormCreate(Sender: TObject);
  private
    procedure UpdateControls;
  public
    procedure LoadData(ConnectionDef: TInstantZeosDBOConnectionDef);
    procedure SaveData(ConnectionDef: TInstantZeosDBOConnectionDef);
  end;

implementation

{$R *.dfm}

uses
  InstantPersistence, InstantClasses;

{ TInstantZeosDBOConnectionDefEditForm }

procedure TInstantZeosDBOConnectionDefEditForm.FormCreate(Sender: TObject);
begin
  AssignZeosDBOProtocols(ProtocolComboBox.Items);
  AssignInstantStreamFormat(StreamFormatComboBox.Items);
  AssignInstantDataTypeStrings(IdDataTypeComboBox.Items);
  UpdateControls;
end;

procedure TInstantZeosDBOConnectionDefEditForm.LoadData(
  ConnectionDef: TInstantZeosDBOConnectionDef);
begin
  HostNameEdit.Text := ConnectionDef.HostName;
  PortEdit.Text := InttoStr(ConnectionDef.Port);
  ProtocolComboBox.ItemIndex := ProtocolComboBox.Items.IndexOf(ConnectionDef.Protocol);
  DatabaseEdit.Text := ConnectionDef.Database;
  UserNameEdit.Text := ConnectionDef.UserName;
  PasswordEdit.Text := ConnectionDef.Password;
  LoginPromptCheckBox.Checked := ConnectionDef.LoginPrompt;
  PropertiesEditor.Lines.Text := ConnectionDef.Properties;
  StreamFormatComboBox.ItemIndex := Ord(ConnectionDef.BlobStreamFormat);
  IdDataTypeComboBox.ItemIndex := Ord(ConnectionDef.IdDataType);
  IdSizeEdit.Text := InttoStr(ConnectionDef.IdSize);
  UseDelimitedIdentsCheckBox.Checked := ConnectionDef.UseDelimitedIdents;
  UpdateControls;
end;

procedure TInstantZeosDBOConnectionDefEditForm.SaveData(
  ConnectionDef: TInstantZeosDBOConnectionDef);
begin
  ConnectionDef.HostName := HostNameEdit.Text;
  ConnectionDef.Port := StrtoInt(PortEdit.Text);
  ConnectionDef.Protocol := ProtocolComboBox.Text;
  ConnectionDef.Database := DatabaseEdit.Text;
  ConnectionDef.UserName := UserNameEdit.Text;
  ConnectionDef.Password := PasswordEdit.Text;
  ConnectionDef.LoginPrompt := LoginPromptCheckBox.Checked;
  ConnectionDef.Properties := PropertiesEditor.Lines.Text;
  ConnectionDef.BlobStreamFormat := TInstantStreamFormat(StreamFormatComboBox.ItemIndex);
  ConnectionDef.IdDataType := TInstantDataType(IdDataTypeComboBox.ItemIndex);
  ConnectionDef.IdSize := StrToInt(IdSizeEdit.Text);
  ConnectionDef.UseDelimitedIdents := UseDelimitedIdentsCheckBox.Checked;
end;

procedure TInstantZeosDBOConnectionDefEditForm.UpdateControls;
begin

end;

end.

[Instantobjects-cvscommit] Source/Core/D6 IOCore.dpk,1.9,1.10

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Core/D6
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2709/Core/D6

Modified Files:
	IOCore.dpk 
Log Message:
Fixed inclusion of resource file in D5, D6 and D2005; Core and Design packages.

Index: IOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/D6/IOCore.dpk,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IOCore.dpk	3 Sep 2005 08:03:13 -0000	1.9
--- IOCore.dpk	22 Sep 2005 23:18:21 -0000	1.10
***************
*** 1,5 ****
  package IOCore;
  
! {$I '..\..\InstantVersion.inc'}
  
  {$ALIGN 8}
--- 1,5 ----
  package IOCore;
  
! {$I '..\..\InstantPackageVersion.inc'}
  
  {$ALIGN 8}

[Instantobjects-cvscommit] Source/Design/D5 DclIOCore.dpk,1.5,1.6

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Design/D5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2709/Design/D5

Modified Files:
	DclIOCore.dpk 
Log Message:
Fixed inclusion of resource file in D5, D6 and D2005; Core and Design packages.

Index: DclIOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/D5/DclIOCore.dpk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DclIOCore.dpk	3 Sep 2005 08:03:13 -0000	1.5
--- DclIOCore.dpk	22 Sep 2005 23:18:21 -0000	1.6
***************
*** 1,5 ****
  package DclIOCore;
  
! {$I '..\..\..\InstantVersion.inc'}
  
  {$R '..\..\Core\InstantPresentation.dcr'}
--- 1,5 ----
  package DclIOCore;
  
! {$I '..\..\InstantPackageVersion.inc'}
  
  {$R '..\..\Core\InstantPresentation.dcr'}
***************
*** 7,10 ****
--- 7,12 ----
  {$R '..\..\Core\InstantPersistence.dcr'}
  {$R '..\..\Core\InstantConnectionManager.dcr'}
+ {$R '..\..\Core\InstantPump.dcr'}
+ {$R '..\..\Core\InstantDBEvolution.dcr'}
  {$ALIGN ON}
  {$ASSERTIONS ON}

[Instantobjects-cvscommit] Source/Design/D2005 DclIOCore.dpk,1.3,1.4

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Design/D2005
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2709/Design/D2005

Modified Files:
	DclIOCore.dpk 
Log Message:
Fixed inclusion of resource file in D5, D6 and D2005; Core and Design packages.

Index: DclIOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/D2005/DclIOCore.dpk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DclIOCore.dpk	3 Sep 2005 08:03:13 -0000	1.3
--- DclIOCore.dpk	22 Sep 2005 23:18:21 -0000	1.4
***************
*** 1,5 ****
  package DclIOCore;
  
! {$I '..\..\InstantVersion.inc'}
  
  {$R '..\..\Core\InstantPresentation.dcr'}
--- 1,5 ----
  package DclIOCore;
  
! {$I '..\..\InstantPackageVersion.inc'}
  
  {$R '..\..\Core\InstantPresentation.dcr'}

[Instantobjects-cvscommit] Source/Core/D5 IOCore.dpk,1.7,1.8

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Core/D5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2709/Core/D5

Modified Files:
	IOCore.dpk 
Log Message:
Fixed inclusion of resource file in D5, D6 and D2005; Core and Design packages.

Index: IOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/D5/IOCore.dpk,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IOCore.dpk	3 Sep 2005 08:03:12 -0000	1.7
--- IOCore.dpk	22 Sep 2005 23:18:21 -0000	1.8
***************
*** 1,8 ****
  package IOCore;
  
! {$I '..\..\..\InstantVersion.inc'}
  
- {$R '..\InstantPump.dcr'}
- {$R '..\InstantDBEvolution.dcr'}
  {$ALIGN ON}
  {$ASSERTIONS ON}
--- 1,6 ----
  package IOCore;
  
! {$I '..\..\InstantPackageVersion.inc'}
  
  {$ALIGN ON}
  {$ASSERTIONS ON}

[Instantobjects-cvscommit] Source/Design/D6 DclIOCore.dpk,1.6,1.7

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Design/D6
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2709/Design/D6

Modified Files:
	DclIOCore.dpk 
Log Message:
Fixed inclusion of resource file in D5, D6 and D2005; Core and Design packages.

Index: DclIOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/D6/DclIOCore.dpk,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DclIOCore.dpk	3 Sep 2005 08:03:13 -0000	1.6
--- DclIOCore.dpk	22 Sep 2005 23:18:21 -0000	1.7
***************
*** 1,5 ****
  package DclIOCore;
  
! {$I '..\..\InstantVersion.inc'}
  
  {$R '..\..\Core\InstantPresentation.dcr'}
--- 1,5 ----
  package DclIOCore;
  
! {$I '..\..\InstantPackageVersion.inc'}
  
  {$R '..\..\Core\InstantPresentation.dcr'}

[Instantobjects-cvscommit] Source/Core/D2005 IOCore.dpk,1.3,1.4

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Core/D2005
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2709/Core/D2005

Modified Files:
	IOCore.dpk 
Log Message:
Fixed inclusion of resource file in D5, D6 and D2005; Core and Design packages.

Index: IOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/D2005/IOCore.dpk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IOCore.dpk	3 Sep 2005 08:03:12 -0000	1.3
--- IOCore.dpk	22 Sep 2005 23:18:21 -0000	1.4
***************
*** 1,5 ****
  package IOCore;
  
! {$I '..\..\InstantVersion.inc'}
  
  {$ALIGN 8}
--- 1,5 ----
  package IOCore;
  
! {$I '..\..\InstantPackageVersion.inc'}
  
  {$ALIGN 8}

[Instantobjects-cvscommit] Source/Core InstantPersistence.pas,1.56,1.57

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26108/Core

Modified Files:
	InstantPersistence.pas 
Log Message:
Connection events don't work when database is not connected through TInstantConnector decendant, then they was removed.

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** InstantPersistence.pas	9 Sep 2005 23:16:47 -0000	1.56
--- InstantPersistence.pas	22 Sep 2005 02:57:07 -0000	1.57
***************
*** 1409,1417 ****
      FTransactedObjectList: TList;
      FUseTransactions: Boolean;
-     FAfterConnect: TNotifyEvent;
-     FAfterDisconnect: TNotifyEvent;
-     FBeforeConnect: TNotifyEvent;
      FBeforeBuildDatabase: TInstantSchemeEvent;
-     FBeforeDisconnect: TNotifyEvent;
      FBlobStreamFormat: TInstantStreamFormat;
      FOnGenerateId: TInstantGenerateIdEvent;
--- 1409,1413 ----
***************
*** 1421,1429 ****
      procedure ApplyTransactedObjectStates;
      procedure ClearTransactedObjects;
-     procedure DoAfterConnect;
-     procedure DoAfterDisconnect;
      procedure DoBeforeBuildDatabase(Scheme: TInstantScheme);
-     procedure DoBeforeConnect;
-     procedure DoBeforeDisconnect;
      function GetBroker: TInstantBroker;
      function GetClient(Index: Integer): TObject;
--- 1417,1421 ----
***************
*** 1499,1507 ****
      property IsDefault: Boolean read GetIsDefault write SetIsDefault default False;
      property UseTransactions: Boolean read FUseTransactions write FUseTransactions default True;
-     property AfterConnect: TNotifyEvent read FAfterConnect write FAfterConnect;
-     property AfterDisconnect: TNotifyEvent read FAfterDisconnect write FAfterDisconnect;
      property BeforeBuildDatabase: TInstantSchemeEvent read FBeforeBuildDatabase write FBeforeBuildDatabase;
-     property BeforeConnect: TNotifyEvent read FBeforeConnect write FBeforeConnect;
-     property BeforeDisconnect: TNotifyEvent read FBeforeDisconnect write FBeforeDisconnect;
      property BlobStreamFormat: TInstantStreamFormat read FBlobStreamFormat write FBlobStreamFormat default sfBinary;
      property OnGenerateId: TInstantGenerateIdEvent read FOnGenerateId write FOnGenerateId;
--- 1491,1495 ----
***************
*** 8958,8964 ****
  procedure TInstantConnector.Connect;
  begin
-   DoBeforeConnect;
    InternalConnect;
-   DoAfterConnect;
  end;
  
--- 8946,8950 ----
***************
*** 9003,9021 ****
  procedure TInstantConnector.Disconnect;
  begin
-   DoBeforeDisconnect;
    InternalDisconnect;
-   DoAfterDisconnect;
- end;
- 
- procedure TInstantConnector.DoAfterConnect;
- begin
-   if Assigned(FAfterConnect) then
-     FAfterConnect(Self);
- end;
- 
- procedure TInstantConnector.DoAfterDisconnect;
- begin
-   if Assigned(FAfterDisconnect) then
-     FAfterDisconnect(Self);
  end;
  
--- 8989,8993 ----
***************
*** 9026,9041 ****
  end;
  
- procedure TInstantConnector.DoBeforeConnect;
- begin
-   if Assigned(FBeforeConnect) then
-     FBeforeConnect(Self);
- end;
- 
- procedure TInstantConnector.DoBeforeDisconnect;
- begin
-   if Assigned(FBeforeDisconnect) then
-     FBeforeDisconnect(Self);
- end;
- 
  function TInstantConnector.EnsureObjectStore(
    AClass: TInstantObjectClass): TInstantObjectStore;
--- 8998,9001 ----

[Instantobjects-cvscommit] Source InstantVersion.inc,1.3,1.4 InstantPackageVersion.inc,1.2,1.3

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13914

Modified Files:
	InstantVersion.inc InstantPackageVersion.inc 
Log Message:
Added conditional Linux/Windows compiler directives.

Index: InstantPackageVersion.inc
===================================================================
RCS file: /cvsroot/instantobjects/Source/InstantPackageVersion.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstantPackageVersion.inc	16 Sep 2005 09:23:20 -0000	1.2
--- InstantPackageVersion.inc	18 Sep 2005 22:13:13 -0000	1.3
***************
*** 1 ****
--- 1,5 ----
+ {$IFDEF LINUX}
  {$R '../../InstantVersion.res'}
+ {$ELSE}
+ {$R '..\..\InstantVersion.res'}
+ {$ENDIF}

Index: InstantVersion.inc
===================================================================
RCS file: /cvsroot/instantobjects/Source/InstantVersion.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantVersion.inc	16 Sep 2005 09:23:20 -0000	1.3
--- InstantVersion.inc	18 Sep 2005 22:13:13 -0000	1.4
***************
*** 1 ****
--- 1,5 ----
+ {$IFDEF LINUX}
  {$R '../../../InstantVersion.res'}
+ {$ELSE}
+ {$R '..\..\..\InstantVersion.res'}
+ {$ENDIF}

[Instantobjects-cvscommit] Source/Brokers/DBX/K3 IODBX.dpk,1.1,1.2

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/DBX/K3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv976/Source/Brokers/DBX/K3

Modified Files:
	IODBX.dpk 
Log Message:
Fixes for Kylix 3

Index: IODBX.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/DBX/K3/IODBX.dpk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IODBX.dpk	21 Mar 2005 16:55:22 -0000	1.1
--- IODBX.dpk	16 Sep 2005 17:22:17 -0000	1.2
***************
*** 24,32 ****
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects DBX Run-Time Support (Kyix 3)'}
  {$RUNONLY}
  {$IMPLICITBUILD OFF}
  
  requires
!   IOCore;
  
  contains
--- 24,35 ----
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects DBX Run-Time Support (Kyix 3)'}
+ {$LIBPREFIX ''}
  {$RUNONLY}
  {$IMPLICITBUILD OFF}
  
  requires
!   IOCore,
!   IOMSSqlCatalog,
!   IOIBFbCatalog;
  
  contains

[Instantobjects-cvscommit] Source/Core InstantCustomDBEvolverFormUnit.dfm,1.3,1.4 InstantCustomDBEvolverFormUnit.pas,1.4,1.5 InstantDBBuilderFormUnit.pas,1.4,1.5 InstantDBEvolverFormUnit.pas,1.4,1.5

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv976/Source/Core

Modified Files:
	InstantCustomDBEvolverFormUnit.dfm 
	InstantCustomDBEvolverFormUnit.pas 
	InstantDBBuilderFormUnit.pas InstantDBEvolverFormUnit.pas 
Log Message:
Fixes for Kylix 3

Index: InstantCustomDBEvolverFormUnit.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantCustomDBEvolverFormUnit.dfm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantCustomDBEvolverFormUnit.dfm	24 Jul 2005 16:34:55 -0000	1.3
--- InstantCustomDBEvolverFormUnit.dfm	16 Sep 2005 17:22:18 -0000	1.4
***************
*** 23,31 ****
      0000C0070000C0070000C0070000C0070000E00F0000F83F0000FFFF0000}
    OldCreateOrder = False
    ShowHint = True
    OnCreate = FormCreate
-   DesignSize = (
-     593
-     305)
    PixelsPerInch = 96
    TextHeight = 13
--- 23,29 ----
      0000C0070000C0070000C0070000C0070000E00F0000F83F0000FFFF0000}
    OldCreateOrder = False
+   Position = poScreenCenter
    ShowHint = True
    OnCreate = FormCreate
    PixelsPerInch = 96
    TextHeight = 13

Index: InstantDBBuilderFormUnit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantDBBuilderFormUnit.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantDBBuilderFormUnit.pas	4 Sep 2005 23:15:54 -0000	1.4
--- InstantDBBuilderFormUnit.pas	16 Sep 2005 17:22:18 -0000	1.5
***************
*** 39,46 ****
  
  uses
!   Windows, Messages, SysUtils, {$IFDEF D6+} Variants,{$ENDIF}
!  Classes, Graphics, Controls, Forms,
!   Dialogs, InstantCustomDBEvolverFormUnit, ActnList, InstantDBBuild,
!   InstantDBEvolution, StdCtrls, ComCtrls, InstantConsts;
  
  
--- 39,52 ----
  
  uses
!   SysUtils, Classes,
! {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs, StdCtrls, ComCtrls,
!   ImgList, Menus, ActnList, ExtCtrls, StdActns,
! {$ENDIF}
! {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs, QActnList, QMenus, QTypes, QImgList,
!   QStdCtrls, QComCtrls, QExtCtrls,
! {$ENDIF}
!   InstantCustomDBEvolverFormUnit, InstantDBBuild, InstantDBEvolution, InstantConsts;
  
  

Index: InstantDBEvolverFormUnit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantDBEvolverFormUnit.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantDBEvolverFormUnit.pas	4 Sep 2005 23:15:54 -0000	1.4
--- InstantDBEvolverFormUnit.pas	16 Sep 2005 17:22:18 -0000	1.5
***************
*** 39,46 ****
  
  uses
!   Windows, Messages, SysUtils, {$IFDEF D6+} Variants, {$ENDIF}
!  Classes, Graphics, Controls, Forms,
!   Dialogs, InstantCustomDBEvolverFormUnit, ActnList, InstantDBBuild,
!   InstantDBEvolution, StdCtrls, ComCtrls;
  
  type
--- 39,52 ----
  
  uses
!   SysUtils, Classes,
! {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs, StdCtrls, ComCtrls,
!   ImgList, Menus, ActnList, ExtCtrls, StdActns,
! {$ENDIF}
! {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs, QActnList, QMenus, QTypes, QImgList,
!   QStdCtrls, QComCtrls, QExtCtrls,
! {$ENDIF}
!   InstantCustomDBEvolverFormUnit, InstantDBBuild, InstantDBEvolution;
  
  type

Index: InstantCustomDBEvolverFormUnit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantCustomDBEvolverFormUnit.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantCustomDBEvolverFormUnit.pas	4 Sep 2005 23:15:54 -0000	1.4
--- InstantCustomDBEvolverFormUnit.pas	16 Sep 2005 17:22:18 -0000	1.5
***************
*** 39,46 ****
  
  uses
!   Windows, Messages, SysUtils, {$IFDEF D6+} Variants,{$ENDIF}
!  Classes, Graphics, Controls, Forms,
!   Dialogs, StdCtrls, DB, InstantPersistence, ComCtrls, InstantDBBuild,
!   InstantDBEvolution, InstantPresentation, ActnList;
  
  type
--- 39,52 ----
  
  uses
!   SysUtils, Classes,
! {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs, StdCtrls, ComCtrls,
!   ImgList, Menus, ActnList, ExtCtrls, StdActns,
! {$ENDIF}
! {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs, QActnList, QMenus, QTypes, QImgList,
!   QStdCtrls, QComCtrls, QExtCtrls,
! {$ENDIF}
!   InstantPersistence, InstantDBBuild, InstantDBEvolution, InstantPresentation;
  
  type

[Instantobjects-cvscommit] Source/Catalogs/XML InstantXMLCatalog.pas,1.1,1.2

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Catalogs/XML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv976/Source/Catalogs/XML

Modified Files:
	InstantXMLCatalog.pas 
Log Message:
Fixes for Kylix 3

Index: InstantXMLCatalog.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Catalogs/XML/InstantXMLCatalog.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstantXMLCatalog.pas	8 Sep 2005 07:35:32 -0000	1.1
--- InstantXMLCatalog.pas	16 Sep 2005 17:22:18 -0000	1.2
***************
*** 57,61 ****
  
  uses
!   SysUtils, Classes, TypInfo, Dialogs, InstantConsts;
    
  procedure TInstantXMLCatalog.AddTableMetadatas(
--- 57,61 ----
  
  uses
!   SysUtils, Classes, TypInfo, InstantConsts;
    
  procedure TInstantXMLCatalog.AddTableMetadatas(

[Instantobjects-cvscommit] Source/Core/K3 IOCore.dpk,1.4,1.5

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Core/K3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv976/Source/Core/K3

Modified Files:
	IOCore.dpk 
Log Message:
Fixes for Kylix 3

Index: IOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/K3/IOCore.dpk,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IOCore.dpk	21 Mar 2005 16:48:06 -0000	1.4
--- IOCore.dpk	16 Sep 2005 17:22:18 -0000	1.5
***************
*** 18,27 ****
  {$SAFEDIVIDE OFF}
  {$STACKFRAMES OFF}
! {$TYPEDADDRESS OFF}
  {$VARSTRINGCHECKS ON}
! {$WRITEABLECONST ON}
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects Run-Time Package (Kylix 3)'}
  {$RUNONLY}
  {$IMPLICITBUILD OFF}
--- 18,28 ----
  {$SAFEDIVIDE OFF}
  {$STACKFRAMES OFF}
! {$TYPEDADDRESS ON}
  {$VARSTRINGCHECKS ON}
! {$WRITEABLECONST OFF}
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects Run-Time Package (Kylix 3)'}
+ {$LIBPREFIX ''}
  {$RUNONLY}
  {$IMPLICITBUILD OFF}
***************
*** 46,53 ****
    InstantPresentation in '../InstantPresentation.pas',
    InstantAccessors in '../InstantAccessors.pas',
!   InstantConnectionManagerForm in '../InstantConnectionManagerForm.pas' {InstantConnectionManagerForm},
    InstantConnectionManager in '../InstantConnectionManager.pas',
    InstantImageUtils in '../InstantImageUtils.pas',
!   InstantPump in '../InstantPump.pas';
  
  end.
--- 47,59 ----
    InstantPresentation in '../InstantPresentation.pas',
    InstantAccessors in '../InstantAccessors.pas',
!   InstantConnectionManagerFormUnit in '../InstantConnectionManagerFormUnit.pas' {InstantConnectionManagerForm},
    InstantConnectionManager in '../InstantConnectionManager.pas',
    InstantImageUtils in '../InstantImageUtils.pas',
!   InstantPump in '../InstantPump.pas',
!   InstantDBBuild in '../InstantDBBuild.pas',
!   InstantDBEvolution in '../InstantDBEvolution.pas',
!   InstantCustomDBEvolverFormUnit in '../InstantCustomDBEvolverFormUnit.pas' {InstantCustomDBEvolverForm},
!   InstantDBEvolverFormUnit in '../InstantDBEvolverFormUnit.pas' {InstantDBEvolverForm},
!   InstantDBBuilderFormUnit in '../InstantDBBuilderFormUnit.pas' {InstantDBBuilderForm};
  
  end.

[Instantobjects-cvscommit] Source/Design/K3 DclIOCore.dpk,1.3,1.4

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Design/K3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv976/Source/Design/K3

Modified Files:
	DclIOCore.dpk 
Log Message:
Fixes for Kylix 3

Index: DclIOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/K3/DclIOCore.dpk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DclIOCore.dpk	21 Mar 2005 16:48:06 -0000	1.3
--- DclIOCore.dpk	16 Sep 2005 17:22:18 -0000	1.4
***************
*** 5,10 ****
  {$R '../../Core/InstantExplorer.dcr'}
  {$R '../../Core/InstantPersistence.dcr'}
- {$R '../../Core/InstantPump.dcr'}
  {$R '../../Core/InstantConnectionManager.dcr'}
  {$ALIGN 8}
  {$ASSERTIONS ON}
--- 5,11 ----
  {$R '../../Core/InstantExplorer.dcr'}
  {$R '../../Core/InstantPersistence.dcr'}
  {$R '../../Core/InstantConnectionManager.dcr'}
+ {$R '../../Core/InstantPump.dcr'}
+ {$R '../../Core/InstantDBEvolution.dcr'}
  {$ALIGN 8}
  {$ASSERTIONS ON}
***************
*** 23,32 ****
  {$SAFEDIVIDE OFF}
  {$STACKFRAMES OFF}
! {$TYPEDADDRESS OFF}
  {$VARSTRINGCHECKS ON}
! {$WRITEABLECONST ON}
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects Design-Time Package (Kylix 3)'}
  {$DESIGNONLY}
  {$IMPLICITBUILD OFF}
--- 24,34 ----
  {$SAFEDIVIDE OFF}
  {$STACKFRAMES OFF}
! {$TYPEDADDRESS ON}
  {$VARSTRINGCHECKS ON}
! {$WRITEABLECONST OFF}
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects Design-Time Package (Kylix 3)'}
+ {$LIBPREFIX ''}
  {$DESIGNONLY}
  {$IMPLICITBUILD OFF}
***************
*** 49,53 ****
    InstantEdit in '../InstantEdit.pas' {InstantEditForm},
    InstantModelExpert in '../InstantModelExpert.pas',
!   InstantModelExplorer in '../InstantModelExplorer.pas',
    InstantOTA in '../InstantOTA.pas',
    InstantReg in '../InstantReg.pas',
--- 51,55 ----
    InstantEdit in '../InstantEdit.pas' {InstantEditForm},
    InstantModelExpert in '../InstantModelExpert.pas',
!   InstantModelExplorer in '../InstantModelExplorer.pas' {InstantModelExplorerForm},
    InstantOTA in '../InstantOTA.pas',
    InstantReg in '../InstantReg.pas',

[Instantobjects-cvscommit] Demos/PrimerCross Main.pas,1.12,1.13 PrimerK3.mdr,1.1,1.2

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Demos/PrimerCross
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv976/Demos/PrimerCross

Modified Files:
	Main.pas PrimerK3.mdr 
Log Message:
Fixes for Kylix 3

Index: Main.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Main.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Main.pas	8 Sep 2005 14:07:31 -0000	1.12
--- Main.pas	16 Sep 2005 17:22:17 -0000	1.13
***************
*** 695,701 ****
  procedure TMainForm.StopwatchStop(Sender: TObject);
  var
-   ms : cardinal;
  {$IFDEF LINUX}
!   h,m,s : word;
  {$ENDIF}
  begin
--- 695,702 ----
  procedure TMainForm.StopwatchStop(Sender: TObject);
  var
  {$IFDEF LINUX}
!   h,m,s, ms : word;
! {$ELSE}
!   ms : cardinal;
  {$ENDIF}
  begin

Index: PrimerK3.mdr
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PrimerK3.mdr,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsdyB4Kp and /tmp/cvsTzazDn differ

[Instantobjects-cvscommit] Source/Brokers/XML/k3 IOXML.dpk,1.2,1.3

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/XML/k3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv976/Source/Brokers/XML/k3

Modified Files:
	IOXML.dpk 
Log Message:
Fixes for Kylix 3

Index: IOXML.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/XML/k3/IOXML.dpk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IOXML.dpk	8 Sep 2005 07:35:32 -0000	1.2
--- IOXML.dpk	16 Sep 2005 17:22:18 -0000	1.3
***************
*** 1,6 ****
  package IOXML;
  
! {$I '../../../InstantVersion.inc'}
! 
  {$ALIGN 8}
  {$ASSERTIONS ON}
--- 1,5 ----
  package IOXML;
  
! {$R *.res}
  {$ALIGN 8}
  {$ASSERTIONS ON}
***************
*** 25,28 ****
--- 24,28 ----
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects XML Run-Time Support (Kyix 3)'}
+ {$LIBPREFIX ''}
  {$RUNONLY}
  {$IMPLICITBUILD OFF}

[Instantobjects-cvscommit] Source/Catalogs/XML/K3 - New directory

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Catalogs/XML/K3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv692/K3

Log Message:
Directory /cvsroot/instantobjects/Source/Catalogs/XML/K3 added to the repository

[Instantobjects-cvscommit] Source InstantPackageVersion.inc,1.1,1.2 InstantVersion.inc,1.2,1.3

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26458/Source

Modified Files:
	InstantPackageVersion.inc InstantVersion.inc 
Log Message:
Fixed compilation problems of packages

Index: InstantPackageVersion.inc
===================================================================
RCS file: /cvsroot/instantobjects/Source/InstantPackageVersion.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstantPackageVersion.inc	16 Sep 2005 08:59:45 -0000	1.1
--- InstantPackageVersion.inc	16 Sep 2005 09:23:20 -0000	1.2
***************
*** 1 ****
! {$R '..\..\InstantVersion.res'}
--- 1 ----
! {$R '../../InstantVersion.res'}

Index: InstantVersion.inc
===================================================================
RCS file: /cvsroot/instantobjects/Source/InstantVersion.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstantVersion.inc	16 Sep 2005 08:57:21 -0000	1.2
--- InstantVersion.inc	16 Sep 2005 09:23:20 -0000	1.3
***************
*** 1 ****
! {$R '..\..\..\InstantVersion.res'}
--- 1 ----
! {$R '../../../InstantVersion.res'}

[Instantobjects-cvscommit] Source InstantPackageVersion.inc,NONE,1.1

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21467/Source

Added Files:
	InstantPackageVersion.inc 
Log Message:
Fixed compilation problems of packages

--- NEW FILE: InstantPackageVersion.inc ---
{$R '..\..\InstantVersion.res'}