Merge branch '34324-gitlab-db-seed-is-broken' into 'master'

Resolve "GitLab DB seed is broken"

Closes #34324

See merge request !12464
This commit is contained in:
Rémy Coutable 2017-06-27 10:41:05 +00:00
commit f4eef75d69
2 changed files with 5 additions and 1 deletions

View File

@ -93,7 +93,7 @@ module Gitlab
row.values_at(*keys).map { |value| connection.quote(value) } row.values_at(*keys).map { |value| connection.quote(value) }
end end
connection.execute <<-EOF.strip_heredoc connection.execute <<-EOF
INSERT INTO #{table} (#{columns.join(', ')}) INSERT INTO #{table} (#{columns.join(', ')})
VALUES #{tuples.map { |tuple| "(#{tuple.join(', ')})" }.join(', ')} VALUES #{tuples.map { |tuple| "(#{tuple.join(', ')})" }.join(', ')}
EOF EOF

View File

@ -176,6 +176,10 @@ describe Gitlab::Database, lib: true do
described_class.bulk_insert('test', rows) described_class.bulk_insert('test', rows)
end end
it 'handles non-UTF-8 data' do
expect { described_class.bulk_insert('test', [{ a: "\255" }]) }.not_to raise_error
end
end end
describe '.create_connection_pool' do describe '.create_connection_pool' do