summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-11-21 16:05:57 -0800
committerMichael Kozono <mkozono@gmail.com>2017-12-01 15:26:41 -0800
commit8def25d9f163cc22f71716d8a22fc5adfe0a762e (patch)
treed68297c1ca4da1a031fd00fe5b96e22f9772524b
parentaefbdcdcf25cbcd8d80dcaa3216264d91bdcac91 (diff)
downloadgitlab-ce-8def25d9f163cc22f71716d8a22fc5adfe0a762e.tar.gz
Fix datetime inserts on MySQL
-rw-r--r--lib/gitlab/background_migration/prepare_untracked_uploads.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/background_migration/prepare_untracked_uploads.rb b/lib/gitlab/background_migration/prepare_untracked_uploads.rb
index 022b2f41393..f5a11658c0b 100644
--- a/lib/gitlab/background_migration/prepare_untracked_uploads.rb
+++ b/lib/gitlab/background_migration/prepare_untracked_uploads.rb
@@ -124,10 +124,8 @@ module Gitlab
end
def table_columns_and_values_for_insert(file_paths)
- timestamp = Time.now.utc.iso8601
-
values = file_paths.map do |file_path|
- ActiveRecord::Base.send(:sanitize_sql_array, ['(?, ?, ?)', file_path, timestamp, timestamp]) # rubocop:disable GitlabSecurity/PublicSend
+ ActiveRecord::Base.send(:sanitize_sql_array, ['(?, NOW(), NOW())', file_path]) # rubocop:disable GitlabSecurity/PublicSend
end.join(', ')
"#{UntrackedFile.table_name} (path, created_at, updated_at) VALUES #{values}"