Bug fixes

Author: Jim Hamill

ExplorerWidget.cpp

@@ -103,7 +103,7 @@ void ExplorerWidget::addTable()
 void ExplorerWidget::removeTable()
 {
     // Display messagebox for confirmation
-    if (QMessageBox::Yes == QMessageBox::question(this, "Drop Table", "Are you sure you want to drop this table?")) {
+    if (ui->tableListWidget->currentItem() && QMessageBox::Yes == QMessageBox::question(this, "Drop Table", "Are you sure you want to drop this table?")) {
 
         // Get table name
         QString table = ui->tableListWidget->currentItem()->text();

Extension/MySQLExtension.cpp

@@ -234,6 +234,7 @@ QMap<QString, int> MySQLExtension::getDataTypes()
     types["text"] = NO_PROPERTIES;
     types["varchar"] = HAS_LENGTH | HAS_NULLABLE | HAS_DEFAULT;
     types["int"] = HAS_LENGTH + HAS_NULLABLE + HAS_DEFAULT;
+    types["int unsigned"] = HAS_LENGTH + HAS_NULLABLE + HAS_DEFAULT;
     types["date"] = NO_PROPERTIES;;
     types["datetime"] = NO_PROPERTIES;;
     types["timestamp"] = NO_PROPERTIES;;

QueryWidget.cpp

@@ -17,8 +17,9 @@ QueryWidget::QueryWidget(QWidget *parent) :
     // Attach SQL Highlighter
     m_highlighter = new SQLHighlighter(ui->queryEdit->document());
 
-    // Connect history's click with fill function
+    // Connect history and saved queries
     connect(ui->queryHistoryWidget, SIGNAL(querySelected(QString)), this, SLOT(setQuery(QString)));
+    connect(ui->savedQueryWidget, SIGNAL(querySelected(QString)), this, SLOT(setQuery(QString)));
     connect(ui->savedQueryWidget, SIGNAL(addButtonClicked()), this, SLOT(saveQuery()));
 }
 

QuteSQL.pro

@@ -11,6 +11,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = qutesql
 TEMPLATE = app
 
+LIBS += -lz
+
 VERSION = 0.1
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
@@ -34,7 +36,8 @@ SOURCES += main.cpp\
     ColumnDialog.cpp \
     Database.cpp \
     Utilities/SQLSplitter.cpp \
-    Tools/SQLSplitterDialog.cpp
+    Tools/SQLSplitterDialog.cpp \
+    Utilities/QCompressor.cpp
 
 HEADERS  += MainWindow.h \
     DatabaseConnectionWidget.h \
@@ -55,7 +58,8 @@ HEADERS  += MainWindow.h \
     ColumnDialog.h \
     Database.h \
     Utilities/SQLSplitter.h \
-    Tools/SQLSplitterDialog.h
+    Tools/SQLSplitterDialog.h \
+    Utilities/QCompressor.h
 
 FORMS    += MainWindow.ui \
     DatabaseConnectionWidget.ui \

QuteSQL.pro.user

@@ -74,3 +74,8 @@ void SavedQueryWidget::saveQueries()
     }
     settings.endArray();
 }
+
+void SavedQueryWidget::on_listWidget_itemActivated(QListWidgetItem *item)
+{
+    emit querySelected(item->text());
+}

SavedQueryWidget.cpp

@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include <QSqlDatabase>
+#include <QListWidgetItem>
 
 namespace Ui {
 class SavedQueryWidget;
@@ -30,10 +31,12 @@ class SavedQueryWidget : public QWidget
 
 signals:
     void addButtonClicked();
+    void querySelected(const QString &);
 
 private slots:
     void on_addButton_clicked();
     void on_removeButton_clicked();
+    void on_listWidget_itemActivated(QListWidgetItem *item);
 };
 
 #endif // SAVEDQUERYWIDGET_H

SavedQueryWidget.h

