aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert2017-08-08 10:46:45 +0200
committerRobert2017-08-08 10:46:45 +0200
commit23bf87cd1291f6ec8193a961df6f96e02710d623 (patch)
tree67d4cc82475c5c4630160da3cb69a7cd86c6d483
parentcc5a3d9c4cd0b2953f45b5b8f916b1118ca29013 (diff)
downloadchouette-core-23bf87cd1291f6ec8193a961df6f96e02710d623.tar.bz2
Microfix local renaming and codegeneration artefact removal
-rw-r--r--app/workers/workbench_import_worker.rb8
-rw-r--r--db/migrate/20170802141224_rename_message_attributs_to_message_attributes_everywhere.rb3
2 files changed, 4 insertions, 7 deletions
diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb
index 07e4a1283..7f77b46dc 100644
--- a/app/workers/workbench_import_worker.rb
+++ b/app/workers/workbench_import_worker.rb
@@ -58,18 +58,18 @@ class WorkbenchImportWorker
@workbench_import.update_attributes( current_step: entry_group_streams.size, status: 'failed' )
end
- def upload_entry_group key_pair, element_count
+ def upload_entry_group entry_pair, element_count
@workbench_import.update_attributes( current_step: element_count.succ )
retry_service = RetryService.new(
delays: RETRY_DELAYS,
rescue_from: [HTTPService::Timeout],
&method(:log_failure))
- status = retry_service.execute(&upload_entry_group_proc(key_pair))
+ status = retry_service.execute(&upload_entry_group_proc(entry_pair))
raise StopIteration unless status.ok?
end
- def upload_entry_group_proc key_pair
- eg_name, eg_stream = key_pair
+ def upload_entry_group_proc entry_pair
+ eg_name, eg_stream = entry_pair
# This should be fn.try_upload_entry_group(eg_name, eg_stream) ;(
-> do
try_upload_entry_group(eg_name, eg_stream)
diff --git a/db/migrate/20170802141224_rename_message_attributs_to_message_attributes_everywhere.rb b/db/migrate/20170802141224_rename_message_attributs_to_message_attributes_everywhere.rb
index 2ac0ae1a7..f80292b14 100644
--- a/db/migrate/20170802141224_rename_message_attributs_to_message_attributes_everywhere.rb
+++ b/db/migrate/20170802141224_rename_message_attributs_to_message_attributes_everywhere.rb
@@ -1,8 +1,5 @@
class RenameMessageAttributsToMessageAttributesEverywhere < ActiveRecord::Migration
def change
- # -- for table in cleanup_results import_messages line_referential_sync_messages stop_area_referential_sync_messages
- # rename_column :table, :message_attributs, :message_attributes
- # rename_column :cleanup_results, :message_attributs, :message_attributes
rename_column :import_messages, :message_attributs, :message_attributes
rename_column :line_referential_sync_messages, :message_attributs, :message_attributes
rename_column :stop_area_referential_sync_messages, :message_attributs, :message_attributes