opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 10:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prefer string constants from TTableKey over hardcoded literals

Browse Source
This commit is contained in:
Ansgar Becker
2020-08-01 19:20:26 +02:00
parent 6f4f105826
commit eb75818ea9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/dbconnection.pas
View File

@ -5101,7 +5101,7 @@ begin
Result.Add(NewKey);
NewKey.Name := KeyQuery.Col('CONSTRAINT_NAME');
NewKey.OldName := NewKey.Name;
if KeyQuery.Col('CONSTRAINT_TYPE').ToLowerInvariant.StartsWith('primary') then
if KeyQuery.Col('CONSTRAINT_TYPE').StartsWith(TTableKey.PRIMARY, True) then
NewKey.IndexType := TTableKey.PRIMARY
else
NewKey.IndexType := KeyQuery.Col('CONSTRAINT_TYPE');
@ -5133,7 +5133,7 @@ begin
if not Assigned(NewKey) then begin
NewKey := TTableKey.Create(Self);
Result.Add(NewKey);
NewKey.Name := 'PRIMARY';
NewKey.Name := TTableKey.PRIMARY;
NewKey.OldName := NewKey.Name;
NewKey.IndexType := TTableKey.PRIMARY;
NewKey.OldIndexType := NewKey.IndexType;
@ -5176,11 +5176,11 @@ begin
Result.Add(NewKey);
NewKey.Name := KeyQuery.Col('Key_name');
NewKey.OldName := NewKey.Name;
if NewKey.Name.ToLowerInvariant = 'primary' then
if CompareText(NewKey.Name, TTableKey.PRIMARY) = 0 then
NewKey.IndexType := TTableKey.PRIMARY
else if KeyQuery.Col('Non_unique') = '0' then
NewKey.IndexType := TTableKey.UNIQUE
else if KeyQuery.Col('Index_type').ToLowerInvariant = 'fulltext' then
else if CompareText(KeyQuery.Col('Index_type'), TTableKey.FULLTEXT) = 0 then
NewKey.IndexType := TTableKey.FULLTEXT
else
NewKey.IndexType := TTableKey.KEY;
@ -5283,7 +5283,7 @@ begin
if not Assigned(NewKey) then begin
NewKey := TTableKey.Create(Self);
Result.Add(NewKey);
NewKey.Name := 'PRIMARY';
NewKey.Name := TTableKey.PRIMARY;
NewKey.OldName := NewKey.Name;
NewKey.IndexType := TTableKey.PRIMARY;
NewKey.OldIndexType := NewKey.IndexType;