Просмотр исходного кода

Ignore fields size in comparision option
modified: TurboBird.lpi
modified: comparison.lfm
modified: comparison.pas

motaz 12 лет назад
Родитель
Сommit
aedc0c3d0e
3 измененных файлов с 96 добавлено и 75 удалено
  1. 64 64
      TurboBird.lpi
  2. 28 10
      comparison.lfm
  3. 4 1
      comparison.pas

+ 64 - 64
TurboBird.lpi

@@ -765,11 +765,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="CopyTable"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="120"/>
-        <CursorPos X="63" Y="150"/>
+        <CursorPos X="20" Y="126"/>
         <UsageCount Value="122"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -997,10 +996,11 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Comparison"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="706"/>
-        <CursorPos X="11" Y="749"/>
+        <TopLine Value="600"/>
+        <CursorPos X="95" Y="626"/>
         <UsageCount Value="77"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -1042,124 +1042,124 @@
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="permissionmanage.pas"/>
-        <Caret Line="301" Column="3" TopLine="297"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="420" Column="20" TopLine="408"/>
       </Position1>
       <Position2>
-        <Filename Value="permissionmanage.pas"/>
-        <Caret Line="307" Column="45" TopLine="275"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="2196" Column="1" TopLine="2170"/>
       </Position2>
       <Position3>
-        <Filename Value="permissionmanage.pas"/>
-        <Caret Line="296" Column="102" TopLine="277"/>
+        <Filename Value="querywindow.pas"/>
+        <Caret Line="968" Column="53" TopLine="944"/>
       </Position3>
       <Position4>
-        <Filename Value="permissionmanage.pas"/>
-        <Caret Line="318" Column="3" TopLine="314"/>
+        <Filename Value="querywindow.pas"/>
+        <Caret Line="196" Column="3" TopLine="193"/>
       </Position4>
       <Position5>
-        <Filename Value="main.pas"/>
-        <Caret Line="419" Column="20" TopLine="407"/>
+        <Filename Value="querywindow.pas"/>
+        <Caret Line="190" Column="3" TopLine="188"/>
       </Position5>
       <Position6>
-        <Filename Value="main.pas"/>
-        <Caret Line="420" Column="20" TopLine="408"/>
+        <Filename Value="sqlhistory.pas"/>
+        <Caret Line="39" Column="15" TopLine="22"/>
       </Position6>
       <Position7>
-        <Filename Value="main.pas"/>
-        <Caret Line="2196" Column="1" TopLine="2170"/>
+        <Filename Value="sqlhistory.pas"/>
+        <Caret Line="40" Column="15" TopLine="23"/>
       </Position7>
       <Position8>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="968" Column="53" TopLine="944"/>
+        <Filename Value="sqlhistory.pas"/>
+        <Caret Line="71" Column="3" TopLine="61"/>
       </Position8>
       <Position9>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="196" Column="3" TopLine="193"/>
+        <Filename Value="sqlhistory.pas"/>
+        <Caret Line="72" Column="50" TopLine="46"/>
       </Position9>
       <Position10>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="190" Column="3" TopLine="188"/>
+        <Filename Value="about.pas"/>
+        <Caret Line="72" Column="20" TopLine="58"/>
       </Position10>
       <Position11>
-        <Filename Value="sqlhistory.pas"/>
-        <Caret Line="39" Column="15" TopLine="22"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="549" Column="83" TopLine="536"/>
       </Position11>
       <Position12>
-        <Filename Value="sqlhistory.pas"/>
-        <Caret Line="40" Column="15" TopLine="23"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position12>
       <Position13>
-        <Filename Value="sqlhistory.pas"/>
-        <Caret Line="71" Column="3" TopLine="61"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="678" Column="30" TopLine="658"/>
       </Position13>
       <Position14>
-        <Filename Value="sqlhistory.pas"/>
-        <Caret Line="72" Column="50" TopLine="46"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="693" Column="3" TopLine="686"/>
       </Position14>
       <Position15>
-        <Filename Value="about.pas"/>
-        <Caret Line="72" Column="20" TopLine="58"/>
+        <Filename Value="enterpass.pas"/>
+        <Caret Line="37" Column="32" TopLine="1"/>
       </Position15>
       <Position16>
-        <Filename Value="main.pas"/>
-        <Caret Line="549" Column="83" TopLine="536"/>
+        <Filename Value="enterpass.pas"/>
+        <Caret Line="38" Column="32" TopLine="3"/>
       </Position16>
       <Position17>
-        <Filename Value="main.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="781" Column="8" TopLine="757"/>
       </Position17>
       <Position18>
-        <Filename Value="main.pas"/>
-        <Caret Line="678" Column="30" TopLine="658"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="764" Column="19" TopLine="763"/>
       </Position18>
       <Position19>
-        <Filename Value="main.pas"/>
-        <Caret Line="693" Column="3" TopLine="686"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="264" Column="3" TopLine="259"/>
       </Position19>
       <Position20>
-        <Filename Value="enterpass.pas"/>
-        <Caret Line="37" Column="32" TopLine="1"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="155" Column="3" TopLine="152"/>
       </Position20>
       <Position21>
-        <Filename Value="enterpass.pas"/>
-        <Caret Line="38" Column="32" TopLine="3"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="695" Column="31" TopLine="686"/>
       </Position21>
       <Position22>
-        <Filename Value="comparison.pas"/>
-        <Caret Line="781" Column="8" TopLine="757"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position22>
       <Position23>
