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

Revert r5038 - quoting all columns again now. Reserved words like "interval" are not detected in EscapeString(), so this just a source of new bugs. Thanks to Vadim for his hint!

Browse Source
This commit is contained in:
Ansgar Becker
2016-01-11 20:59:34 +00:00
parent 71144a9aec
commit bdaddea7ea
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/main.pas
View File

@@ -4787,16 +4787,16 @@ begin
and ((ColLen > GRIDMAXDATA) or (ColLen = 0)) // No need to blow SQL with LEFT() if column is shorter anyway
then begin
case DBObj.Connection.Parameters.NetTypeGroup of
ngMSSQL: Select := Select + ' LEFT(CAST(' + DBObj.Connection.QuoteIdent(c.Name, False) + ' AS NVARCHAR('+IntToStr(GRIDMAXDATA)+')), ' + IntToStr(GRIDMAXDATA) + '), ';
ngMySQL: Select := Select + ' LEFT(' + DBObj.Connection.QuoteIdent(c.Name, False) + ', ' + IntToStr(GRIDMAXDATA) + '), ';
ngPgSQL: Select := Select + ' SUBSTR(' + DBObj.Connection.QuoteIdent(c.Name, False) + ', 1, ' + IntToStr(GRIDMAXDATA) + '), ';
ngMSSQL: Select := Select + ' LEFT(CAST(' + DBObj.Connection.QuoteIdent(c.Name) + ' AS NVARCHAR('+IntToStr(GRIDMAXDATA)+')), ' + IntToStr(GRIDMAXDATA) + '), ';
ngMySQL: Select := Select + ' LEFT(' + DBObj.Connection.QuoteIdent(c.Name) + ', ' + IntToStr(GRIDMAXDATA) + '), ';
ngPgSQL: Select := Select + ' SUBSTR(' + DBObj.Connection.QuoteIdent(c.Name) + ', 1, ' + IntToStr(GRIDMAXDATA) + '), ';
end;
end else if DBObj.Connection.Parameters.IsMSSQL and (c.DataType.Index=dtTimestamp) then begin
Select := Select + ' CAST(' + DBObj.Connection.QuoteIdent(c.Name, False) + ' AS INT), ';
Select := Select + ' CAST(' + DBObj.Connection.QuoteIdent(c.Name) + ' AS INT), ';
end else if DBObj.Connection.Parameters.IsMSSQL and (c.DataType.Index=dtHierarchyid) then begin
Select := Select + ' CAST(' + DBObj.Connection.QuoteIdent(c.Name, False) + ' AS NVARCHAR('+IntToStr(GRIDMAXDATA)+')), ';
Select := Select + ' CAST(' + DBObj.Connection.QuoteIdent(c.Name) + ' AS NVARCHAR('+IntToStr(GRIDMAXDATA)+')), ';
end else begin
Select := Select + ' ' + DBObj.Connection.QuoteIdent(c.Name, False) + ', ';
Select := Select + ' ' + DBObj.Connection.QuoteIdent(c.Name) + ', ';
Inc(FullColumnCount);
end;
WantedColumns.Add(c);