motor-admin 0.2.73 → 0.2.76

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 947b42e0b0f2f64d9d08673e6696ca29287559f45c99120ca6901049b496d5fc
4
- data.tar.gz: 253198433af97079a9aff6716512dda6e9e7a68220a8d79a9cba9d7a97a3151d
3
+ metadata.gz: 18e2c93dd34d0ae77436e9df549dcbe2ef0d3a2db500189a8ee62006937be637
4
+ data.tar.gz: 4bc2541c6982b92a852de17952a1002113bdf54daa8cdfc2cc517ff24e3986df
5
5
  SHA512:
6
- metadata.gz: b8adb5d25a14a609763f4ad7415fb935674baece72961f92685c218a1fff69d87e7b03bfd77311c7bc8f69cd6f4b067119c85aaa9926e04d2de503fefdbcac9d
7
- data.tar.gz: 986c5467769a990401499990a7f28850526e675bf44663145164195e7683bc446542375ae4dce57e119084a74fe0726d7ffe80b15f219c0e71275e978dba84c9
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.73'
4
+ VERSION = '0.2.76'
5
5
  end
@@ -3961,9 +3961,9 @@
3961
3961
  "icons/zoom-pan.svg.gz": "icons/zoom-pan.svg.gz",
3962
3962
  "icons/zoom-question.svg": "icons/zoom-question.svg",
3963
3963
  "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
3964
- "main-3a4545ec19308abd16e4.css.gz": "main-3a4545ec19308abd16e4.css.gz",
3965
- "main-3a4545ec19308abd16e4.js.LICENSE.txt": "main-3a4545ec19308abd16e4.js.LICENSE.txt",
3966
- "main-3a4545ec19308abd16e4.js.gz": "main-3a4545ec19308abd16e4.js.gz",
3967
- "main.css": "main-3a4545ec19308abd16e4.css",
3968
- "main.js": "main-3a4545ec19308abd16e4.js"
3964
+ "main-490384ed80aab6944eff.css.gz": "main-490384ed80aab6944eff.css.gz",
3965
+ "main-490384ed80aab6944eff.js.LICENSE.txt": "main-490384ed80aab6944eff.js.LICENSE.txt",
3966
+ "main-490384ed80aab6944eff.js.gz": "main-490384ed80aab6944eff.js.gz",
3967
+ "main.css": "main-490384ed80aab6944eff.css",
3968
+ "main.js": "main-490384ed80aab6944eff.js"
3969
3969
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: motor-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.73
4
+ version: 0.2.76
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pete Matsyburka
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-15 00:00:00.000000000 Z
11
+ date: 2022-06-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord-filter
@@ -2213,8 +2213,8 @@ files:
2213
2213
  - ui/dist/icons/zoom-out.svg.gz
2214
2214
  - ui/dist/icons/zoom-pan.svg.gz
2215
2215
  - ui/dist/icons/zoom-question.svg.gz
2216
- - ui/dist/main-3a4545ec19308abd16e4.css.gz
2217
- - ui/dist/main-3a4545ec19308abd16e4.js.gz
2216
+ - ui/dist/main-490384ed80aab6944eff.css.gz
2217
+ - ui/dist/main-490384ed80aab6944eff.js.gz
2218
2218
  - ui/dist/manifest.json
2219
2219
  homepage:
2220
2220
  licenses: