motor-admin 0.2.24 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 676aa441a86219350a066d51023aa10a7765c93dd155008feca17a76eec74177
-  data.tar.gz: 83c5d373aac0a44407c8f805ea01aee8d8e178802f0efc22121c879e3885d9b6
+  metadata.gz: 2a53555a0c69ed075e09c63deb22a53381efb7d1935542d8ac760f6bbd168044
+  data.tar.gz: 99437be8cbf015ad29890152e45163fc0efbe5f3e747c6d74014640f548f1b28
 SHA512:
-  metadata.gz: fbd445e4805615320ed932974aac218d7ae2092c8751d18762e36550139027cb2f683006c4e419c4f21fff230e3e4c5c6dc837cbb682361b09e9c7ed285a8be8
-  data.tar.gz: 0c5b84920c042f7a55353b6c4e6e9f43366bbc2b044cdd9e6924eddcdcf8b7caf1224c17040bb7003710935528608ff6f83aec9bba9fd8e9cff66920e10b7e4c
+  metadata.gz: 532dfb71de17b84ca9f70c546290ca35261cf8d886a64cb8764bb1c72c512b3d5170ef9572075db026be9c28a64ddd5a4ce455d28c1d0595fbce0eb0e17a8389
+  data.tar.gz: 05c1f902bedf840dca52bf6b3a0229606e43ffcbe156b48431bd72988c81310d5731fe56b55130ddb8260a866d2e789702632502b758bcb9df77d57839d38725

data/lib/motor/configs/load_from_cache.rb

@@ -83,9 +83,7 @@ module Motor
       end
 
       def load_cache_keys
-        result = ActiveRecord::Base.connection.execute(cache_keys_sql).to_a
-
-        result = result.map(&:values) if result.first.is_a?(Hash)
+        result = ActiveRecord::Base.connection.exec_query(cache_keys_sql).rows
 
         result.to_h.with_indifferent_access
       end

data/lib/motor/queries/run_query.rb

@@ -61,7 +61,7 @@ module Motor
       # @return [ActiveRecord::Result]
       def execute_query(query, limit, variables_hash, filters)
         result = nil
-        statement = prepare_sql_statement(query, limit, variables_hash, filters)
+        statement = prepare_sql_statement(connection_class.connection, query, limit, variables_hash, filters)
 
         connection_class.transaction do
           result =
@@ -129,17 +129,18 @@ module Motor
         end
       end
 
+      # @param connection [Object]
       # @param query [Motor::Query]
       # @param limit [Integer]
       # @param variables_hash [Hash]
       # @param filters [Hash]
       # @return [Array]
-      def prepare_sql_statement(query, limit, variables_hash, filters)
+      def prepare_sql_statement(connection, query, limit, variables_hash, filters)
         variables = merge_variable_default_values(query.preferences.fetch(:variables, []), variables_hash)
 
         sql, query_variables = RenderSqlTemplate.call(query.sql_body, variables)
         cte_sql = format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.delete_suffix(';'))
-        cte_select_sql = build_cte_select_sql(limit, filters)
+        cte_select_sql = build_cte_select_sql(connection, limit, filters)
 
         attributes = build_statement_attributes(query_variables)
 
@@ -149,7 +150,7 @@ module Motor
       # @param limit [Number]
       # @param filters [Hash]
       # @return [String]
-      def build_cte_select_sql(limit, filters)
+      def build_cte_select_sql(connection, limit, filters)
         table = Arel::Table.new(CTE_NAME)
 
         arel_filters = build_filters_arel(filters)
@@ -157,7 +158,9 @@ module Motor
         expresion = table.project(table[Arel.star])
         expresion = expresion.where(arel_filters) if arel_filters.present?
 
-        expresion.take(limit.to_i).to_sql.delete('"')
+        expresion.take(limit.to_i) unless connection.class.name.include?('SQLServerAdapter')
+
+        expresion.to_sql.delete('"')
       end
 
       # @param filters [Hash]

data/lib/motor/resources/custom_sql_columns_cache.rb

@@ -9,7 +9,7 @@ module Motor
 
       def call(sql)
         CACHE_STORE.fetch(sql.hash) do
-          Queries::RunQuery.call(Query.new(sql_body: sql), limit: 0).columns
+          Queries::RunQuery.call(Query.new(sql_body: sql), limit: 0).columns || []
         end
       end
     end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.24'
+  VERSION = '0.2.25'
 end

data/ui/dist/manifest.json

@@ -2601,9 +2601,9 @@
   "icons/zoom-out.svg.gz": "icons/zoom-out.svg.gz",
   "icons/zoom-question.svg": "icons/zoom-question.svg",
   "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
-  "main-8421aae2289372e89a1d.css.gz": "main-8421aae2289372e89a1d.css.gz",
-  "main-8421aae2289372e89a1d.js.LICENSE.txt": "main-8421aae2289372e89a1d.js.LICENSE.txt",
-  "main-8421aae2289372e89a1d.js.gz": "main-8421aae2289372e89a1d.js.gz",
-  "main.css": "main-8421aae2289372e89a1d.css",
-  "main.js": "main-8421aae2289372e89a1d.js"
+  "main-0bcdc9f1a27b26d23abd.css.gz": "main-0bcdc9f1a27b26d23abd.css.gz",
+  "main-0bcdc9f1a27b26d23abd.js.LICENSE.txt": "main-0bcdc9f1a27b26d23abd.js.LICENSE.txt",
+  "main-0bcdc9f1a27b26d23abd.js.gz": "main-0bcdc9f1a27b26d23abd.js.gz",
+  "main.css": "main-0bcdc9f1a27b26d23abd.css",
+  "main.js": "main-0bcdc9f1a27b26d23abd.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -1525,8 +1525,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-8421aae2289372e89a1d.css.gz
-- ui/dist/main-8421aae2289372e89a1d.js.gz
+- ui/dist/main-0bcdc9f1a27b26d23abd.css.gz
+- ui/dist/main-0bcdc9f1a27b26d23abd.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: