SQL Splitter Dialog added

Author: Jim Hamill

MainWindow.cpp

@@ -11,6 +11,7 @@
 
 #include "OpenConnectionDialog.h"
 #include "DatabaseConnectionWidget.h"
+#include "Tools/SQLSplitterDialog.h"
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -177,3 +178,9 @@ void MainWindow::on_actionRefresh_triggered()
         m_currentDatabase->refresh();
     }
 }
+
+void MainWindow::on_actionSplit_SQL_File_triggered()
+{
+    SQLSplitterDialog dialog;
+    dialog.exec();
+}

MainWindow.h

@@ -34,6 +34,8 @@ private slots:
 
     void on_actionRefresh_triggered();
 
+    void on_actionSplit_SQL_File_triggered();
+
 signals:
     void statusEvent(const QString&);
 

MainWindow.ui

@@ -14,7 +14,9 @@
    <string>QuteSQL</string>
   </property>
   <property name="windowIcon">
-   <iconset theme="server-database"/>
+   <iconset theme="server-database">
+    <normaloff/>
+   </iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
    <property name="sizePolicy">
@@ -103,6 +105,8 @@
     <property name="title">
      <string>Tools</string>
     </property>
+    <addaction name="separator"/>
+    <addaction name="actionSplit_SQL_File"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -141,7 +145,9 @@
   </widget>
   <action name="actionNew_Connection">
    <property name="icon">
-    <iconset theme="connect"/>
+    <iconset theme="connect">
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>New Connection</string>
@@ -152,15 +158,19 @@
   </action>
   <action name="actionClose_Connection">
    <property name="icon">
-    <iconset theme="disconnect"/>
+    <iconset theme="disconnect">
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Close Connection</string>
    </property>
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset theme="application-exit"/>
+    <iconset theme="application-exit">
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Quit</string>
@@ -191,7 +201,9 @@
   </action>
   <action name="actionRefresh">
    <property name="icon">
-    <iconset theme="view-refresh"/>
+    <iconset theme="view-refresh">
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Refresh</string>
@@ -200,6 +212,14 @@
     <string>Refresh the current database</string>
    </property>
   </action>
+  <action name="actionSplit_SQL_File">
+   <property name="icon">
+    <iconset theme="edit-table-cell-split"/>
+   </property>
+   <property name="text">
+    <string>Split SQL File</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>

QuteSQL.pro

@@ -31,7 +31,8 @@ SOURCES += main.cpp\
     SavedQueryWidget.cpp \
     ColumnDialog.cpp \
     Database.cpp \
-    Utilities/SQLSplitter.cpp
+    Utilities/SQLSplitter.cpp \
+    Tools/SQLSplitterDialog.cpp
 
 HEADERS  += MainWindow.h \
     DatabaseConnectionWidget.h \
@@ -51,7 +52,8 @@ HEADERS  += MainWindow.h \
     SavedQueryWidget.h \
     ColumnDialog.h \
     Database.h \
-    Utilities/SQLSplitter.h
+    Utilities/SQLSplitter.h \
+    Tools/SQLSplitterDialog.h
 
 FORMS    += MainWindow.ui \
     DatabaseConnectionWidget.ui \
@@ -65,7 +67,8 @@ FORMS    += MainWindow.ui \
     ExportSelectionDialog.ui \
     QueryHistoryWidget.ui \
     SavedQueryWidget.ui \
-    ColumnDialog.ui
+    ColumnDialog.ui \
+    Tools/SQLSplitterDialog.ui
 
 target.path = /usr/bin
 

QuteSQL.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.1, 2015-07-23T12:15:23. -->
+<!-- Written by QtCreator 3.0.1, 2015-07-23T13:11:03. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

README.md

@@ -1,2 +1,23 @@
 # QuteSQL
-A Qt-based SQL Editor and Explorer
+
+## Todo
+
+- Create wrapper QSqlDatabase class (with functions like executeQuery(), getName(), etc)
+- Create log tab that shows history of all SQL commands executed.
+- Store settings in SQLite Database (Storing using QSettings is inconvenient with arrays.)
+- Export selected
+- SQL Splitter
+
+## SQLite Database Schema
+
+databases
+id | host | port | username | password | ssh_hostname | ssh_port
+
+queries
+id | database_id | type (SAVED/HISTORY) | created_at | query
+
+relations
+id | database_id | table | column | foreign_table | foreign_column | display_column*
+
+* This field is important and is the reason we need to store this in the database (as opposed to detecting it each time upon opening the database)
+

