opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #784 Cant add field without default value

Browse Source
This commit is contained in:
Ansgar Becker
2008-10-08 20:29:59 +00:00
parent 55b449a359
commit da87f658fb
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/fieldeditor.dfm
View File

@@ -199,6 +199,7 @@ object FieldEditForm: TFieldEditForm
TabOrder = 5
OnChange = comboDefaultChange
Items.Strings = (
'No default value'
'NULL'
'CURRENT_TIMESTAMP'
'Custom string ...')

16
source/fieldeditor.pas
View File

@@ -109,9 +109,10 @@ type
{$I const.inc}
const
DEFAULT_NULL = 0;
DEFAULT_CURTS = 1;
DEFAULT_CUSTOM = 2;
DEFAULT_NO = 0;
DEFAULT_NULL = 1;
DEFAULT_CURTS = 2;
DEFAULT_CUSTOM = 3;
implementation
@@ -213,7 +214,7 @@ begin
EditFieldName.Text := 'Enter column name';
ComboBoxType.ItemIndex := 1;
EditLength.Text := '';
comboDefault.ItemIndex := DEFAULT_NULL;
comboDefault.ItemIndex := DEFAULT_NO;
EditDefault.Text := '';
EditComment.Text := '';
CheckBoxUnsigned.Checked := true;
@@ -231,7 +232,9 @@ begin
EditFieldname.Text := FFieldName;
EditLength.Text := getEnumValues( NodeData.Captions[1] );
editDefault.Text := '';
if NodeData.Captions[3] = 'NULL' then
if NodeData.Captions[3] = '' then
comboDefault.ItemIndex := DEFAULT_NO
else if NodeData.Captions[3] = 'NULL' then
comboDefault.ItemIndex := DEFAULT_NULL
else if NodeData.Captions[3] = 'CURRENT_TIMESTAMP' then
comboDefault.ItemIndex := DEFAULT_CURTS
@@ -525,7 +528,8 @@ begin
DEFAULT_CURTS: strDefault := 'CURRENT_TIMESTAMP';
DEFAULT_CUSTOM: strDefault := esc(editDefault.Text);
end;
strDefault := ' DEFAULT '+strDefault;
if strDefault <> '' then
strDefault := ' DEFAULT '+strDefault;
end;
if CheckBoxNotNull.Enabled then