[Instantobjects-cvscommit] Source/Brokers/IBX InstantIBX.pas,1.4,1.5

[Nando D. <na...@us...>]

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

Modified Files:
	InstantIBX.pas 
Log Message:
Fixed inherited call chain in InternalBuildDatabase; small cosmetic changes

Index: InstantIBX.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/IBX/InstantIBX.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantIBX.pas	15 Sep 2004 07:05:02 -0000	1.4
--- InstantIBX.pas	16 Sep 2004 11:36:06 -0000	1.5
***************
*** 113,117 ****
      property Options: TInstantIBXOptions read FOptions write FOptions default DefaultInstantIBXOptions;
      property OnLogin: TIBDatabaseLoginEvent read FOnLogin write FOnLogin;
-     property LoginPrompt;
    end;
  
--- 113,116 ----
***************
*** 305,309 ****
    Scheme: TInstantScheme);
  begin
-   Scheme.BlobStreamFormat := BlobStreamFormat;
    StartTransaction;
    try
--- 304,307 ----
***************
*** 345,358 ****
    // IBX's TIBDatabase.CreateDatabase is fatally flawed and so we have to
    // bypass it for the time being.
!   with Connection do
!   begin
!     CheckInactive;
!     db_handle := nil;
!     tr_handle := nil;
!     Call(
        GetGDSLibrary().isc_dsql_execute_immediate(StatusVector, @db_handle, @tr_handle, 0,
!         PChar('create database ''' + DatabaseName + ''' user ''' + Params.Values['user_name'] + ''' password ''' +
!               Params.Values['password'] + ''''), SQLDialect, nil),
        True);
      Disconnect;
    end;
--- 343,357 ----
    // IBX's TIBDatabase.CreateDatabase is fatally flawed and so we have to
    // bypass it for the time being.
!   Connection.CheckInactive;
!   db_handle := nil;
!   tr_handle := nil;
!   try
!     Connection.Call(
        GetGDSLibrary().isc_dsql_execute_immediate(StatusVector, @db_handle, @tr_handle, 0,
!         PChar('create database ''' + Connection.DatabaseName + ''' user ''' +
!               Connection.Params.Values['user_name'] + ''' password ''' +
!               Connection.Params.Values['password'] + ''''), Connection.SQLDialect, nil),
        True);
+   finally
      Disconnect;
    end;
***************
*** 415,419 ****
      SQL.Text := AStatement;
      if Assigned(AParams) then
!       AssignDataSetParams(Query,AParams);
    end;
    Result := Query;
--- 414,418 ----
      SQL.Text := AStatement;
      if Assigned(AParams) then
!       AssignDataSetParams(Query, AParams);
    end;
    Result := Query;