Reinier Olislagers 11 년 전
부모
커밋
40d9f7041f
11개의 변경된 파일37개의 추가작업 그리고 41개의 파일을 삭제
  1. 2 2
      comparison.pas
  2. 1 1
      copytable.pas
  3. 1 1
      edittable.pas
  4. 15 15
      main.pas
  5. 8 8
      querywindow.pas
  6. 4 4
      reg.pas
  7. 1 1
      scriptdb.pas
  8. 2 2
      systables.pas
  9. 1 1
      tablemanage.pas
  10. 0 4
      turbocommon.pas
  11. 2 2
      update.pas

+ 2 - 2
comparison.pas

@@ -1644,7 +1644,7 @@ begin
     end;
 
   except
-  on e: exception do
+  on E: Exception do
   begin
     ShowMessage(e.Message);
   end;
@@ -2159,7 +2159,7 @@ begin
         end;
       end;
     except
-      on e: exception do
+      on E: Exception do
       begin
         meLog.Lines.Add('---- Error while comparing constraints: ' + e.Message);
       end;

+ 1 - 1
copytable.pas

@@ -156,7 +156,7 @@ begin
         dmSysTables.sqQuery.Close;
         Close;
       except
-        on e: exception do
+        on E: Exception do
         begin
           MessageDlg('Error while copy: ' + e.Message, mtError, [mbOk], 0);
           SQLTrans.Rollback;

+ 1 - 1
edittable.pas

@@ -67,7 +67,7 @@ begin
     if FSQLTrans.Active then
       FSQLTrans.CommitRetaining;
   except
-    on e: exception do
+    on E: Exception do
     begin
       ShowMessage(e.Message);
     end;

+ 15 - 15
main.pas

@@ -338,7 +338,7 @@ begin
       lmRefresh.Click;
     end;
   except
-    on e: exception do
+    on E: Exception do
     begin
       MessageDlg('Error while creating new user: ' + e.Message, mtError, [mbOk], 0);
     end;
@@ -376,7 +376,7 @@ begin
        dmSysTables.stTrans.Commit;
        MessageDlg('Password has been changed', mtInformation, [mbOk], 0);
     except
-      on e: exception do
+      on E: Exception do
         ShowMessage('Error while changing password: ' + e.Message);
     end;
   end;
@@ -1411,7 +1411,7 @@ begin
     end;
 
   except
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
       ShowMessage(e.Message);
@@ -1429,7 +1429,7 @@ begin
     Result:= True;
 
   except
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
       ShowMessage(e.Message)
@@ -1474,7 +1474,7 @@ begin
       try
         mdsHistory.LoadFromFile(AFileName);
       except
-        on e: exception do
+        on E: Exception do
           mdsHistory.SaveToFile(AFileName);
       end;
     end
@@ -1493,7 +1493,7 @@ begin
     FCurrentHistoryFile:= AFileName;
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
       ShowMessage(e.Message);
@@ -2384,7 +2384,7 @@ begin
     fmTableManage.bbRefreshReferencesClick(nil);
     fmTableManage.Show;
   except
-    on e: exception do
+    on E: Exception do
       MessageDlg('Error while opening Table Management: ' + e.Message, mtError, [mbOk], 0);
   end;
 end;
@@ -2637,7 +2637,7 @@ begin
       BodyList.Free;
     end;
   except
-    on e: exception do
+    on E: Exception do
       MessageDlg('Error while getting stored procedure information: ' + e.Message, mtError, [mbOk], 0);
   end;
 end;
@@ -2713,7 +2713,7 @@ begin
     FSQLTransaction.Commit;
     AddToSQLHistory(Rec.RegRec.Title, 'DDL', SQLQuery1.SQL.Text);
   except
-    on e: exception do
+    on E: Exception do
     begin
       ShowMessage('Error: ' + e.Message);
       Result:= False;
@@ -2813,7 +2813,7 @@ begin
     SQLQuery1.Close;
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       ShowMessage(e.Message);
       FIBConnection.Close;
@@ -3058,7 +3058,7 @@ begin
       if not Node.Expanded then
         Node.Expand(False);
     except
-      on e: exception do
+      on E: Exception do
       begin
         Screen.Cursor:= crDefault;
         ShowMessage(e.Message);
@@ -3160,7 +3160,7 @@ begin
       PKFieldsList.Free;
     end;
   except
-    on e: exception do
+    on E: Exception do
       MessageDlg('Error while reading table fields: ' + e.Message, mtError, [mbOk], 0);
   end;
 end;
@@ -3284,7 +3284,7 @@ begin
       PKFieldsList.Free;
     end;
   except
-    on e: exception do
+    on E: Exception do
       ShowMessage(E.Message);
   end;
 end;
