فهرست منبع

Align column default value fieldname with underlying Firebird RDB$RELATION_FIELDS fieldname to decrease confusion about what field is actually used. The old field name actually looks like another field (the BLR source) in RDB$RELATION_FIELDS.

Reinier Olislagers 11 سال پیش
والد
کامیت
5c7e125e13
3فایلهای تغییر یافته به همراه6 افزوده شده و 6 حذف شده
  1. 2 2
      main.pas
  2. 1 1
      scriptdb.pas
  3. 3 3
      systables.pas

+ 2 - 2
main.pas

@@ -2460,7 +2460,7 @@ procedure TfmMain.GetFields(DatabaseIndex: Integer; ATableName: string; FieldsLi
 const
   QueryTemplate= 'SELECT r.RDB$FIELD_NAME AS field_name, ' +
     ' r.RDB$DESCRIPTION AS field_description, ' +
-    ' r.RDB$DEFAULT_SOURCE AS field_default_value, ' +
+    ' r.RDB$DEFAULT_SOURCE AS field_default_source, ' {SQL source 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}
@@ -3138,7 +3138,7 @@ begin
           Cells[4, RowCount - 1]:= '1';
 
         // Default Value
-        DefaultValue:= FieldByName('Field_Default_Value').AsString;
+        DefaultValue:= FieldByName('Field_Default_Source').AsString;
         if Pos('default', DefaultValue) > 0 then
           DefaultValue:= Trim(StringReplace(DefaultValue, 'default', '', []));
         Cells[5, RowCount - 1]:= DefaultValue;

+ 1 - 1
scriptdb.pas

@@ -253,7 +253,7 @@ begin
           FieldLine:= FieldLine + ' [' + FieldByName('Array_Upper_Bound').AsString + '] ';
 
         // Default value
-        DefaultValue:= Trim(FieldByName('Field_Default_Value').AsString);
+        DefaultValue:= Trim(FieldByName('Field_Default_Source').AsString);
         if DefaultValue <> '' then
         begin
           if pos('default', LowerCase(DefaultValue)) <> 1 then

+ 3 - 3
systables.pas

@@ -885,7 +885,7 @@ begin
   Init(dbIndex);
   sqQuery.SQL.Text:= 'SELECT r.RDB$FIELD_NAME AS field_name, ' +
     ' r.RDB$DESCRIPTION AS field_description, ' +
-    ' r.RDB$DEFAULT_SOURCE AS field_default_value, ' +
+    ' 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 }
@@ -928,7 +928,7 @@ begin
       else
         FieldSize:= FieldByName('Field_Length').AsInteger;
       NotNull:= FieldByName('Field_not_null_constraint').AsString = '1';
-      DefaultValue:= FieldByName('Field_Default_Value').AsString;
+      DefaultValue:= FieldByName('Field_Default_Source').AsString;
       Description:= FieldByName('Field_Description').AsString;
     end;
   end;
@@ -1096,7 +1096,7 @@ begin
   Init(dbIndex);
   sqQuery.SQL.Text:= 'SELECT r.RDB$FIELD_NAME AS field_name, ' +
       ' r.RDB$DESCRIPTION AS field_description, ' +
-      ' r.RDB$DEFAULT_SOURCE AS field_default_value, ' +
+      ' r.RDB$DEFAULT_SOURCE AS field_default_source, ' {SQL source for default value}+
       ' r.RDB$NULL_FLAG AS field_not_null_constraint, ' +
       ' f.RDB$FIELD_LENGTH AS field_length, ' +
       ' f.RDB$FIELD_PRECISION AS field_precision, ' +