2
0
Reinier Olislagers 11 жил өмнө
parent
commit
d0ac7f429a
4 өөрчлөгдсөн 12 нэмэгдсэн , 15 устгасан
  1. 6 1
      TurboBird.lpi
  2. 1 1
      TurboBird.lpr
  3. 2 11
      main.pas
  4. 3 2
      querywindow.pas

+ 6 - 1
TurboBird.lpi

@@ -101,7 +101,7 @@
         <PackageName Value="LCL"/>
         <PackageName Value="LCL"/>
       </Item6>
       </Item6>
     </RequiredPackages>
     </RequiredPackages>
-    <Units Count="41">
+    <Units Count="42">
       <Unit0>
       <Unit0>
         <Filename Value="TurboBird.lpr"/>
         <Filename Value="TurboBird.lpr"/>
         <IsPartOfProject Value="True"/>
         <IsPartOfProject Value="True"/>
@@ -405,6 +405,11 @@
         <IsPartOfProject Value="True"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="trunksqlscript"/>
         <UnitName Value="trunksqlscript"/>
       </Unit40>
       </Unit40>
+      <Unit41>
+        <Filename Value="turbocommon.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="turbocommon"/>
+      </Unit41>
     </Units>
     </Units>
   </ProjectOptions>
   </ProjectOptions>
   <CompilerOptions>
   <CompilerOptions>

+ 1 - 1
TurboBird.lpr

@@ -23,7 +23,7 @@ uses
   UserPermissions, TableManage, BackupRestore, CreateUser, ChangePass,
   UserPermissions, TableManage, BackupRestore, CreateUser, ChangePass,
   PermissionManage, SQLHistory, CopyTable, dynlibs, ibase60dyn, dbInfo,
   PermissionManage, SQLHistory, CopyTable, dynlibs, ibase60dyn, dbInfo,
   sysutils, Comparison, Update, topologicalsort, UnitFirebirdServices, 
   sysutils, Comparison, Update, topologicalsort, UnitFirebirdServices, 
-trunksqlscript;
+trunksqlscript, turbocommon;
 
 
 const
 const
   Major = 1;
   Major = 1;

+ 2 - 11
main.pas

@@ -7,7 +7,7 @@ interface
 uses
 uses
   Classes, SysUtils, IBConnection, sqldb, memds, FileUtil, LResources, Forms,
   Classes, SysUtils, IBConnection, sqldb, memds, FileUtil, LResources, Forms,
   Controls, Graphics, Dialogs, Menus, ComCtrls, Reg, QueryWindow, Grids,
   Controls, Graphics, Dialogs, Menus, ComCtrls, Reg, QueryWindow, Grids,
-  ExtCtrls, Buttons, StdCtrls, TableManage,dbugintf;
+  ExtCtrls, Buttons, StdCtrls, TableManage,dbugintf, turbocommon;
 
 
 {$i turbocommon.inc}
 {$i turbocommon.inc}
 
 
@@ -264,7 +264,6 @@ type
     function Is64bit: Boolean;
     function Is64bit: Boolean;
     function Is32bit: Boolean;
     function Is32bit: Boolean;
     function getConfigurationDirectory: string;
     function getConfigurationDirectory: string;
-    procedure setTransactionIsolation(Params: TStringList);
   end;
   end;
 
 
 
 
@@ -785,14 +784,6 @@ begin
     ExtractFilePath(ParamStr(0));
     ExtractFilePath(ParamStr(0));
 end;
 end;
 
 
-procedure TfmMain.setTransactionIsolation(Params: TStringList);
-begin
-  Params.Clear;
-  Params.Add('isc_tpb_read_commited');
-  Params.Add('isc_tpb_concurrency');
-  Params.Add('isc_tpb_nowait');
-end;
-
 (****************  Fill and show constraints form ************************)
 (****************  Fill and show constraints form ************************)
 
 
 procedure TfmMain.FillAndShowConstraintsForm(Form: TfmTableManage; ATableName: string; dbIndex: Integer);
 procedure TfmMain.FillAndShowConstraintsForm(Form: TfmTableManage; ATableName: string; dbIndex: Integer);
@@ -3975,7 +3966,7 @@ begin
             ibConnection.LogEvents:=[detCustom,detExecute,detCommit,detRollBack];
             ibConnection.LogEvents:=[detCustom,detExecute,detCommit,detRollBack];
             {$ENDIF DEBUG}
             {$ENDIF DEBUG}
             SQLTrans:= TSQLTransaction.Create(nil);
             SQLTrans:= TSQLTransaction.Create(nil);
-            setTransactionIsolation(SQLTrans.Params);
+            SetTransactionIsolation(SQLTrans.Params);
 
 
             IBConnection.Transaction:= SQLTrans;
             IBConnection.Transaction:= SQLTrans;
             SQLTrans.DataBase:= IBConnection;
             SQLTrans.DataBase:= IBConnection;

+ 3 - 2
querywindow.pas

@@ -8,7 +8,8 @@ uses
   Classes, SysUtils, IBConnection, db, sqldb, FileUtil, LResources, Forms,
   Classes, SysUtils, IBConnection, db, sqldb, FileUtil, LResources, Forms,
   Controls, Graphics, Dialogs, ExtCtrls, PairSplitter, StdCtrls, Buttons,
   Controls, Graphics, Dialogs, ExtCtrls, PairSplitter, StdCtrls, Buttons,
   DBGrids, Menus, ComCtrls, SynEdit, SynHighlighterSQL, Reg,
   DBGrids, Menus, ComCtrls, SynEdit, SynHighlighterSQL, Reg,
-  SynEditTypes, SynCompletion, Clipbrd, grids, DbCtrls, types, LCLType, modsqlscript,dbugintf;
+  SynEditTypes, SynCompletion, Clipbrd, grids, DbCtrls, types, LCLType,
+  modsqlscript, dbugintf, turbocommon;
 
 
 type
 type
 
 
@@ -997,7 +998,7 @@ begin
   FRegRec:= fmMain.RegisteredDatabases[dbIndex].RegRec;
   FRegRec:= fmMain.RegisteredDatabases[dbIndex].RegRec;
 
 
   // Set instances of FIBConnection and SQLTransaction for the current Query Window
   // Set instances of FIBConnection and SQLTransaction for the current Query Window
-  fmMain.setTransactionIsolation(FSQLTrans.Params);
+  setTransactionIsolation(FSQLTrans.Params);
   FSQLTrans.DataBase:= FIBConnection;
   FSQLTrans.DataBase:= FIBConnection;
 
 
   // Set connection parameters to FIBConnection
   // Set connection parameters to FIBConnection