From a6e0bb6dc80fbe5652fc263afbec8bf8e235d91c Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Wed, 22 Jul 2009 20:18:41 +0000 Subject: [PATCH] Fix issue #1270, Table editor detects DEFAULT 'xyz' as DEFAULT NULL if table has collation --- source/table_editor.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/table_editor.pas b/source/table_editor.pas index 6417c07c..a3e88611 100644 --- a/source/table_editor.pas +++ b/source/table_editor.pas @@ -335,7 +335,7 @@ begin Props[2] := BoolToStr(False); // Collation - rxCol.Expression := '^(CHARACTER SET \w+)?\s+COLLATE (\w+)\b'; + rxCol.Expression := '^(CHARACTER SET \w+\s+)?COLLATE (\w+)\b'; if rxCol.Exec(ColSpec) then begin Props[6] := rxCol.Match[2]; Delete(ColSpec, 1, rxCol.MatchLen[0]+1);