Alter Column now works for MySQL + other updates

Author: Jim Hamill

DatabaseConnectionWidget.cpp

@@ -10,6 +10,7 @@
 #include <QSqlQuery>
 
 #include "Extension/MySQLExtension.h"
+#include "Utilities/QCompressor.h"
 #include "Utilities/SQLSplitter.h"
 
 DatabaseConnectionWidget::DatabaseConnectionWidget(QWidget *parent) :
@@ -122,7 +123,7 @@ bool DatabaseConnectionWidget::connectToDatabase(QString name, QString driver, Q
 bool DatabaseConnectionWidget::importDatabase()
 {
     // Show dialog and get filename
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), tr("SQL Files (*.sql)"));
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), tr("SQL Files (*.sql *gz)"));
 
     // If no filename was specified, just return
     if (fileName.isEmpty()) {
@@ -135,9 +136,17 @@ bool DatabaseConnectionWidget::importDatabase()
         return false;
     }
 
+    // File data
+    QByteArray fileData = file.readAll();
+
+    // Decompress if it is a gzip file
+    QFileInfo fileInfo(fileName);
+    if (fileInfo.suffix() == "gz") {
+        fileData = QCompressor::gzDecompress(fileData);//if (!QCompressor::gzipDecompress(file.readAll(), fileData)) {
+    }
+
     // Read string from file and feed into splitter
-    QTextStream in(&file);
-    SQLSplitter splitter(in.readAll());
+    SQLSplitter splitter(fileData);
 
     // Create Progress Dialog
     QProgressDialog progress("Importing database...", "Abort", 0, splitter.getLength());

Extension/Extension.cpp

@@ -101,6 +101,13 @@ int Extension::removeColumn(QString table, QString column)
     return false;
 }
 
+int Extension::alterColumn(QString table, QString oldName, QString newName, QString type, int length, bool nullable, QString defaultValue)
+{
+    qDebug() << "Alter column not implemented.";
+
+    return false;
+}
+
 void Extension::addRelations(QSqlRelationalTableModel *model)
 {
 

Extension/Extension.h

@@ -39,7 +39,7 @@ enum Capability
     VIEW_SCHEMA = 21,
     ADD_COLUMN = 22,
     REMOVE_COLUMN = 23,
-    EDIT_COLUMN = 24
+    ALTER_COLUMN = 24
 };
 
 enum SchemaColumn
@@ -56,7 +56,8 @@ enum ColumnFlags
     NO_PROPERTIES = 0,
     HAS_LENGTH = 1,
     HAS_NULLABLE = 2,
-    HAS_DEFAULT = 4
+    HAS_DEFAULT = 4,
+    HAS_ENUM = 5
 };
 
 class Extension : public QObject
@@ -86,6 +87,7 @@ Q_OBJECT
     virtual QMap<QString, int> getDataTypes();
     virtual int addColumn(QString table, QString name, QString type, int length = 0, bool nullable = false, QString defaultValue = "");
     virtual int removeColumn(QString table, QString column);
+    virtual int alterColumn(QString table, QString oldName, QString newName, QString type, int length = 0, bool nullable = false, QString defaultValue = "");
 
     virtual void addRelations(QSqlRelationalTableModel *model);
 

Extension/MySQLExtension.cpp

@@ -49,6 +49,7 @@ int MySQLExtension::hasCapability(Capability capability)
         case VIEW_SCHEMA: return true;
         case ADD_COLUMN: return true;
         case REMOVE_COLUMN: return true;
+        case ALTER_COLUMN: return true;
     }
 
     return false;
@@ -107,14 +108,13 @@ int MySQLExtension::exportDatabase()
         // Dump the insert queries
         QSqlQuery selectTableQuery("SELECT * FROM " + table, *m_database);
         if (selectTableQuery.size()) {
-            outputStream << "INSERT INTO `" + table + "` VALUES " << endl;
             while (selectTableQuery.next()) {
-                QString row = "(";
+                QString row = "INSERT INTO `" + table + "` VALUES (";
                 for (int column = 0; column < selectTableQuery.record().count(); column++) {
                     row += m_database->driver()->formatValue(selectTableQuery.record().field(column)) + ",";
                 }
                 row.truncate(row.size()-1);
-                row += "),";
+                row += ");";
                 outputStream << row << endl;
 
                 // If the cancel button was clicked, abort
@@ -125,8 +125,6 @@ int MySQLExtension::exportDatabase()
                 // Update our event loop so that progress dialog updates
                 QCoreApplication::processEvents();
             }
-            outputStream.seek(outputStream.pos()-2);
-            outputStream << ";" << endl << endl;
         }
     }
 
@@ -278,6 +276,34 @@ int MySQLExtension::removeColumn(QString table, QString column)
     return true;
 }
 
