Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 10 insertions, 1 deletions

diff --git a/Plugins/SqlExport/sqlexport.cpp b/Plugins/SqlExport/sqlexport.cpp
index 0a379b1..15e47ed 100644
--- a/Plugins/SqlExport/sqlexport.cpp
+++ b/Plugins/SqlExport/sqlexport.cpp
@@ -145,6 +145,7 @@ bool SqlExport::exportTableRow(SqlResultsRowPtr data)
 bool SqlExport::afterExport()
 {
     writeCommit();
+    writeFkEnable();
     return true;
 }
 
@@ -237,12 +238,20 @@ void SqlExport::writeFkDisable()
     writeln("PRAGMA foreign_keys = off;");
 }
 
+void SqlExport::writeFkEnable()
+{
+    writeln("PRAGMA foreign_keys = on;");
+}
+
 QString SqlExport::formatQuery(const QString& sql)
 {
     if (cfg.SqlExport.UseFormatter.get())
         return FORMATTER->format("sql", sql, db);
 
-    return sql;
+    if (sql.trimmed().endsWith(";"))
+        return sql;
+
+    return sql.trimmed() + ";";
 }
 
 QString SqlExport::getNameForObject(const QString& database, const QString& name, bool wrapped, Dialect dialect)