motor-admin 0.2.22 → 0.2.26

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: ed518fa82c6c64047a2cafd677f6e749314e3a38a055ec752cb71b082228e1c6
4
- data.tar.gz: 87a804c67093186a0f72ff236b25016614f3e820326404337dd097f0d5672103
3
+ metadata.gz: 04b8a3962312d6df6ee3d75c0ad988f5b3e2011fcc4eacaedc2263739c4b8478
4
+ data.tar.gz: c034290e1752bff06ea29a2ca2be696576dd46bcbb6f97a22917173e9911c5c0
5
5
  SHA512:
6
- metadata.gz: 16aff2d26bf9c99340e1af7ac17c889f5ad421cdcd9adbeda0b6590c5421c6e1a92ed354d79a048600488de4bb6384f35bba766d6c266371805d97a44ae57734
7
- data.tar.gz: a9e5b0ca229032349ef8f863dfd0f495047a73d7c0f19bce4f2f8c4df12fc22a705eb8dfa36d6549baf161b3a1385407e7fc74eb7b9674bca3b2b2e54c0846e8
6
+ metadata.gz: 56e2836e3a8723e313a0af989ccb5aa7d8577f6c5982cdc05825ed1ec4061db90a35776e329c4bdcdf4c736405ffeb4d2268131b857bbbd1cab19bdcff34a88f
7
+ data.tar.gz: a05ce55494fc28825dba93861888aca1c563df270670af2e048828f35db51a0296a263d2211f772d12e5905da7da60458756ef554a1cd1fe83084f938bc6d9c7
@@ -278,3 +278,9 @@ en:
278
278
  there_is_nothing_here_yet: There is nothing here yet 🤷‍♂️
279
279
  is_null: Is null
280
280
  is_not_null: Is not null
281
+ split_tags_by: Split tags by
282
+ do_not_split: Do not split
283
+ semicolon: Semicolon
284
+ hyphen: Hyphen
285
+ comma: Comma
286
+ slash: Slash
@@ -278,6 +278,12 @@ es:
278
278
  there_is_nothing_here_yet: Todavía no hay nada aquí 🤷‍♂️
279
279
  is_null: Es nulo
280
280
  is_not_null: No es nulo
281
+ split_tags_by: Dividir las etiquetas por
282
+ do_not_split: No dividir
283
+ semicolon: Punto y coma
284
+ hyphen: Guión
285
+ comma: Coma
286
+ slash: Slash
281
287
  i:
282
288
  locale: es
283
289
  select:
@@ -274,6 +274,12 @@ pt:
274
274
  there_is_nothing_here_yet: Ainda não há nada aqui 🤷‍♂️
275
275
  is_null: É nulo
276
276
  is_not_null: Não é nulo
277
+ split_tags_by: Dividir as etiquetas por
278
+ do_not_split: Não dividir
279
+ semicolon: Ponto-e-vírgula
280
+ hyphen: Hífen
281
+ comma: Vírgula
282
+ slash: Slash
277
283
  i:
278
284
  locale: pt
279
285
  select:
@@ -83,9 +83,7 @@ module Motor
83
83
  end
84
84
 
85
85
  def load_cache_keys
86
- result = ActiveRecord::Base.connection.execute(cache_keys_sql).to_a
87
-
88
- result = result.map(&:values) if result.first.is_a?(Hash)
86
+ result = ActiveRecord::Base.connection.exec_query(cache_keys_sql).rows
89
87
 
90
88
  result.to_h.with_indifferent_access
91
89
  end
@@ -61,7 +61,7 @@ module Motor
61
61
  # @return [ActiveRecord::Result]
62
62
  def execute_query(query, limit, variables_hash, filters)
63
63
  result = nil
64
- statement = prepare_sql_statement(query, limit, variables_hash, filters)
64
+ statement = prepare_sql_statement(connection_class.connection, query, limit, variables_hash, filters)
65
65
 
66
66
  connection_class.transaction do
67
67
  result =
@@ -129,17 +129,18 @@ module Motor
129
129
  end
130
130
  end
131
131
 
132
+ # @param connection [Object]
132
133
  # @param query [Motor::Query]
133
134
  # @param limit [Integer]
134
135
  # @param variables_hash [Hash]
135
136
  # @param filters [Hash]
136
137
  # @return [Array]
