diff options
| author | Robert | 2017-06-06 10:41:17 +0200 |
|---|---|---|
| committer | Robert | 2017-06-06 11:32:23 +0200 |
| commit | 12290bbdabb8f53c4dddb1a647296a426b88709e (patch) | |
| tree | bbc5728f9322c4d331e9410785376b73735d1a58 /app | |
| parent | 29fbffa1928fc08b5e2392afdd98cc1e2094f023 (diff) | |
| download | chouette-core-12290bbdabb8f53c4dddb1a647296a426b88709e.tar.bz2 | |
Refs: #3604; added tests for cloning with data ⇒ ✓
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/referential.rb | 4 | ||||
| -rw-r--r-- | app/models/referential_cloning.rb | 3 | ||||
| -rw-r--r-- | app/workers/referential_cloning_worker.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/models/referential.rb b/app/models/referential.rb index 83d507320..824320c27 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -127,7 +127,7 @@ class Referential < ActiveRecord::Base end def self.new_from(from, organisation:) - Referential.new({ + Referential.new( name: I18n.t("activerecord.copy", :name => from.name), slug: "#{from.slug}_clone", prefix: from.prefix, @@ -139,7 +139,7 @@ class Referential < ActiveRecord::Base workbench: from.workbench, created_from: from, metadatas: from.metadatas.map { |m| ReferentialMetadata.new_from(m) } - }) + ) end def self.available_srids diff --git a/app/models/referential_cloning.rb b/app/models/referential_cloning.rb index 2f34093e2..9006b2ac5 100644 --- a/app/models/referential_cloning.rb +++ b/app/models/referential_cloning.rb @@ -6,7 +6,8 @@ class ReferentialCloning < ActiveRecord::Base private def perform_clone - ReferentialCloningWorker.perform_async(self.id) + # ReferentialCloningWorker.perform_async(id) + ReferentialCloningWorker.new.perform(id) end aasm column: :status do diff --git a/app/workers/referential_cloning_worker.rb b/app/workers/referential_cloning_worker.rb index c74566966..2a524dbcd 100644 --- a/app/workers/referential_cloning_worker.rb +++ b/app/workers/referential_cloning_worker.rb @@ -16,7 +16,7 @@ class ReferentialCloningWorker def clone_schema ref_cloning, source_schema, target_schema ref_cloning.run! - StoredProcedures.invoke_stored_procedure(:clone_schema, source_schema, target_schema, true) + StoredProcedures.invoke_stored_procedure(:clone_schema, source_schema, target_schema) ref_cloning.successful! rescue Exception => e |