Only quote table/column names for active record

railsadminteam · Oct 13, 2023 · 51cf5a4 · 51cf5a4
1 parent 1292131
commit 51cf5a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/rails_admin/abstract_model.rb b/lib/rails_admin/abstract_model.rb
@@ -61,11 +61,19 @@ def model
     end
 
     def quoted_table_name
-      model.quoted_table_name
+      if adapter == :active_record
+        model.quoted_table_name
+      else
+        table_name
+      end
     end
 
     def quote_column_name(name)
-      model.connection.quote_column_name(name)
+      if adapter == :active_record
+        model.connection.quote_column_name(name)
+      else
+        name
+      end
     end
 
     def to_s

diff --git a/spec/controllers/rails_admin/main_controller_spec.rb b/spec/controllers/rails_admin/main_controller_spec.rb
@@ -73,14 +73,14 @@ def get(action, params)
     context 'using mongoid, not supporting joins', mongoid: true do
       it 'gives back the remote table with label name' do
         controller.params = {sort: 'team', model_name: 'players'}
-        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to match(sort: /.players.\..team_id./, sort_reverse: true)
+        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to match(sort: /.?players.?\..?team_id.?/, sort_reverse: true)
       end
     end
 
     context 'using active_record, supporting joins', active_record: true do
       it 'gives back the local column' do
         controller.params = {sort: 'team', model_name: 'players'}
-        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to match(sort: /.teams.\..name./, sort_reverse: true)
+        expect(controller.send(:get_sort_hash, RailsAdmin.config(Player))).to match(sort: /.?teams.?\..?name.?/, sort_reverse: true)
       end
     end
   end