rails_admin_next 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb4c3297b700fd39f935a4983531ed06ad5312c195132215fa1b85402053aa86
-  data.tar.gz: 1ea265ef3f1e93c8b5ab452167f3400638a04450628c9939f9f10c38e60715ac
+  metadata.gz: 2bdbd212982bdb74e9a2288a5c14eba746b74b0a0ed902afbb0671cbdfd5c107
+  data.tar.gz: 119040f95b74f79a05571d9f099cb98668efa5921ee2a4b43668b3fb320302ec
 SHA512:
-  metadata.gz: 80d8dbceeff208207a33156dd6a58e1de13895e65206c73c491a2c136f759388d78a4c37875f47ae63135cb1adb9dc46b6c5ba3482f6ce616a6aa3f64b34b031
-  data.tar.gz: d8568d4805acf6887dcde84c49b4b598657bd1cc06fb24bd726a22b0c857fedfd090dfb9af87d662d659a01c6324cb18e1c23692992d9ab3f297eeec07c263ee
+  metadata.gz: 583c910d3d95569fb8031b30bfda1a71ae61ecc090bdd0e8289d9e0d4ea01ee7cf635e417c912d17a2a22c5d9f1bfe764d057391fb58744c21c1c22099130531
+  data.tar.gz: f7c7784f080f80977c21d9ae3bc02a822a1b2576aafe07f0dc063c4c7702180f425ea7905f00d8171e0a889a8842311cbff67ffd8268601eee68659b8bfdd032

data/lib/rails_admin_next/adapters/active_record.rb

@@ -182,7 +182,7 @@ module RailsAdminNext
 
         def add(field, value, operator)
           field.searchable_columns.flatten.each do |column_infos|
-            statement, value1, value2 = StatementBuilder.new(column_infos[:column], column_infos[:type], value, operator, @scope.connection.adapter_name).to_statement
+            statement, value1, value2 = StatementBuilder.new(quote(column_infos[:column]), column_infos[:type], value, operator, @scope.connection.adapter_name).to_statement
             @statements << statement if statement.present?
             @values << value1 unless value1.nil?
             @values << value2 unless value2.nil?
@@ -191,6 +191,17 @@ module RailsAdminNext
           end
         end
 
+        # Columns arrive as bare "table.column", and a reserved-word name such as `order`
+        # is a syntax error unquoted. Anything else (raw SQL, already-quoted names) is
+        # passed through untouched.
+        def quote(column)
+          parts = column.split(".")
+          return column unless parts.size == 2 && parts.all?(/\A\w+\z/)
+
+          table, name = parts
+          "#{@scope.connection.quote_table_name(table)}.#{@scope.connection.quote_column_name(name)}"
+        end
+
         def build
           scope = @scope.where(@statements.join(" OR "), *@values)
           scope = scope.references(*@tables.uniq) if @tables.any?

data/lib/rails_admin_next/version.rb

@@ -7,7 +7,7 @@ module RailsAdminNext
     # the floor a local `gem build` produces.
     MAJOR = 1
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     PRE = nil
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_next
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Daniel López Prat
@@ -340,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Admin for Rails
 test_files: []