aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-04-27 08:07:04 +0200
committerAlban Peignier2018-04-27 08:07:04 +0200
commitafcc4432a285a86ad7870d9ce80143d55de0dc86 (patch)
tree3da6b49b333b56b129373ef3ece4402d6d510576
parentb0e33bdcf00f5aace5c4e647e7660f95441c157a (diff)
parent0c99f7eda9f0346c49471703f9a245936bab64bb (diff)
downloadchouette-core-afcc4432a285a86ad7870d9ce80143d55de0dc86.tar.bz2
Merge branch '6833-clone-by-command'
-rw-r--r--app/models/referential_cloning.rb2
-rw-r--r--spec/workers/referential_cloning_worker_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/referential_cloning.rb b/app/models/referential_cloning.rb
index 179091485..4179ba312 100644
--- a/app/models/referential_cloning.rb
+++ b/app/models/referential_cloning.rb
@@ -58,7 +58,7 @@ class ReferentialCloning < ApplicationModel
end
def sed_command
- "sed -e 's@SCHEMA #{source_schema}@SCHEMA #{target_schema}@' -e 's@SET search_path = #{source_schema}@SET search_path = #{target_schema}@'"
+ "sed -e 's@#{source_schema}@#{target_schema}@'"
end
def restore_command
diff --git a/spec/workers/referential_cloning_worker_spec.rb b/spec/workers/referential_cloning_worker_spec.rb
index 74e83c3b2..d22df9710 100644
--- a/spec/workers/referential_cloning_worker_spec.rb
+++ b/spec/workers/referential_cloning_worker_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe ReferentialCloningWorker do
end
context 'with existing Referential' do
- it "preserve existing data" do
+ it "preserve existing data", truncation: true do
source_referential = create :referential
source_referential.switch