+int MySQLExtension::alterColumn(QString table, QString oldName, QString newName, QString type, int length, bool nullable, QString defaultValue)
+{
+    QString queryString = "ALTER TABLE " + table + " CHANGE " + oldName + " " + newName;
+
+    // If there's a length, embed that in type
+    if (length) {
+        type = type + "(" + QString::number(length) + ")";
+    }
+
+    // Add type
+    queryString += " " + type;
+
+    // If nullable is set, add that
+    if (!nullable) {
+        queryString += " NOT NULL";
+    }
+
+    // if default value is set, add that
+    if (defaultValue.length()) {
+        queryString += " DEFAULT '" + defaultValue + "'";
+    }
+
+    // Run the add column query
+    QSqlQuery query = m_database->exec(queryString);
+
+    return true;
+}
+
 SchemaWidget* MySQLExtension::createSchemaWidget(QWidget *parent)
 {
     return new MySQLSchemaWidget(parent, m_database);

Extension/MySQLExtension.h

@@ -32,6 +32,7 @@ Q_OBJECT
     QMap<QString, int> getDataTypes();
     int addColumn(QString table, QString name, QString type, int length = 0, bool nullable = false, QString defaultValue = "");
     int removeColumn(QString table, QString column);
+    int alterColumn(QString table, QString oldName, QString newName, QString type, int length = 0, bool nullable = false, QString defaultValue = "");
 
 private:
     ExtensionTab *m_toolsTab;

SchemaWidget.cpp

@@ -110,6 +110,11 @@ void SchemaWidget::removeColumn()
 
 void SchemaWidget::on_tableView_activated(const QModelIndex &index)
 {
+    // Only open dialog if supports altering column
+    if (!m_extension->hasCapability(ALTER_COLUMN)) {
+        return;
+    }
+
     // Get column name
     QModelIndex nameIndex = ui->tableView->model()->index(ui->tableView->currentIndex().row(), m_extension->getSchemaColumn(NAME));
     QString name = ui->tableView->model()->data(nameIndex).toString();
@@ -129,7 +134,7 @@ void SchemaWidget::on_tableView_activated(const QModelIndex &index)
 
     // Get nullable
     QModelIndex nullableIndex = ui->tableView->model()->index(ui->tableView->currentIndex().row(), m_extension->getSchemaColumn(NULLABLE));
-    bool nullable = ui->tableView->model()->data(nullableIndex).toBool();
+    bool nullable = (ui->tableView->model()->data(nullableIndex).toString() == "YES") ? true : false;
 
     // Get default value
     QModelIndex defaultValueIndex = ui->tableView->model()->index(ui->tableView->currentIndex().row(), m_extension->getSchemaColumn(DEFAULT_VALUE));
@@ -146,7 +151,7 @@ void SchemaWidget::on_tableView_activated(const QModelIndex &index)
     columnDialog.exec();
 
     // Actually add the column
-    m_extension->addColumn(m_tableName, columnDialog.getName(), columnDialog.getType(), columnDialog.getLength(),
+    m_extension->alterColumn(m_tableName, name, columnDialog.getName(), columnDialog.getType(), columnDialog.getLength(),
                            columnDialog.getNullable(), columnDialog.getDefault());
 
     // Refresh schema

Utilities/QCompressor.cpp

@@ -1,5 +1,7 @@
 #include "QCompressor.h"
 
+#include <QDebug>
+
 /**
  * @brief Compresses the given buffer using the standard GZIP algorithm
  * @param input The buffer to be compressed
@@ -169,7 +171,7 @@ bool QCompressor::gzipDecompress(QByteArray input, QByteArray &output)
                 case Z_STREAM_ERROR:
                     // Clean-up
                     inflateEnd(&strm);
-
+                    qDebug() << "ZStreamError";
                     // Return
                     return(false);
                 }
@@ -194,3 +196,53 @@ bool QCompressor::gzipDecompress(QByteArray input, QByteArray &output)
     else
         return(true);
 }
+
+QByteArray QCompressor::gzDecompress(QByteArray &data)
+{
+    if (data.size() <= 4) {
+        qWarning("gUncompress: Input data is truncated");
+        return QByteArray();
+    }
+
+    QByteArray result;
+
+    int ret;
+    z_stream strm;
+    static const int CHUNK_SIZE = 1024;
+    char out[CHUNK_SIZE];
+
+    /* allocate inflate state */
+    strm.zalloc = Z_NULL;
+    strm.zfree = Z_NULL;
+    strm.opaque = Z_NULL;
+    strm.avail_in = data.size();
+    strm.next_in = (Bytef*)(data.data());
+
+    ret = inflateInit2(&strm, 15 +  32); // gzip decoding
+    if (ret != Z_OK)
+        return QByteArray();
+
+    // run inflate()
+    do {
+        strm.avail_out = CHUNK_SIZE;
+        strm.next_out = (Bytef*)(out);
+
+        ret = inflate(&strm, Z_NO_FLUSH);
+        Q_ASSERT(ret != Z_STREAM_ERROR);  // state not clobbered
+
+        switch (ret) {
+        case Z_NEED_DICT:
+            ret = Z_DATA_ERROR;     // and fall through
+        case Z_DATA_ERROR:
+        case Z_MEM_ERROR:
+            (void)inflateEnd(&strm);
+            return QByteArray();
+        }
+
+        result.append(out, CHUNK_SIZE - strm.avail_out);
+    } while (strm.avail_out == 0);
+
+    // clean up and return
+    inflateEnd(&strm);
+    return result;
+}

Utilities/QCompressor.h

@@ -12,6 +12,8 @@ class QCompressor
 public:
     static bool gzipCompress(QByteArray input, QByteArray &output, int level = -1);
     static bool gzipDecompress(QByteArray input, QByteArray &output);
+
+    static QByteArray gzDecompress(QByteArray &data);
 };
 
-#endif // QCOMPRESSOR_H
+#endif // QCOMPRESSOR_H