SqlWidget.cpp

@@ -33,7 +33,7 @@ void SqlWidget::setDatabase(QSqlDatabase database)
 void SqlWidget::on_loadFromFileButton_clicked()
 {
     // Show dialog and get filename
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "/home/jana", tr("SQL Files (*.sql)"));
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), tr("SQL Files (*.sql)"));
 
     // If no filename was specified, just return
     if (fileName.isEmpty()) {
@@ -74,7 +74,7 @@ void SqlWidget::on_runSqlButton_clicked()
         if (!query.exec(statement)) {
 
             // Always show debug message
-            //qDebug() << "Error: " << statement;
+            qDebug() << "Error: " << statement;
 
             // Only show error if the box is ticked
             if (ui->showErrorsCheckBox->isChecked()) {

Tools/SQLSplitterDialog.cpp

@@ -0,0 +1,82 @@
+#include "SQLSplitterDialog.h"
+#include "ui_SQLSplitterDialog.h"
+
+#include <QFileDialog>
+#include <QString>
+#include <QMessageBox>
+
+#include "Utilities/SQLSplitter.h"
+
+SQLSplitterDialog::SQLSplitterDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::SQLSplitterDialog)
+{
+    ui->setupUi(this);
+}
+
+SQLSplitterDialog::~SQLSplitterDialog()
+{
+    delete ui;
+}
+
+void SQLSplitterDialog::on_inputFileButton_clicked()
+{
+    // Show dialog and get filename
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), tr("SQL Files (*.sql)"));
+
+    // Set the input box filename
+    ui->inputFileEdit->setText(fileName);
+}
+
+void SQLSplitterDialog::on_outputFileButton_clicked()
+{
+    // Show dialog and get filename
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Open File"), QDir::homePath(), tr("SQL Files (*.sql)"));
+
+    // Set the input box filename
+    ui->outputFileEdit->setText(fileName);
+}
+
+void SQLSplitterDialog::on_buttonBox_accepted()
+{
+    // Setup files and variables
+    int part = 1;
+    int maxSize = ui->sizeSpinBox->text().toInt() * 1000;
+    QFile inputFile(ui->inputFileEdit->text());
+    QFile outputFile(ui->outputFileEdit->text() + "." + QString::number(part));
+
+    // If the file exists, open it
+    if (inputFile.open(QFile::ReadOnly | QFile::Text) && outputFile.open(QFile::WriteOnly | QFile::Text)) {
+        SQLSplitter splitter(inputFile.readAll());
+
+        // Split the statements until the end
+        while (!splitter.atEnd()) {
+            QString nextStatement = splitter.getNext();
+
+            // If the next statement is bigger than the max permitted size, abort!
+            if (nextStatement.length() > maxSize) {
+                QMessageBox::critical(this, "Unable to split file", "A statement in this file is larger than the permitted max file size.");
+                inputFile.close();
+                outputFile.close();
+                return;
+            }
+
+            // Check if we need to start a new file
+            if (outputFile.size() + nextStatement.length() > maxSize) {
+                part++;
+                outputFile.close();
+                outputFile.setFileName(ui->outputFileEdit->text() + "." + QString::number(part));
+                outputFile.open(QFile::WriteOnly | QFile::Text);
+            }
+
+            // Write the statement to the file
+            outputFile.write(nextStatement.toUtf8());
+        }
+
+        // Close our files
+        inputFile.close();
+        outputFile.close();
+
+        QMessageBox::information(this, "Operation Successful", "File has been successfully split.");
+    }
+}

Tools/SQLSplitterDialog.h

@@ -0,0 +1,29 @@
+#ifndef SQLSPLITTERDIALOG_H
+#define SQLSPLITTERDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class SQLSplitterDialog;
+}
+
+class SQLSplitterDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit SQLSplitterDialog(QWidget *parent = 0);
+    ~SQLSplitterDialog();
+
+private slots:
+    void on_inputFileButton_clicked();
+
+    void on_outputFileButton_clicked();
+
+    void on_buttonBox_accepted();
+
+private:
+    Ui::SQLSplitterDialog *ui;
+};
+
+#endif // SQLSPLITTERDIALOG_H