Răsfoiți Sursa

Cosmetic; use lowercase field names

Reinier Olislagers 11 ani în urmă
părinte
comite
baf21c2010
3 a modificat fișierele cu 14 adăugiri și 14 ștergeri
  1. 7 7
      scriptdb.pas
  2. 6 6
      systables.pas
  3. 1 1
      tablemanage.pas

+ 7 - 7
scriptdb.pas

@@ -241,17 +241,17 @@ begin
           // Field type is not based on a domain but a standard SQL type
           // Field type
           FieldLine:= FieldLine + fmMain.GetFBTypeName(FieldByName('field_type_int').AsInteger,
-            FieldByName('Field_Sub_Type').AsInteger,
-            FieldByName('Field_Length').AsInteger,
-            FieldByName('Field_Precision').AsInteger,
-            FieldByName('Field_Scale').AsInteger);
+            FieldByName('field_sub_type').AsInteger,
+            FieldByName('field_length').AsInteger,
+            FieldByName('field_precision').AsInteger,
+            FieldByName('field_scale').AsInteger);
 
           if (FieldByName('field_type_int').AsInteger) in [CharType, CStringType, VarCharType] then
-            FieldLine:= FieldLine + '(' + FieldByName('CharacterLength').AsString + ') ';
+            FieldLine:= FieldLine + '(' + FieldByName('characterlength').AsString + ') ';
 
           if (FieldByName('field_type_int').AsInteger = BlobType) then
           begin
-            BlobSubType:= fmMain.GetBlobSubTypeName(FieldByName('Field_Sub_Type').AsInteger);
+            BlobSubType:= fmMain.GetBlobSubTypeName(FieldByName('field_sub_type').AsInteger);
             if BlobSubType<>'' then
               FieldLine:= FieldLine + ' ' + BlobSubType;
           end;
@@ -268,7 +268,7 @@ begin
           FieldLine:= FieldLine + ' ' + trim(FieldByName('field_source').AsString);
         end;
         // Default value
-        DefaultValue:= Trim(FieldByName('Field_Default_Source').AsString);
+        DefaultValue:= Trim(FieldByName('field_default_source').AsString);
         if DefaultValue <> '' then
         begin
           if pos('default', LowerCase(DefaultValue)) <> 1 then

+ 6 - 6
systables.pas

@@ -892,7 +892,7 @@ begin
     ' r.RDB$DEFAULT_SOURCE AS field_default_source, ' {SQL text for default value}+
     ' r.RDB$NULL_FLAG AS field_not_null_constraint, ' +
     ' f.RDB$FIELD_LENGTH AS field_length, ' +
-    ' f.RDB$Character_LENGTH AS Characterlength, ' + {character_length seems a reserved word }
+    ' f.RDB$Character_LENGTH AS characterlength, ' + {character_length seems a reserved word }
     ' f.RDB$FIELD_PRECISION AS field_precision, ' +
     ' f.RDB$FIELD_SCALE AS field_scale, ' +
     ' f.RDB$FIELD_TYPE as field_type_int, ' +
@@ -934,18 +934,18 @@ begin
             FieldByName('array_upper_bound').AsString +
             ']';
         if FieldByName('field_type_int').AsInteger = VarCharType then
-          FieldSize:= FieldByName('CharacterLength').AsInteger
+          FieldSize:= FieldByName('characterlength').AsInteger
         else
-          FieldSize:= FieldByName('Field_Length').AsInteger;
+          FieldSize:= FieldByName('field_length').AsInteger;
       end
       else
       begin
         // Field is based on a domain
         FieldType:= trim(FieldByName('field_source').AsString);
       end;
-      NotNull:= FieldByName('Field_not_null_constraint').AsString = '1';
-      DefaultValue:= FieldByName('Field_Default_Source').AsString;
-      Description:= FieldByName('Field_Description').AsString;
+      NotNull:= FieldByName('field_not_null_constraint').AsString = '1';
+      DefaultValue:= FieldByName('field_default_source').AsString;
+      Description:= FieldByName('field_description').AsString;
     end;
   end;
   sqQuery.Close;

+ 1 - 1
tablemanage.pas

@@ -180,7 +180,7 @@ begin
     begin
       if Cells[0, Row] = PKeyName then // Delete primary key
         fmMain.ShowCompleteQueryWindow(fdbIndex,  'Drop Primary Key on Table: ' + fTableName,
-          'alter table ' + fTableName + ' DROP constraint ' + ConstraintName, bbRefreshIndices.OnClick)
+          'alter table ' + fTableName + ' DROP CONSTRAINT ' + ConstraintName, bbRefreshIndices.OnClick)
       else // Delete normal index
         fmMain.ShowCompleteQueryWindow(fdbIndex, 'Drop Index on table: ' + fTableName,
           'DROP INDEX ' + Cells[0, Row], bbRefreshIndices.OnClick);