Lots of changes

Author: Jim Hamill

Database.cpp

@@ -63,7 +63,7 @@ bool DatabaseConnectionWidget::createSshTunnel(QString hostname, int remotePort,
     m_sshTunnel.start("ssh", arguments);
 
     // Wait until finished
-    if (!m_sshTunnel.waitForFinished(20000)) {
+    if (!m_sshTunnel.waitForFinished(30000)) {
         return false;
     }
 
@@ -137,16 +137,28 @@ bool DatabaseConnectionWidget::importDatabase()
     }
 
     // File data
-    QByteArray fileData = file.readAll();
+    //QByteArray fileData = file.readAll();
+    QByteArray decompressed;
 
     // Decompress if it is a gzip file
     QFileInfo fileInfo(fileName);
     if (fileInfo.suffix() == "gz") {
-        fileData = QCompressor::gzDecompress(fileData);//if (!QCompressor::gzipDecompress(file.readAll(), fileData)) {
+        /*if (!QCompressor::gzipDecompress(fileData, decompressed)) {
+            return false;
+        }*/
+
+        //decompressed = QCompressor::gzDecompress(fileData);
+
+        //qDebug() << decompressed;
+
+        // Let the user know that this is broken
+        QMessageBox::warning(this, "Operation Failed", "Compressed databases are not supported at this time.");
+
+        return false;
     }
 
     // Read string from file and feed into splitter
-    SQLSplitter splitter(fileData);
+    SQLSplitter splitter(&file);
 
     // Create Progress Dialog
     QProgressDialog progress("Importing database...", "Abort", 0, splitter.getLength());
@@ -172,6 +184,9 @@ bool DatabaseConnectionWidget::importDatabase()
 
         // Increment progress bar value
         progress.setValue(splitter.getPosition());
+
+        // Update our event loop so that progress dialog updates
+        QCoreApplication::processEvents();
     }
 
     // Let the user know the code has been run

Database.h

@@ -180,6 +180,11 @@ int MySQLExtension::createTable(QString table)
     // Run the drop query
     QSqlQuery query = m_database->exec("CREATE TABLE " + table + "(id INT NOT NULL AUTO_INCREMENT, PRIMARY KEY(id))");
 
+    // Check if there was an error and display it if there was
+    if (query.lastError().type() != QSqlError::NoError) {
+        QMessageBox::critical(qApp->activeWindow(), "Operation failed", query.lastError().text());
+    }
+
     return true;
 }
 
@@ -188,6 +193,11 @@ int MySQLExtension::removeTable(QString table)
     // Run the drop query
     QSqlQuery query = m_database->exec("SET foreign_key_checks = 0; DROP TABLE " + table + "; SET foreign_key_checks = 1;");
 
+    // Check if there was an error and display it if there was
+    if (query.lastError().type() != QSqlError::NoError) {
+        QMessageBox::critical(qApp->activeWindow(), "Operation failed", query.lastError().text());
+    }
+
     return true;
 }
 
@@ -196,6 +206,11 @@ int MySQLExtension::renameTable(QString from, QString to)
     // Run the rename query
     QSqlQuery query = m_database->exec("RENAME TABLE " + from + " TO " + to);
 
+    // Check if there was an error and display it if there was
+    if (query.lastError().type() != QSqlError::NoError) {
+        QMessageBox::critical(qApp->activeWindow(), "Operation failed", query.lastError().text());
+    }
+
     return true;
 }
 
@@ -265,6 +280,11 @@ int MySQLExtension::addColumn(QString table, QString name, QString type, int len
     // Run the add column query
     QSqlQuery query = m_database->exec(queryString);
 
+    // Check if there was an error and display it if there was
+    if (query.lastError().type() != QSqlError::NoError) {
+        QMessageBox::critical(qApp->activeWindow(), "Operation failed", query.lastError().text());
+    }
+
     return true;
 }
 
@@ -273,6 +293,11 @@ int MySQLExtension::removeColumn(QString table, QString column)
     // Run the rename query
     QSqlQuery query = m_database->exec("ALTER TABLE " + table + " DROP COLUMN " + column);
 
+    // Check if there was an error and display it if there was
+    if (query.lastError().type() != QSqlError::NoError) {
+        QMessageBox::critical(qApp->activeWindow(), "Operation failed", query.lastError().text());
+    }
+
     return true;
 }
 
@@ -301,10 +326,10 @@ int MySQLExtension::alterColumn(QString table, QString oldName, QString newName,
     // Run the add column query
     QSqlQuery query = m_database->exec(queryString);
 
-    return true;
-}
+    // Check if there was an error and display it if there was
+    if (query.lastError().type() != QSqlError::NoError) {
+        QMessageBox::critical(qApp->activeWindow(), "Operation failed", query.lastError().text());
+    }
 
-SchemaWidget* MySQLExtension::createSchemaWidget(QWidget *parent)
-{
-    return new MySQLSchemaWidget(parent, m_database);
+    return true;
 }

DatabaseConnectionWidget.cpp

@@ -4,6 +4,7 @@
 #include <QSqlDatabase>
 #include <QFileDialog>
 #include <QSettings>
+#include <QStandardPaths>
 #include <QDebug>
 
 OpenConnectionDialog::OpenConnectionDialog(QWidget *parent) :
@@ -120,6 +121,12 @@ void OpenConnectionDialog::on_driverCombo_currentIndexChanged(const QString &arg
         ui->portSpinBox->setEnabled(true);
         ui->portSpinBox->setValue(3306);
         ui->sshTunnelCheckBox->setEnabled(true);
+
+        // Check to see if ssh is on this computer
+        if (QStandardPaths::findExecutable("ssh").isEmpty()) {
+            ui->sshTunnelCheckBox->setEnabled(false);
+            ui->sshTunnelCheckBox->setToolTip("SSH could not be found on this machine.");
+        }
     }
 }
 
@@ -315,28 +322,3 @@ void OpenConnectionDialog::on_sshTunnelCheckBox_toggled(bool checked)
         ui->hostnameEdit->setText("127.0.0.1");
     }
 }
-
-void OpenConnectionDialog::initDatabase()
-{
-    QString connectionsQuery =
-    "CREATE TABLE connections(id INT PRIMARY KEY NOT NULL,"
-    "                         driver TEXT NOT NULL,"
-    "                         name TEXT NOT NULL,"
-    "                         database TEXT NOT NULL,"
-    "                         username TEXT,"
-    "                         password TEXT,"
-    "                         hostname TEXT,"
-    "                         port INTEGER,"
-    "                         sshTunnel INTEGER,"
-    "                         sshHostname TEXT,"
-    "                         sshPort INTEGER"
-    "                         );";
-
-    QString savedQuery =
-    "CREATE TABLE saved(id INTEGER PRIMARY KEY NOT NULL,"
-    "                   name TEXT NOT NULL,"
-    "                   command TEXT NOT NULL,"
-    "                   connection_id INTEGER NOT NULL"
-    "                   FOREIGN KEY(connection_id) REFERENCES connections(id)"
-    "                   );";
-}

Extension/MySQLExtension.cpp

@@ -68,8 +68,6 @@ private slots:
 private:
     void reloadConnections();
 
-    void initDatabase();
-
 private:
     Ui::OpenConnectionDialog *ui;