@@ -4056,10 +4056,10 @@ begin
     end;
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
-      ShowMessage('Error: ' + e.message);
+      ShowMessage('Error: ' + E.Message);
     end;
   end;
 end;

+ 8 - 8
querywindow.pas

@@ -387,7 +387,7 @@ begin
 
     UserData.EnableControls;
   except
-    on e: exception do
+    on E: Exception do
     begin
       ShowMessage('Error trying to save data: ' + e.Message);
     end;
@@ -604,7 +604,7 @@ begin
     Error:= False;
     fTerminated:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       Error:= True;
       ErrorMsg:= e.Message;
@@ -624,7 +624,7 @@ begin
     DoJob;
     fTerminated:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       Error:= True;
       ErrorMsg:= e.Message;
@@ -1302,7 +1302,7 @@ begin
             FResultMemo.Lines.Add('----');
             FResultMemo.Lines.Add(FQueryPart);
           except
-            on e: exception do
+            on E: Exception do
             begin
               if Assigned(FTab) then
                 FTab.TabVisible:= False;
@@ -1326,7 +1326,7 @@ begin
               fmMain.AddToSQLHistory(FRegRec.Title, SqlType, FQueryPart);
             end;
           except
-            on e: exception do
+            on E: Exception do
             begin
               if Assigned(FTab) then
                 FTab.TabVisible:= False;
@@ -1358,7 +1358,7 @@ begin
         FFinished:= True;
     end;
   except
-    on e: exception do
+    on E: Exception do
     begin
       if Assigned(FTab) then
         FTab.TabVisible:= False;
@@ -1413,7 +1413,7 @@ begin
       SQLScript.Free;
     end;
   except
-    on e: exception do
+    on E: Exception do
     begin
       {$IFDEF DEBUG}
       SendDebug('ExecuteScript failed; error '+E.Message);
@@ -1794,7 +1794,7 @@ begin
       List.Free;
     end;
   except
-    on e: exception do
+    on E: Exception do
       ShowMessage('Error trying to copy: '+e.Message);
   end;
   grid.DataSource.DataSet.EnableControls;

+ 4 - 4
reg.pas

@@ -146,7 +146,7 @@ begin
     CloseFile(F);
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
       ShowMessage('Error: ' + e.Message);
@@ -185,7 +185,7 @@ begin
     CloseFile(F);
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
       ShowMessage('Error: ' + e.Message);
@@ -211,7 +211,7 @@ begin
       ShowMessage('Unable to connect: '+ d.Message + LineEnding +
         'Details: GDS error code: '+inttostr(d.GDSErrorCode));
     end;
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
       ShowMessage('Unable to connect: ' + e.Message);
@@ -265,7 +265,7 @@ begin
     CloseFile(F);
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
     end;

+ 1 - 1
scriptdb.pas

@@ -762,7 +762,7 @@ begin
     end;
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
       Result:= False;
   end;
 end;

+ 2 - 2
systables.pas

@@ -362,7 +362,7 @@ begin
     sqQuery.Close;
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       MessageDlg('Error: ' + e.Message, mtError, [mbOk], 0);
       Result:= False;
@@ -402,7 +402,7 @@ begin
     sqQuery.Close;
     Result:= True;
   except
-    on e: exception do
+    on E: Exception do
     begin
       MessageDlg('Error: ' + e.Message, mtError, [mbOk], 0);
     end;

+ 1 - 1
tablemanage.pas

@@ -474,7 +474,7 @@ begin
     SQLQuery2.Close;
     SQLQuery2.DataBase:= FIBConnection;
   except
-    on e: exception do
+    on E: Exception do
     begin
       MessageDlg('Error while initalizing Table Management: ' + e.Message, mtError, [mbOk], 0);
     end;

+ 0 - 4
turbocommon.pas

@@ -413,12 +413,8 @@ end;
 
 function IsPrimaryIndexSystemGenerated(IndexName: string): boolean;
 begin
-  // todo: investigate if there is a system-generated flag or something to find
-  // out instead of using heuristics on the index name. I donot think so but it
-  // could be possible
   result:= (pos('RDB$PRIMARY',uppercase(Trim(IndexName)))=1);
 end;
 
-
 end.
 

+ 2 - 2
update.pas

@@ -122,7 +122,7 @@ begin
       http.Free
     end;
   except
-    on e: exception do
+    on E: Exception do
     begin
       FSuccess:= False;
       FErrorMessage:= e.Message;
@@ -276,7 +276,7 @@ begin
       List.Free;
     end;
   except
-    on e: exception do
+    on E: Exception do
     begin
       Result:= False;
       ResMsg:= e.Message;