motor-admin 0.2.75 → 0.2.76

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8f9b78349d5fe94d86f874d3523e24dafaac9633eba8af576eba113995ec1a7f
4
- data.tar.gz: f31aca38824912083d76dea8aa4940184e7c27ddfbf10869fef996604e4450c8
3
+ metadata.gz: 18e2c93dd34d0ae77436e9df549dcbe2ef0d3a2db500189a8ee62006937be637
4
+ data.tar.gz: 4bc2541c6982b92a852de17952a1002113bdf54daa8cdfc2cc517ff24e3986df
5
5
  SHA512:
6
- metadata.gz: 838c3609255728a2dd03eb8c486d0a2b18d1dd2276038f019384c5f58a8fc2b06dc1efc611eb635e4f3ad3601b249ebc7437bcd33238bcb1af40b8baf1c2848e
7
- data.tar.gz: e92db19b2104d4424d322df45f95c9ed543c41c4d84f9cf04c566f9f1d00d118309332c41db644c82b93c3d3ea11bc18544e6df7824853572142b52e97683f83
6
+ metadata.gz: cef668b01fcd5a5dcb3aaa5cb801f8723d7b4ce9a9641550d1da8ac8643d6dbd1ea76ac41c8652cbe35a50b3f074d354a80b71770188383057471033aff06f14
7
+ data.tar.gz: e5bdbb4a1f4134fd13e60b30c913f5ef2290295007b73ba74238bcebc52206033b5262d96b15271e6cf39cde04aacf36c752d03bcf0683913e606059f82dcf4d
@@ -145,9 +145,9 @@ module Motor
145
145
  # @param filters [Hash]
146
146
  # @return [String]
147
147
  def build_select_sql(connection_class, sql, limit, filters)
148
- sql = sql.strip.delete_suffix(';').gsub(/\A\)+/, '').gsub(/\z\(+/, '')
148
+ sql = normalize_sql(sql)
149
149
 
150
- subquery_sql = Arel.sql("(#{sql}) as #{SUBQUERY_NAME}")
150
+ subquery_sql = Arel.sql("(#{sql})").as(connection_class.connection.quote_column_name(SUBQUERY_NAME))
151
151
 
152
152
  arel_filters = build_filters_arel(filters)
153
153
 
@@ -198,6 +198,10 @@ module Motor
198
198
  [sql, 'SQL', attributes]
199
199
  end
200
200
 
201
+ def normalize_sql(sql)
202
+ sql.strip.delete_suffix(';').gsub(/\A\)+/, '').gsub(/\z\(+/, '')
203
+ end
204
+
201
205
  # @param variable_configs [Array<Hash>]
202
206
  # @param variables_hash [Hash]
203
207
  # @return [Hash]
@@ -45,7 +45,8 @@ module Motor
45
45
 
46
46
  klass.instance_eval do
47
47
  default_scope do
48
- from(Arel.sql("(#{self.klass.instance_variable_get(:@__motor_custom_sql)})").as(table_name))
48
+ from(Arel.sql("(#{self.klass.instance_variable_get(:@__motor_custom_sql)})")
49
+ .as(connection.quote_column_name(table_name)))
49
50
  end
50
51
  end
51
52
 
data/lib/motor/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Motor
4
- VERSION = '0.2.75'
4
+ VERSION = '0.2.76'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: motor-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.75
4
+ version: 0.2.76
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pete Matsyburka