137
- def prepare_sql_statement(query, limit, variables_hash, filters)
138
+ def prepare_sql_statement(connection, query, limit, variables_hash, filters)
138
139
  variables = merge_variable_default_values(query.preferences.fetch(:variables, []), variables_hash)
139
140
 
140
141
  sql, query_variables = RenderSqlTemplate.call(query.sql_body, variables)
141
142
  cte_sql = format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.delete_suffix(';'))
142
- cte_select_sql = build_cte_select_sql(limit, filters)
143
+ cte_select_sql = build_cte_select_sql(connection, limit, filters)
143
144
 
144
145
  attributes = build_statement_attributes(query_variables)
145
146
 
@@ -149,7 +150,7 @@ module Motor
149
150
  # @param limit [Number]
150
151
  # @param filters [Hash]
151
152
  # @return [String]
152
- def build_cte_select_sql(limit, filters)
153
+ def build_cte_select_sql(connection, limit, filters)
153
154
  table = Arel::Table.new(CTE_NAME)
154
155
 
155
156
  arel_filters = build_filters_arel(filters)
@@ -157,7 +158,9 @@ module Motor
157
158
  expresion = table.project(table[Arel.star])
158
159
  expresion = expresion.where(arel_filters) if arel_filters.present?
159
160
 
160
- expresion.take(limit.to_i).to_sql
161
+ expresion.take(limit.to_i) unless connection.class.name.include?('SQLServerAdapter')
162
+
163
+ expresion.to_sql.delete('"')
161
164
  end
162
165
 
163
166
  # @param filters [Hash]
@@ -9,7 +9,7 @@ module Motor
9
9
 
10
10
  def call(sql)
11
11
  CACHE_STORE.fetch(sql.hash) do
12
- Queries::RunQuery.call(Query.new(sql_body: sql), limit: 0).columns
12
+ Queries::RunQuery.call(Query.new(sql_body: sql), limit: 0).columns || []
13
13
  end
14
14
  end
15
15
  end
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.22'
4
+ VERSION = '0.2.26'
5
5
  end
@@ -2601,9 +2601,9 @@
2601
2601
  "icons/zoom-out.svg.gz": "icons/zoom-out.svg.gz",
2602
2602
  "icons/zoom-question.svg": "icons/zoom-question.svg",
2603
2603
  "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
2604
- "main-6570149f716eae327cdc.css.gz": "main-6570149f716eae327cdc.css.gz",
2605
- "main-6570149f716eae327cdc.js.LICENSE.txt": "main-6570149f716eae327cdc.js.LICENSE.txt",
2606
- "main-6570149f716eae327cdc.js.gz": "main-6570149f716eae327cdc.js.gz",
2607
- "main.css": "main-6570149f716eae327cdc.css",
2608
- "main.js": "main-6570149f716eae327cdc.js"
2604
+ "main-9f6b19ff999e209e9d33.css.gz": "main-9f6b19ff999e209e9d33.css.gz",
2605
+ "main-9f6b19ff999e209e9d33.js.LICENSE.txt": "main-9f6b19ff999e209e9d33.js.LICENSE.txt",
2606
+ "main-9f6b19ff999e209e9d33.js.gz": "main-9f6b19ff999e209e9d33.js.gz",
2607
+ "main.css": "main-9f6b19ff999e209e9d33.css",
2608
+ "main.js": "main-9f6b19ff999e209e9d33.js"
2609
2609
  }
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.22
4
+ version: 0.2.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pete Matsyburka
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-11-10 00:00:00.000000000 Z
11
+ date: 2021-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord-filter
@@ -1525,8 +1525,8 @@ files:
1525
1525
  - ui/dist/icons/zoom-money.svg.gz
1526
1526
  - ui/dist/icons/zoom-out.svg.gz
1527
1527
  - ui/dist/icons/zoom-question.svg.gz
1528
- - ui/dist/main-6570149f716eae327cdc.css.gz
1529
- - ui/dist/main-6570149f716eae327cdc.js.gz
1528
+ - ui/dist/main-9f6b19ff999e209e9d33.css.gz
1529
+ - ui/dist/main-9f6b19ff999e209e9d33.js.gz
1530
1530
  - ui/dist/manifest.json
1531
1531
  homepage:
1532
1532
  licenses: