diff options
author | Rémy Coutable <remy@rymai.me> | 2017-06-27 10:41:05 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-06-27 10:41:05 +0000 |
commit | f4eef75d699e2a4a04c7af368c7be8c665e5c7f9 (patch) | |
tree | a7bdea918323ea1203b0f21c97613e60f64ec583 | |
parent | 6a2186c7e4d94a6d85573dd207be615a4a4d1b04 (diff) | |
parent | d4a3474b9b7321898a00ddcbaf651099ab96b2ba (diff) | |
download | gitlab-ce-f4eef75d699e2a4a04c7af368c7be8c665e5c7f9.tar.gz |
Merge branch '34324-gitlab-db-seed-is-broken' into 'master'
Resolve "GitLab DB seed is broken"
Closes #34324
See merge request !12464
-rw-r--r-- | lib/gitlab/database.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/database_spec.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index 0d5a7cf0694..d7dab584a44 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -93,7 +93,7 @@ module Gitlab row.values_at(*keys).map { |value| connection.quote(value) } end - connection.execute <<-EOF.strip_heredoc + connection.execute <<-EOF INSERT INTO #{table} (#{columns.join(', ')}) VALUES #{tuples.map { |tuple| "(#{tuple.join(', ')})" }.join(', ')} EOF diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb index 5e6206b96c7..cbf6c35356e 100644 --- a/spec/lib/gitlab/database_spec.rb +++ b/spec/lib/gitlab/database_spec.rb @@ -176,6 +176,10 @@ describe Gitlab::Database, lib: true do described_class.bulk_insert('test', rows) end + + it 'handles non-UTF-8 data' do + expect { described_class.bulk_insert('test', [{ a: "\255" }]) }.not_to raise_error + end end describe '.create_connection_pool' do |