@@ -0,0 +1,196 @@
+#include "QCompressor.h"
+
+/**
+ * @brief Compresses the given buffer using the standard GZIP algorithm
+ * @param input The buffer to be compressed
+ * @param output The result of the compression
+ * @param level The compression level to be used (@c 0 = no compression, @c 9 = max, @c -1 = default)
+ * @return @c true if the compression was successful, @c false otherwise
+ */
+bool QCompressor::gzipCompress(QByteArray input, QByteArray &output, int level)
+{
+    // Prepare output
+    output.clear();
+
+    // Is there something to do?
+    if(input.length())
+    {
+        // Declare vars
+        int flush = 0;
+
+        // Prepare deflater status
+        z_stream strm;
+        strm.zalloc = Z_NULL;
+        strm.zfree = Z_NULL;
+        strm.opaque = Z_NULL;
+        strm.avail_in = 0;
+        strm.next_in = Z_NULL;
+
+        // Initialize deflater
+        int ret = deflateInit2(&strm, qMax(-1, qMin(9, level)), Z_DEFLATED, GZIP_WINDOWS_BIT, 8, Z_DEFAULT_STRATEGY);
+
+        if (ret != Z_OK)
+            return(false);
+
+        // Prepare output
+        output.clear();
+
+        // Extract pointer to input data
+        char *input_data = input.data();
+        int input_data_left = input.length();
+
+        // Compress data until available
+        do {
+            // Determine current chunk size
+            int chunk_size = qMin(GZIP_CHUNK_SIZE, input_data_left);
+
+            // Set deflater references
+            strm.next_in = (unsigned char*)input_data;
+            strm.avail_in = chunk_size;
+
+            // Update interval variables
+            input_data += chunk_size;
+            input_data_left -= chunk_size;
+
+            // Determine if it is the last chunk
+            flush = (input_data_left <= 0 ? Z_FINISH : Z_NO_FLUSH);
+
+            // Deflate chunk and cumulate output
+            do {
+
+                // Declare vars
+                char out[GZIP_CHUNK_SIZE];
+
+                // Set deflater references
+                strm.next_out = (unsigned char*)out;
+                strm.avail_out = GZIP_CHUNK_SIZE;
+
+                // Try to deflate chunk
+                ret = deflate(&strm, flush);
+
+                // Check errors
+                if(ret == Z_STREAM_ERROR)
+                {
+                    // Clean-up
+                    deflateEnd(&strm);
+
+                    // Return
+                    return(false);
+                }
+
+                // Determine compressed size
+                int have = (GZIP_CHUNK_SIZE - strm.avail_out);
+
+                // Cumulate result
+                if(have > 0)
+                    output.append((char*)out, have);
+
+            } while (strm.avail_out == 0);
+
+        } while (flush != Z_FINISH);
+
+        // Clean-up
+        (void)deflateEnd(&strm);
+
+        // Return
+        return(ret == Z_STREAM_END);
+    }
+    else
+        return(true);
+}
+
+/**
+ * @brief Decompresses the given buffer using the standard GZIP algorithm
+ * @param input The buffer to be decompressed
+ * @param output The result of the decompression
+ * @return @c true if the decompression was successfull, @c false otherwise
+ */
+bool QCompressor::gzipDecompress(QByteArray input, QByteArray &output)
+{
+    // Prepare output
+    output.clear();
+
+    // Is there something to do?
+    if(input.length() > 0)
+    {
+        // Prepare inflater status
+        z_stream strm;
+        strm.zalloc = Z_NULL;
+        strm.zfree = Z_NULL;
+        strm.opaque = Z_NULL;
+        strm.avail_in = 0;
+        strm.next_in = Z_NULL;
+
+        // Initialize inflater
+        int ret = inflateInit2(&strm, GZIP_WINDOWS_BIT);
+
+        if (ret != Z_OK)
+            return(false);
+
+        // Extract pointer to input data
+        char *input_data = input.data();
+        int input_data_left = input.length();
+
+        // Decompress data until available
+        do {
+            // Determine current chunk size
+            int chunk_size = qMin(GZIP_CHUNK_SIZE, input_data_left);
+
+            // Check for termination
+            if(chunk_size <= 0)
+                break;
+
+            // Set inflater references
+            strm.next_in = (unsigned char*)input_data;
+            strm.avail_in = chunk_size;
+
+            // Update interval variables
+            input_data += chunk_size;
+            input_data_left -= chunk_size;
+
+            // Inflate chunk and cumulate output
+            do {
+
+                // Declare vars
+                char out[GZIP_CHUNK_SIZE];
+
+                // Set inflater references
+                strm.next_out = (unsigned char*)out;
+                strm.avail_out = GZIP_CHUNK_SIZE;
+
+                // Try to inflate chunk
+                ret = inflate(&strm, Z_NO_FLUSH);
+
+                switch (ret) {
+                case Z_NEED_DICT:
+                    ret = Z_DATA_ERROR;
+                case Z_DATA_ERROR:
+                case Z_MEM_ERROR:
+                case Z_STREAM_ERROR:
+                    // Clean-up
+                    inflateEnd(&strm);
+
+                    // Return
+                    return(false);
+                }
+
+                // Determine decompressed size
+                int have = (GZIP_CHUNK_SIZE - strm.avail_out);
+
+                // Cumulate result
+                if(have > 0)
+                    output.append((char*)out, have);
+
+            } while (strm.avail_out == 0);
+
+        } while (ret != Z_STREAM_END);
+
+        // Clean-up
+        inflateEnd(&strm);
+
+        // Return
+        return (ret == Z_STREAM_END);
+    }
+    else
+        return(true);
+}

Utilities/QCompressor.cpp

@@ -0,0 +1,17 @@
+#ifndef QCOMPRESSOR_H
+#define QCOMPRESSOR_H
+
+#include <zlib.h>
+#include <QByteArray>
+
+#define GZIP_WINDOWS_BIT 15 + 16
+#define GZIP_CHUNK_SIZE 32 * 1024
+
+class QCompressor
+{
+public:
+    static bool gzipCompress(QByteArray input, QByteArray &output, int level = -1);
+    static bool gzipDecompress(QByteArray input, QByteArray &output);
+};
+
+#endif // QCOMPRESSOR_H