-        <Filename Value="comparison.pas"/>
-        <Caret Line="764" Column="19" TopLine="763"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="44" Column="13" TopLine="15"/>
       </Position23>
       <Position24>
-        <Filename Value="comparison.pas"/>
-        <Caret Line="264" Column="3" TopLine="259"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="399" Column="3" TopLine="396"/>
       </Position24>
       <Position25>
-        <Filename Value="comparison.pas"/>
-        <Caret Line="155" Column="3" TopLine="152"/>
+        <Filename Value="copytable.pas"/>
+        <Caret Line="173" Column="3" TopLine="155"/>
       </Position25>
       <Position26>
-        <Filename Value="main.pas"/>
-        <Caret Line="695" Column="31" TopLine="686"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="749" Column="11" TopLine="706"/>
       </Position26>
       <Position27>
-        <Filename Value="main.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="750" Column="11" TopLine="714"/>
       </Position27>
       <Position28>
-        <Filename Value="main.pas"/>
-        <Caret Line="44" Column="13" TopLine="15"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="751" Column="11" TopLine="715"/>
       </Position28>
       <Position29>
-        <Filename Value="main.pas"/>
-        <Caret Line="399" Column="3" TopLine="396"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="157" Column="3" TopLine="155"/>
       </Position29>
       <Position30>
-        <Filename Value="copytable.pas"/>
-        <Caret Line="173" Column="3" TopLine="155"/>
+        <Filename Value="comparison.pas"/>
+        <Caret Line="627" Column="8" TopLine="598"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>

+ 28 - 10
comparison.lfm

@@ -1,11 +1,11 @@
 object fmComparison: TfmComparison
   Left = 410
-  Height = 625
+  Height = 658
   Top = 127
-  Width = 653
+  Width = 820
   Caption = 'Database comparison'
-  ClientHeight = 625
-  ClientWidth = 653
+  ClientHeight = 658
+  ClientWidth = 820
   OnClose = FormClose
   Position = poScreenCenter
   LCLVersion = '1.0.4.0'
@@ -66,9 +66,9 @@ object fmComparison: TfmComparison
   end
   object meLog: TMemo
     Left = 13
-    Height = 233
+    Height = 266
     Top = 360
-    Width = 633
+    Width = 800
     Anchors = [akTop, akLeft, akRight, akBottom]
     Font.Name = 'Courier 10 Pitch'
     ParentFont = False
@@ -168,8 +168,8 @@ object fmComparison: TfmComparison
   object StatusBar1: TStatusBar
     Left = 0
     Height = 21
-    Top = 604
-    Width = 653
+    Top = 637
+    Width = 820
     Panels = <    
       item
         Width = 50
@@ -185,7 +185,7 @@ object fmComparison: TfmComparison
     TabOrder = 5
   end
   object bbClose: TBitBtn
-    Left = 626
+    Left = 793
     Height = 24
     Top = 0
     Width = 27
@@ -201,7 +201,7 @@ object fmComparison: TfmComparison
     Left = 8
     Height = 98
     Top = 6
-    Width = 608
+    Width = 775
     Anchors = [akTop, akLeft, akRight]
     AutoSize = False
     Caption = 'Database comparison tool compares origional database structure to another database structure.'#10'It generates script to make compared database structure becomes like origional database.'#10'For instance, origional database could be a development database, and compared database is an old version that'#10'is deployed in customer side. This tool generates script to make customer database structure '#10'resembles developmenent database as much as possible.'
@@ -212,4 +212,22 @@ object fmComparison: TfmComparison
     Transparent = False
     WordWrap = True
   end
+  object GroupBox2: TGroupBox
+    Left = 616
+    Height = 76
+    Top = 195
+    Width = 189
+    Caption = 'Options'
+    ClientHeight = 57
+    ClientWidth = 185
+    TabOrder = 7
+    object cxIgnoreLength: TCheckBox
+      Left = 16
+      Height = 24
+      Top = 6
+      Width = 154
+      Caption = 'Ignore fields length'
+      TabOrder = 0
+    end
+  end
 end

+ 4 - 1
comparison.pas

@@ -20,6 +20,7 @@ type
     bbClose: TBitBtn;
     bbStart: TBitBtn;
     cbComparedDatabase: TComboBox;
+    cxIgnoreLength: TCheckBox;
     cxRemovedObjects: TCheckBox;
     cxDomains: TCheckBox;
     cxRoles: TCheckBox;
@@ -30,6 +31,7 @@ type
     cxUDFs: TCheckBox;
     cxViews: TCheckBox;
     GroupBox1: TGroupBox;
+    GroupBox2: TGroupBox;
     Label1: TLabel;
     Label2: TLabel;
     Label3: TLabel;
@@ -621,7 +623,8 @@ begin
     dmSysTables.GetFieldInfo(fdbIndex, ATableName, AFieldName, FieldType, FieldSize, NotNull, DefaultValue, Description);
     dmSysTables.GetFieldInfo(cbComparedDatabase.ItemIndex, ATableName, AFieldName, CFieldType, CFieldSize, CNotNull,
       CDefaultValue, CDescription);
-    if (FieldType <> CFieldType) or (FieldSize <> CFieldSize) or (NotNull <> CNotNull) or (DefaultValue <> CDefaultValue)
+    if (FieldType <> CFieldType) or ((FieldSize <> CFieldSize) and (not cxIgnoreLength.Checked)) or
+       (NotNull <> CNotNull) or (DefaultValue <> CDefaultValue)
        or (Description <> CDescription) then
        begin
          meLog.Lines.Add(' ' + ExistFieldsList[i]);