motor-admin 0.2.75 → 0.2.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9b78349d5fe94d86f874d3523e24dafaac9633eba8af576eba113995ec1a7f
-  data.tar.gz: f31aca38824912083d76dea8aa4940184e7c27ddfbf10869fef996604e4450c8
+  metadata.gz: 18e2c93dd34d0ae77436e9df549dcbe2ef0d3a2db500189a8ee62006937be637
+  data.tar.gz: 4bc2541c6982b92a852de17952a1002113bdf54daa8cdfc2cc517ff24e3986df
 SHA512:
-  metadata.gz: 838c3609255728a2dd03eb8c486d0a2b18d1dd2276038f019384c5f58a8fc2b06dc1efc611eb635e4f3ad3601b249ebc7437bcd33238bcb1af40b8baf1c2848e
-  data.tar.gz: e92db19b2104d4424d322df45f95c9ed543c41c4d84f9cf04c566f9f1d00d118309332c41db644c82b93c3d3ea11bc18544e6df7824853572142b52e97683f83
+  metadata.gz: cef668b01fcd5a5dcb3aaa5cb801f8723d7b4ce9a9641550d1da8ac8643d6dbd1ea76ac41c8652cbe35a50b3f074d354a80b71770188383057471033aff06f14
+  data.tar.gz: e5bdbb4a1f4134fd13e60b30c913f5ef2290295007b73ba74238bcebc52206033b5262d96b15271e6cf39cde04aacf36c752d03bcf0683913e606059f82dcf4d

data/lib/motor/queries/run_query.rb

@@ -145,9 +145,9 @@ module Motor
       # @param filters [Hash]
       # @return [String]
       def build_select_sql(connection_class, sql, limit, filters)
-        sql = sql.strip.delete_suffix(';').gsub(/\A\)+/, '').gsub(/\z\(+/, '')
+        sql = normalize_sql(sql)
 
-        subquery_sql = Arel.sql("(#{sql}) as #{SUBQUERY_NAME}")
+        subquery_sql = Arel.sql("(#{sql})").as(connection_class.connection.quote_column_name(SUBQUERY_NAME))
 
         arel_filters = build_filters_arel(filters)
 
@@ -198,6 +198,10 @@ module Motor
         [sql, 'SQL', attributes]
       end
 
+      def normalize_sql(sql)
+        sql.strip.delete_suffix(';').gsub(/\A\)+/, '').gsub(/\z\(+/, '')
+      end
+
       # @param variable_configs [Array<Hash>]
       # @param variables_hash [Hash]
       # @return [Hash]

data/lib/motor/resources/fetch_configured_model.rb

@@ -45,7 +45,8 @@ module Motor
 
         klass.instance_eval do
           default_scope do
-            from(Arel.sql("(#{self.klass.instance_variable_get(:@__motor_custom_sql)})").as(table_name))
+            from(Arel.sql("(#{self.klass.instance_variable_get(:@__motor_custom_sql)})")
+                     .as(connection.quote_column_name(table_name)))
           end
         end
 

data/lib/motor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.75
+  version: 0.2.76
 platform: ruby
 authors:
 - Pete Matsyburka