opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong detection of BIT default values. See http://www.heidisql.com/forum.php?t=17862

Browse Source
This commit is contained in:
Ansgar Becker
2015-05-31 08:53:53 +00:00
parent a2018b421f
commit 4e65ed8d5b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/dbconnection.pas
View File

@ -4584,7 +4584,7 @@ var
ColSpec, Quotes: String;
rx, rxCol: TRegExpr;
i, LiteralStart: Integer;
InLiteral: Boolean;
InLiteral, IsLiteral: Boolean;
Col: TTableColumn;
Key: TTableKey;
ForeignKey: TForeignKey;
@ -4706,7 +4706,9 @@ begin
Delete(ColSpec, 1, 15);
end else if UpperCase(Copy(ColSpec, 1, 8)) = 'DEFAULT ' then begin
Delete(ColSpec, 1, 8);
if rxCol.Exec(ColSpec) then begin
// Literal values may match the regex as well. See http://www.heidisql.com/forum.php?t=17862
IsLiteral := (ColSpec[1] = '''') or (Copy(ColSpec, 1, 2) = 'b''') or (Copy(ColSpec, 1, 2) = '(''');
if rxCol.Exec(ColSpec) and (not IsLiteral) then begin
if rxCol.Match[1] = 'NULL' then begin
Col.DefaultType := cdtNull;
Col.DefaultText := 'NULL';
@ -4725,7 +4727,7 @@ begin
if rxCol.Match[3] <> '' then
Col.DefaultType := cdtTextUpdateTS;
end;
end else if (ColSpec[1] = '''') or (Copy(ColSpec, 1, 2) = 'b''') or (Copy(ColSpec, 1, 2) = '(''') then begin
end else if IsLiteral then begin
InLiteral := True;
LiteralStart := Pos('''', ColSpec)+1;
for i:=LiteralStart to Length(ColSpec) do begin