fcl-db: cosmetic

git-svn-id: trunk@30482 -

packages/fcl-db/src/base/database.inc

@@ -40,10 +40,10 @@ end;
 
 procedure TDatabase.DoDisconnect;
 begin
-  Closedatasets;
-  Closetransactions;
+  CloseDatasets;
+  CloseTransactions;
   DoInternalDisConnect;
-  if csloading in ComponentState then
+  if csLoading in ComponentState then
     FOpenAfterRead := false;
   FConnected := False;
 end;
@@ -217,7 +217,7 @@ end;
 
 
 { ---------------------------------------------------------------------
-    TDBdataset
+    TDBDataset
   ---------------------------------------------------------------------}
 
 Procedure TDBDataset.SetDatabase (Value : TDatabase);
@@ -345,7 +345,7 @@ begin
   FActive := false;
 end;
 
-procedure TDBTransaction.openTrans;
+procedure TDBTransaction.OpenTrans;
 
 begin
   FActive := true;
@@ -368,7 +368,7 @@ end;
 constructor TDBTransaction.Create(AOwner: TComponent);
 
 begin
-  inherited create(AOwner);
+  inherited Create(AOwner);
   FDatasets:=TList.Create;
 end;
 
@@ -403,7 +403,7 @@ begin
     end;
 end;
 
-destructor TDBTransaction.destroy;
+destructor TDBTransaction.Destroy;
 
 begin
   Database:=Nil;
@@ -423,25 +423,25 @@ begin
       TDBDataset(FDataSets[i]).Transaction:=Nil;
 end;
 
-function TDBTransaction.GetDataSetCount: Longint;
+function TDBTransaction.GetDataset(Index: longint): TDBDataset;
 
 begin
-  If Assigned(FDatasets) Then
-    Result:=FDatasets.Count
+  If Assigned(FDatasets) then
+    Result:=TDBDataset(FDatasets[Index])
   else
-    Result:=0;
+  begin
+    Result := nil;
+    DatabaseError(SNoDatasets);
+  end;
 end;
 
-procedure TDBTransaction.UnRegisterDataset (DS : TDBDataset);
-
-Var I : longint;
+function TDBTransaction.GetDataSetCount: Longint;
 
 begin
-  I:=FDatasets.IndexOf(DS);
-  If I<>-1 then
-    FDatasets.Delete(I)
+  If Assigned(FDatasets) Then
+    Result:=FDatasets.Count
   else
-    DatabaseErrorFmt(SNoDatasetRegistered,[DS.Name]);
+    Result:=0;
 end;
 
 procedure TDBTransaction.RegisterDataset (DS : TDBDataset);
@@ -456,27 +456,22 @@ begin
     DatabaseErrorFmt(SDatasetRegistered,[DS.Name]);
 end;
 
-function TDBTransaction.GetDataset(Index: longint): TDBDataset;
+procedure TDBTransaction.UnRegisterDataset (DS : TDBDataset);
+
+Var I : longint;
 
 begin
-  If Assigned(FDatasets) then
-    Result:=TDBDataset(FDatasets[Index])
+  I:=FDatasets.IndexOf(DS);
+  If I<>-1 then
+    FDatasets.Delete(I)
   else
-  begin
-    result := nil;
-    DatabaseError(SNoDatasets);
-  end;
+    DatabaseErrorFmt(SNoDatasetRegistered,[DS.Name]);
 end;
 
 { ---------------------------------------------------------------------
     TCustomConnection
   ---------------------------------------------------------------------}
 
-procedure TCustomConnection.SetAfterConnect(const AValue: TNotifyEvent);
-begin
-  FAfterConnect:=AValue;
-end;
-
 function TCustomConnection.GetDataSet(Index: Longint): TDataSet;
 begin
   Result := nil;
@@ -495,6 +490,11 @@ begin
     ShowException(ExceptObject,ExceptAddr);
 end;
 
+procedure TCustomConnection.SetAfterConnect(const AValue: TNotifyEvent);
+begin
+  FAfterConnect:=AValue;
+end;
+
 procedure TCustomConnection.SetAfterDisconnect(const AValue: TNotifyEvent);
 begin
   FAfterDisconnect:=AValue;
@@ -505,6 +505,11 @@ begin
   FBeforeConnect:=AValue;
 end;
 
+procedure TCustomConnection.SetBeforeDisconnect(const AValue: TNotifyEvent);
+begin
+  FBeforeDisconnect:=AValue;
+end;
+
 procedure TCustomConnection.DoLoginPrompt;
 
 var
@@ -555,11 +560,6 @@ begin
     end;
 end;
 
-procedure TCustomConnection.SetBeforeDisconnect(const AValue: TNotifyEvent);
-begin
-  FBeforeDisconnect:=AValue;
-end;
-
 procedure TCustomConnection.GetLoginParams(out ADatabaseName, AUserName, APassword: string);
 begin
   if IsPublishedProp(Self,'DatabaseName') then

packages/fcl-db/src/base/db.pas

@@ -1915,7 +1915,7 @@ type
     Function AllowClose(DS: TDBDataset): Boolean; virtual;
     Procedure SetDatabase (Value : TDatabase); virtual;
     procedure CloseTrans;
-    procedure openTrans;
+    procedure OpenTrans;
     Procedure CheckDatabase;
     Procedure CheckActive;
     Procedure CheckInactive;
@@ -1929,7 +1929,7 @@ type
     procedure Loaded; override;
   Public
     constructor Create(AOwner: TComponent); override;
-    Destructor destroy; override;
+    Destructor Destroy; override;
     procedure CloseDataSets;
     Property DataBase : TDatabase Read FDatabase Write SetDatabase;
   published