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

Include stored functions and procedures in SQL export. Fixes issue #1375.

Browse Source
This commit is contained in:
Ansgar Becker
2009-12-27 13:53:47 +00:00
parent e5ae3a934d
commit bed5dce2fb
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/tabletools.pas
View File

@ -388,21 +388,11 @@ end;
procedure TfrmTableTools.TreeObjectsInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; procedure TfrmTableTools.TreeObjectsInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
var InitialStates: TVirtualNodeInitStates); var InitialStates: TVirtualNodeInitStates);
var
DBObjects: TDBObjectList;
begin begin
// Attach a checkbox to all nodes // Attach a checkbox to all nodes
Mainform.DBtreeInitNode(Sender, ParentNode, Node, InitialStates); Mainform.DBtreeInitNode(Sender, ParentNode, Node, InitialStates);
Node.CheckType := ctTriStateCheckBox; Node.CheckType := ctTriStateCheckBox;
Node.CheckState := csUncheckedNormal; Node.CheckState := csUncheckedNormal;
case Sender.GetNodeLevel(Node) of
2: begin
DBObjects := Mainform.Connection.GetDBObjects(Mainform.Databases[ParentNode.Index]);
// No checkbox for stored routines
if not (DBObjects[Node.Index].NodeType in [lntTable, lntView, lntTrigger]) then
Node.CheckType := ctNone
end;
end;
ValidateControls(Sender); ValidateControls(Sender);
end; end;
@ -858,12 +848,14 @@ procedure TfrmTableTools.DoExport(DBObj: TDBObject);
var var
ToFile, ToDir, ToDb, ToServer, IsLastRowInChunk, NeedsDBStructure: Boolean; ToFile, ToDir, ToDb, ToServer, IsLastRowInChunk, NeedsDBStructure: Boolean;
Struc, Header, FinalDbName, BaseInsert, Row, TargetDbAndObject: WideString; Struc, Header, FinalDbName, BaseInsert, Row, TargetDbAndObject: WideString;
LogRow: TWideStringlist; LogRow, MultiSQL: TWideStringlist;
i: Integer; i: Integer;
RowCount, MaxRowsInChunk, RowsInChunk, Limit, Offset, ResultCount: Int64; RowCount, MaxRowsInChunk, RowsInChunk, Limit, Offset, ResultCount: Int64;
StartTime: Cardinal; StartTime: Cardinal;
StrucResult, Data: TMySQLQuery; StrucResult, Data: TMySQLQuery;
rx: TRegExpr; rx: TRegExpr;
const
TempDelim = '//';
// Short version of Mainform.Mask() // Short version of Mainform.Mask()
function m(s: WideString): WideString; function m(s: WideString): WideString;
@ -985,7 +977,6 @@ begin
case DBObj.NodeType of case DBObj.NodeType of
lntTable, lntView: begin lntTable, lntView: begin
Struc := Mainform.Connection.GetVar('SHOW CREATE TABLE '+m(DBObj.Database)+'.'+m(DBObj.Name), 1); Struc := Mainform.Connection.GetVar('SHOW CREATE TABLE '+m(DBObj.Database)+'.'+m(DBObj.Name), 1);
Struc := fixNewlines(Struc);
// Remove AUTO_INCREMENT clause // Remove AUTO_INCREMENT clause
rx := TRegExpr.Create; rx := TRegExpr.Create;
rx.ModifierI := True; rx.ModifierI := True;
@ -1000,18 +991,26 @@ begin
else if DBObj.NodeType = lntView then else if DBObj.NodeType = lntView then
Insert(m(FinalDbName)+'.', Struc, Pos('VIEW', Struc) + 5 ); Insert(m(FinalDbName)+'.', Struc, Pos('VIEW', Struc) + 5 );
end; end;
Output(Struc, True, True, True, True, True);
end; end;
lntTrigger: begin lntTrigger: begin
StrucResult := Mainform.Connection.GetResults('SHOW TRIGGERS WHERE `Trigger`='+esc(DBObj.Name)); StrucResult := Mainform.Connection.GetResults('SHOW TRIGGERS WHERE `Trigger`='+esc(DBObj.Name));
Output('SET SESSION SQL_MODE='+esc(StrucResult.Col('sql_mode')), True, True, True, True, True); Struc := 'SET SESSION SQL_MODE='+esc(StrucResult.Col('sql_mode'))+';'+CRLF+
Struc := 'CREATE '+m(DBObj.Name)+' '+StrucResult.Col('Timing')+' '+StrucResult.Col('Event')+ 'CREATE '+DBObj.ObjType+' '+m(DBObj.Name)+' '+StrucResult.Col('Timing')+' '+StrucResult.Col('Event')+
' ON '+m(StrucResult.Col('Table'))+' FOR EACH ROW '+StrucResult.Col('Statement'); ' ON '+m(StrucResult.Col('Table'))+' FOR EACH ROW '+StrucResult.Col('Statement')+';'+CRLF+
Output(Struc, True, True, True, True, True); 'SET SESSION SQL_MODE=@OLD_SQL_MODE';
Output('SET SESSION SQL_MODE=@OLD_SQL_MODE', True, True, True, True, True); end;
lntFunction, lntProcedure: begin
Struc := Mainform.Connection.GetVar('SHOW CREATE '+DBObj.ObjType+' '+m(DBObj.Database)+'.'+m(DBObj.Name), 2);
MultiSQL := Explode(';', Struc);
Struc := 'DELIMITER ' + TempDelim + CRLF +
ImplodeStr(';'+CRLF, MultiSQL) + TempDelim + CRLF +
'DELIMITER ';
end; end;
end; end;
Struc := fixNewlines(Struc);
Output(Struc, True, True, True, True, True);
except except
On E:Exception do begin On E:Exception do begin
// Catch the exception message and dump it into the export file for debugging reasons // Catch the exception message and dump it into the export file for debugging reasons