blazer 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8f87990be2cd7082b9e63283da48848a6815c38
-  data.tar.gz: cdaacc750e40af335e7ce7d32e208f60b5ac9dc5
+  metadata.gz: 0960679b538f12dd8fc9df631a6dc5c66e3a17b4
+  data.tar.gz: 8207552bf1024524b3f32d0719b38c98666ee7a7
 SHA512:
-  metadata.gz: edb80ba4ba8372ac7118ff28b1b3025dcefb13f4ab5a816ce1c6039720b6911bebe4666ea5e7f5e9b190b4cee1ffd00af9f755723cf6c1becaf2e83718f15a1e
-  data.tar.gz: 9625b2373ebcef0a78556a4bbb8613b77e879c4dab9618175e3aadd41c138873e716b26a12df8d3ee4a14ffff0c65269455b9831ec7d8555a154b8a0b43f7997
+  metadata.gz: 9a47660580a4ab89a49e9ff6e95838c742056b9b025143eda6bf2cba494842b6f182b8f21fe4b08a0d3b06d31721fc53599339358c149c95f06a874d92fbd93a
+  data.tar.gz: 7aa7dc39d4b669a1bc3988180a70ad7f8b9e3fe8d9ed92e830e6504a86b1244dd17d71d0e1fe6c32d117f644fa5a6823a396dc0d76d331e40c56ad4eee89ff1d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.7.7
+
+- Fixed preview error for MySQL
+- Fixed error with timeouts for MySQL
+
 ## 1.7.6
 
 - Added scatter chart

data/app/views/blazer/queries/_form.html.erb

@@ -218,7 +218,7 @@
       var $select = $("#table_names").selectize({})
       var selectize = $select[0].selectize
       selectize.on("change", function(val) {
-        editor.setValue(previewStatement[_this.dataSource].replace("{table}", '"' + val + '"'), 1)
+        editor.setValue(previewStatement[_this.dataSource].replace("{table}", val), 1)
         _this.run()
         selectize.clear(true)
         selectize.blur()

data/lib/blazer/adapters/sql_adapter.rb

@@ -51,7 +51,11 @@ module Blazer
       end
 
       def preview_statement
-        "SELECT * FROM {table} LIMIT 10"
+        if postgresql?
+          "SELECT * FROM \"{table}\" LIMIT 10"
+        else
+          "SELECT * FROM {table} LIMIT 10"
+        end
       end
 
       def reconnect
@@ -93,6 +97,11 @@ module Blazer
         connection_model.connection.select_all(statement)
       end
 
+      # seperate from select_all to prevent mysql error
+      def execute(statement)
+        connection_model.connection.execute(statement)
+      end
+
       def postgresql?
         ["PostgreSQL", "PostGIS"].include?(adapter_name)
       end
@@ -116,9 +125,9 @@ module Blazer
 
       def set_timeout(timeout)
         if postgresql? || redshift?
-          select_all("SET #{use_transaction? ? "LOCAL " : ""}statement_timeout = #{timeout.to_i * 1000}")
+          execute("SET #{use_transaction? ? "LOCAL " : ""}statement_timeout = #{timeout.to_i * 1000}")
         elsif mysql?
-          select_all("SET max_execution_time = #{timeout.to_i * 1000}")
+          execute("SET max_execution_time = #{timeout.to_i * 1000}")
         else
           raise Blazer::TimeoutNotSupported, "Timeout not supported for #{adapter_name} adapter"
         end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.7.6"
+  VERSION = "1.7.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails