From 277e7383f342fc841591fece93f2ed8b22862c39 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 8 Aug 2016 17:05:22 -0400 Subject: [PATCH] Revert "FEATURE: make discourse remap optionally do regex_replace (#4367)" This reverts commit f8dda198bd63e6944e71dc952363b01e62fc353e, reversing changes made to 01ced67ab39a3055cced66e58c9fcf857f4db920. --- script/discourse | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/script/discourse b/script/discourse index a9ed089a4..d5d800a33 100755 --- a/script/discourse +++ b/script/discourse @@ -6,31 +6,27 @@ class DiscourseCLI < Thor class_option :verbose, default: false, aliases: :v desc "remap", "Remap a string sequence accross all tables" - option :global, :type => :boolean - option :regex, :type => :boolean - def remap(from, to) + def remap(from, to, global=nil) load_rails - if options[:regex] - puts "Rewriting all occurences of #{from} to #{to} using regexp_replace" - else - puts "Rewriting all occurences of #{from} to #{to}" - end + global = global == "--global" + + puts "Rewriting all occurences of #{from} to #{to}" puts "THIS TASK WILL REWRITE DATA, ARE YOU SURE (type YES)" - puts "WILL RUN ON ALL #{RailsMultisite::ConnectionManagement.all_dbs.length} DBS" if options[:global] + puts "WILL RUN ON ALL #{RailsMultisite::ConnectionManagement.all_dbs.length} DBS" if global text = STDIN.gets if text.strip != "YES" puts "aborting." exit end - if options[:global] + if global RailsMultisite::ConnectionManagement.each_connection do |db| puts "","Remapping tables on #{db}...","" - do_remap(from, to, options[:regex]) + do_remap(from, to) end else - do_remap(from, to, options[:regex]) + do_remap(from, to) end end @@ -203,7 +199,7 @@ class DiscourseCLI < Thor require File.expand_path(File.dirname(__FILE__) + "/../lib/import_export/import_export") end - def do_remap(from, to, regex=false) + def do_remap(from, to) sql = "SELECT table_name, column_name FROM information_schema.columns WHERE table_schema='public' and (data_type like 'char%' or data_type like 'text%') and is_updatable = 'YES'" @@ -217,17 +213,10 @@ WHERE table_schema='public' and (data_type like 'char%' or data_type like 'text% column_name = result["column_name"] puts "Remapping #{table_name} #{column_name}" begin - result = if regex - cnn.async_exec("UPDATE #{table_name} - SET #{column_name} = regexp_replace(#{column_name}, $1, $2, 'g') - WHERE NOT #{column_name} IS NULL - AND #{column_name} <> regexp_replace(#{column_name}, $1, $2, 'g')", [from, to]) - else - cnn.async_exec("UPDATE #{table_name} - SET #{column_name} = replace(#{column_name}, $1, $2) - WHERE NOT #{column_name} IS NULL - AND #{column_name} <> replace(#{column_name}, $1, $2)", [from, to]) - end + result = cnn.async_exec("UPDATE #{table_name} + SET #{column_name} = replace(#{column_name}, $1, $2) + WHERE NOT #{column_name} IS NULL + AND #{column_name} <> replace(#{column_name}, $1, $2)", [from, to]) puts "#{result.cmd_tuples} rows affected!" rescue => ex puts "Error: #{ex}"