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

Quote identifiers with the right quote char when exporting to server.

Browse Source
This commit is contained in:
Ansgar Becker
2011-04-01 05:20:45 +00:00
parent 2816377c4a
commit 4142bed111
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/tabletools.pas
View File

@ -1033,6 +1033,7 @@ var
rx: TRegExpr; rx: TRegExpr;
ColumnList: TTableColumnList; ColumnList: TTableColumnList;
Column: TTableColumn; Column: TTableColumn;
Quoter: TDBConnection;
const const
TempDelim = '//'; TempDelim = '//';
@ -1061,6 +1062,12 @@ begin
ToClipboard := comboExportOutputType.Text = OUTPUT_CLIPBOARD; ToClipboard := comboExportOutputType.Text = OUTPUT_CLIPBOARD;
ToDb := comboExportOutputType.Text = OUTPUT_DB; ToDb := comboExportOutputType.Text = OUTPUT_DB;
ToServer := Copy(comboExportOutputType.Text, 1, Length(OUTPUT_SERVER)) = OUTPUT_SERVER; ToServer := Copy(comboExportOutputType.Text, 1, Length(OUTPUT_SERVER)) = OUTPUT_SERVER;
if ToServer then
Quoter := FTargetConnection
else
Quoter := DBObj.Connection;
StartTime := GetTickCount; StartTime := GetTickCount;
ExportStreamStartOfQueryPos := 0; ExportStreamStartOfQueryPos := 0;
if ToDir then begin if ToDir then begin
@ -1089,7 +1096,7 @@ begin
Format('# %-30s%s', ['Date/time:', DateTimeToStr(Now)]) + CRLF + Format('# %-30s%s', ['Date/time:', DateTimeToStr(Now)]) + CRLF +
'# --------------------------------------------------------' + CRLF + CRLF + '# --------------------------------------------------------' + CRLF + CRLF +
'/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' + CRLF + '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' + CRLF +
'/*!40101 SET NAMES '+MainForm.ActiveConnection.CharacterSet+' */;' + CRLF + '/*!40101 SET NAMES '+DBObj.Connection.CharacterSet+' */;' + CRLF +
'/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;' + CRLF + '/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;' + CRLF +
'/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=''NO_AUTO_VALUE_ON_ZERO'' */;'; '/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=''NO_AUTO_VALUE_ON_ZERO'' */;';
Output(Header, False, DBObj.Database<>ExportLastDatabase, True, False, False); Output(Header, False, DBObj.Database<>ExportLastDatabase, True, False, False);
@ -1105,23 +1112,23 @@ begin
if chkExportDatabasesDrop.Checked or chkExportDatabasesCreate.Checked then begin if chkExportDatabasesDrop.Checked or chkExportDatabasesCreate.Checked then begin
Output(CRLF+CRLF+'# Dumping database structure for '+DBObj.Database+CRLF, False, NeedsDBStructure, False, False, False); Output(CRLF+CRLF+'# Dumping database structure for '+DBObj.Database+CRLF, False, NeedsDBStructure, False, False, False);
if chkExportDatabasesDrop.Checked and chkExportDatabasesDrop.Enabled then if chkExportDatabasesDrop.Checked and chkExportDatabasesDrop.Enabled then
Output('DROP DATABASE IF EXISTS '+DBObj.Connection.QuoteIdent(FinalDbName), True, NeedsDBStructure, False, False, NeedsDBStructure); Output('DROP DATABASE IF EXISTS '+Quoter.QuoteIdent(FinalDbName), True, NeedsDBStructure, False, False, NeedsDBStructure);
if chkExportDatabasesCreate.Checked and chkExportDatabasesCreate.Enabled then begin if chkExportDatabasesCreate.Checked and chkExportDatabasesCreate.Enabled then begin
if MainForm.ActiveConnection.ServerVersionInt >= 40100 then begin if DBObj.Connection.ServerVersionInt >= 40100 then begin
Struc := MainForm.ActiveConnection.GetVar('SHOW CREATE DATABASE '+DBObj.QuotedDatabase, 1); Struc := DBObj.Connection.GetVar('SHOW CREATE DATABASE '+DBObj.QuotedDatabase, 1);
// Gracefully ignore it when target database exists, important in server mode // Gracefully ignore it when target database exists, important in server mode
Insert('IF NOT EXISTS ', Struc, Pos('DATABASE', Struc) + 9); Insert('IF NOT EXISTS ', Struc, Pos('DATABASE', Struc) + 9);
// Create the right dbname // Create the right dbname
Struc := StringReplace(Struc, DBObj.Database, FinalDbName, []); Struc := StringReplace(Struc, DBObj.Database, FinalDbName, []);
end else end else
Struc := 'CREATE DATABASE IF NOT EXISTS '+DBObj.Connection.QuoteIdent(FinalDbName); Struc := 'CREATE DATABASE IF NOT EXISTS '+Quoter.QuoteIdent(FinalDbName);
Output(Struc, True, NeedsDBStructure, False, False, NeedsDBStructure); Output(Struc, True, NeedsDBStructure, False, False, NeedsDBStructure);
Output('USE '+DBObj.Connection.QuoteIdent(FinalDbName), True, NeedsDBStructure, False, False, NeedsDBStructure); Output('USE '+Quoter.QuoteIdent(FinalDbName), True, NeedsDBStructure, False, False, NeedsDBStructure);
end; end;
end; end;
if ToServer and (not chkExportDatabasesCreate.Checked) then begin if ToServer and (not chkExportDatabasesCreate.Checked) then begin
// Export to server without "CREATE/USE dbname" and "Same dbs as on source server" - needs a "USE dbname" // Export to server without "CREATE/USE dbname" and "Same dbs as on source server" - needs a "USE dbname"
Output('USE '+DBObj.Connection.QuoteIdent(FinalDbName), True, False, False, False, NeedsDBStructure); Output('USE '+Quoter.QuoteIdent(FinalDbName), True, False, False, False, NeedsDBStructure);
end; end;
// Table structure // Table structure
@ -1130,8 +1137,8 @@ begin
if chkExportTablesDrop.Checked then begin if chkExportTablesDrop.Checked then begin
Struc := 'DROP '+UpperCase(DBObj.ObjType)+' IF EXISTS '; Struc := 'DROP '+UpperCase(DBObj.ObjType)+' IF EXISTS ';
if ToDb then if ToDb then
Struc := Struc + DBObj.Connection.QuoteIdent(FinalDbName)+'.'; Struc := Struc + Quoter.QuoteIdent(FinalDbName)+'.';
Struc := Struc + DBObj.QuotedName; Struc := Struc + Quoter.QuoteIdent(DBObj.Name);
Output(Struc, True, True, True, True, True); Output(Struc, True, True, True, True, True);
end; end;
if chkExportTablesCreate.Checked then begin if chkExportTablesCreate.Checked then begin
@ -1149,7 +1156,7 @@ begin
end; end;
Insert('IF NOT EXISTS ', Struc, Pos('TABLE', Struc) + 6); Insert('IF NOT EXISTS ', Struc, Pos('TABLE', Struc) + 6);
if ToDb then if ToDb then
Insert(DBObj.Connection.QuoteIdent(FinalDbName)+'.', Struc, Pos('EXISTS', Struc) + 7 ) Insert(Quoter.QuoteIdent(FinalDbName)+'.', Struc, Pos('EXISTS', Struc) + 7 )
end; end;
lntView: begin lntView: begin
@ -1160,8 +1167,8 @@ begin
Struc := '# Creating temporary table to overcome VIEW dependency errors'+CRLF+ Struc := '# Creating temporary table to overcome VIEW dependency errors'+CRLF+
'CREATE TABLE '; 'CREATE TABLE ';
if ToDb then if ToDb then
Struc := Struc + DBObj.Connection.QuoteIdent(FinalDbName) + '.'; Struc := Struc + Quoter.QuoteIdent(FinalDbName) + '.';
Struc := Struc + DBObj.QuotedName+' ('; Struc := Struc + Quoter.QuoteIdent(DBObj.Name)+' (';
for Column in ColumnList do for Column in ColumnList do
Struc := Struc + CRLF + #9 + Column.SQLCode + ','; Struc := Struc + CRLF + #9 + Column.SQLCode + ',';
Delete(Struc, Length(Struc), 1); Delete(Struc, Length(Struc), 1);
@ -1171,21 +1178,21 @@ begin
Struc := '# Removing temporary table and create final VIEW structure'+CRLF+ Struc := '# Removing temporary table and create final VIEW structure'+CRLF+
'DROP TABLE IF EXISTS '; 'DROP TABLE IF EXISTS ';
if ToDb then if ToDb then
Struc := Struc + DBObj.Connection.QuoteIdent(FinalDbName)+'.'; Struc := Struc + Quoter.QuoteIdent(FinalDbName)+'.';
Struc := Struc + DBObj.QuotedName; Struc := Struc + Quoter.QuoteIdent(DBObj.Name);
Output(Struc, True, True, True, True, True); Output(Struc, True, True, True, True, True);
Struc := DBObj.CreateCode; Struc := DBObj.CreateCode;
if ToDb then if ToDb then
Insert(DBObj.Connection.QuoteIdent(FinalDbName)+'.', Struc, Pos('VIEW', Struc) + 5 ); Insert(Quoter.QuoteIdent(FinalDbName)+'.', Struc, Pos('VIEW', Struc) + 5 );
end; end;
end; end;
lntTrigger: begin lntTrigger: begin
StrucResult := MainForm.ActiveConnection.GetResults('SHOW TRIGGERS FROM '+DBObj.QuotedDatabase+' WHERE `Trigger`='+esc(DBObj.Name)); StrucResult := DBObj.Connection.GetResults('SHOW TRIGGERS FROM '+DBObj.QuotedDatabase+' WHERE `Trigger`='+esc(DBObj.Name));
Struc := 'CREATE '+UpperCase(DBObj.ObjType)+' '+DBObj.QuotedName+' '+StrucResult.Col('Timing')+' '+StrucResult.Col('Event')+ Struc := 'CREATE '+UpperCase(DBObj.ObjType)+' '+Quoter.QuoteIdent(DBObj.Name)+' '+StrucResult.Col('Timing')+' '+StrucResult.Col('Event')+
' ON '+DBObj.Connection.QuoteIdent(StrucResult.Col('Table'))+' FOR EACH ROW '+StrucResult.Col('Statement'); ' ON '+Quoter.QuoteIdent(StrucResult.Col('Table'))+' FOR EACH ROW '+StrucResult.Col('Statement');
if ToDb then if ToDb then
Insert(DBObj.Connection.QuoteIdent(FinalDbName)+'.', Struc, Pos('TRIGGER', Struc) + 8 ); Insert(Quoter.QuoteIdent(FinalDbName)+'.', Struc, Pos('TRIGGER', Struc) + 8 );
if ToFile or ToClipboard or ToDir then begin if ToFile or ToClipboard or ToDir then begin
Struc := 'SET SESSION SQL_MODE=' + esc(StrucResult.Col('sql_mode')) + ';' + CRLF + Struc := 'SET SESSION SQL_MODE=' + esc(StrucResult.Col('sql_mode')) + ';' + CRLF +
'DELIMITER ' + TempDelim + CRLF + 'DELIMITER ' + TempDelim + CRLF +
@ -1199,9 +1206,9 @@ begin
Struc := DBObj.CreateCode; Struc := DBObj.CreateCode;
if ToDb then begin if ToDb then begin
if DBObj.NodeType = lntProcedure then if DBObj.NodeType = lntProcedure then
Insert(DBObj.Connection.QuoteIdent(FinalDbName)+'.', Struc, Pos('PROCEDURE', Struc) + 10 ) Insert(Quoter.QuoteIdent(FinalDbName)+'.', Struc, Pos('PROCEDURE', Struc) + 10 )
else if DBObj.NodeType = lntFunction then else if DBObj.NodeType = lntFunction then
Insert(DBObj.Connection.QuoteIdent(FinalDbName)+'.', Struc, Pos('FUNCTION', Struc) + 9 ); Insert(Quoter.QuoteIdent(FinalDbName)+'.', Struc, Pos('FUNCTION', Struc) + 9 );
end; end;
// Change delimiter for file output, so readers split queries at the right string position // Change delimiter for file output, so readers split queries at the right string position
if ToFile or ToDir or ToClipboard then if ToFile or ToDir or ToClipboard then
@ -1211,7 +1218,7 @@ begin
lntEvent: begin lntEvent: begin
Struc := DBObj.CreateCode; Struc := DBObj.CreateCode;
if ToDb then if ToDb then
Insert(DBObj.Connection.QuoteIdent(FinalDbName)+'.', Struc, Pos('EVENT', Struc) + 6 ); Insert(Quoter.QuoteIdent(FinalDbName)+'.', Struc, Pos('EVENT', Struc) + 6 );
if ToFile or ToDir or ToClipboard then if ToFile or ToDir or ToClipboard then
Struc := 'DELIMITER ' + TempDelim + CRLF + Struc + TempDelim + CRLF + 'DELIMITER '; Struc := 'DELIMITER ' + TempDelim + CRLF + Struc + TempDelim + CRLF + 'DELIMITER ';
end; end;
@ -1237,9 +1244,9 @@ begin
if LowerCase(DBObj.Engine) = 'innodb' then if LowerCase(DBObj.Engine) = 'innodb' then
tmp := '~'+tmp+' (approximately)'; tmp := '~'+tmp+' (approximately)';
Output(CRLF+'# Dumping data for table '+DBObj.Database+'.'+DBObj.Name+': '+tmp+CRLF, False, True, True, False, False); Output(CRLF+'# Dumping data for table '+DBObj.Database+'.'+DBObj.Name+': '+tmp+CRLF, False, True, True, False, False);
TargetDbAndObject := DBObj.QuotedName; TargetDbAndObject := Quoter.QuoteIdent(DBObj.Name);
if ToDb then if ToDb then
TargetDbAndObject := DBObj.Connection.QuoteIdent(FinalDbName) + '.' + TargetDbAndObject; TargetDbAndObject := Quoter.QuoteIdent(FinalDbName) + '.' + TargetDbAndObject;
Offset := 0; Offset := 0;
RowCount := 0; RowCount := 0;
// Calculate limit so we select ~100MB per loop // Calculate limit so we select ~100MB per loop
@ -1248,7 +1255,7 @@ begin
Output('DELETE FROM '+TargetDbAndObject, True, True, True, True, True); Output('DELETE FROM '+TargetDbAndObject, True, True, True, True, True);
Output('/*!40000 ALTER TABLE '+TargetDbAndObject+' DISABLE KEYS */', True, True, True, True, True); Output('/*!40000 ALTER TABLE '+TargetDbAndObject+' DISABLE KEYS */', True, True, True, True, True);
while true do begin while true do begin
Data := MainForm.ActiveConnection.GetResults('SELECT * FROM '+DBObj.QuotedDatabase+'.'+DBObj.QuotedName+' LIMIT '+IntToStr(Offset)+', '+IntToStr(Limit)); Data := DBObj.Connection.GetResults('SELECT * FROM '+DBObj.QuotedDatabase+'.'+DBObj.QuotedName+' LIMIT '+IntToStr(Offset)+', '+IntToStr(Limit));
Inc(Offset, Limit); Inc(Offset, Limit);
if Data.RecordCount = 0 then if Data.RecordCount = 0 then
break; break;
@ -1259,7 +1266,7 @@ begin
BaseInsert := 'REPLACE INTO '; BaseInsert := 'REPLACE INTO ';
BaseInsert := BaseInsert + TargetDbAndObject + ' ('; BaseInsert := BaseInsert + TargetDbAndObject + ' (';
for i:=0 to Data.ColumnCount-1 do for i:=0 to Data.ColumnCount-1 do
BaseInsert := BaseInsert + DBObj.Connection.QuoteIdent(Data.ColumnNames[i]) + ', '; BaseInsert := BaseInsert + Quoter.QuoteIdent(Data.ColumnNames[i]) + ', ';
Delete(BaseInsert, Length(BaseInsert)-1, 2); Delete(BaseInsert, Length(BaseInsert)-1, 2);
BaseInsert := BaseInsert + ') VALUES'+CRLF+#9+'('; BaseInsert := BaseInsert + ') VALUES'+CRLF+#9+'(';
while true do begin while true do begin