fix db helper

Mystery-cyf · Dec 13, 2019 · abe3ef8 · abe3ef8
1 parent 2cccaca
commit abe3ef8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/db_helper.rb b/lib/db_helper.rb
@@ -7,9 +7,8 @@ class DbHelper
   REMAP_SQL ||= <<~SQL
     SELECT table_name, column_name
       FROM information_schema.columns
-     WHERE table_schema = 'public'
-       AND is_updatable = 'YES'
-       AND (data_type LIKE 'char%' OR data_type LIKE 'text%')
+     WHERE table_schema = :schema
+       AND (data_type LIKE '%char%' OR data_type LIKE '%text%')
   ORDER BY table_name, column_name
   SQL
 
@@ -26,7 +25,7 @@ def self.remap(from, to, anchor_left: false, anchor_right: false, excluded_table
 
     text_columns = Hash.new { |h, k| h[k] = [] }
 
-    DB.query(REMAP_SQL).each do |r|
+    DB.query(REMAP_SQL, schema: ActiveRecord::Base.connection.instance_eval{|x| @config[:database]}).each do |r|
       unless triggers.include?(Migration::BaseDropper.readonly_trigger_name(r.table_name, r.column_name))
         text_columns[r.table_name] << r.column_name
       end
@@ -58,7 +57,7 @@ def self.regexp_replace(pattern, replacement, flags: "gi", match: "~*", excluded
 
     text_columns = Hash.new { |h, k| h[k] = [] }
 
-    DB.query(REMAP_SQL).each do |r|
+    DB.query(REMAP_SQL, schema: ActiveRecord::Base.connection.instance_eval{|x| @config[:database]}).each do |r|
       unless triggers.include?(Migration::BaseDropper.readonly_trigger_name(r.table_name, r.column_name))
         text_columns[r.table_name] << r.column_name
       end