summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-01-16 12:27:04 +0000
committerNick Thomas <nick@gitlab.com>2018-01-16 14:54:02 +0000
commit58282e355a9047462cc102054657ee49c6fb0af7 (patch)
tree043e992c0a4e40ed7fcb53decfc74b1c62d14a50 /config
parent3bb798756e52368ae2ae4a512e86a543dea8ca21 (diff)
downloadgitlab-ce-58282e355a9047462cc102054657ee49c6fb0af7.tar.gz
Update seed-fu to a version compatible with postgresql 10
Diffstat (limited to 'config')
-rw-r--r--config/initializers/ar5_pg_10_support.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/config/initializers/ar5_pg_10_support.rb b/config/initializers/ar5_pg_10_support.rb
index 3d8ccd814a8..6fae770015c 100644
--- a/config/initializers/ar5_pg_10_support.rb
+++ b/config/initializers/ar5_pg_10_support.rb
@@ -1,5 +1,6 @@
raise "Vendored ActiveRecord 5 code! Delete #{__FILE__}!" if ActiveRecord::VERSION::MAJOR >= 5
+require 'active_record/connection_adapters/postgresql_adapter'
require 'active_record/connection_adapters/postgresql/schema_statements'
#
@@ -10,6 +11,14 @@ require 'active_record/connection_adapters/postgresql/schema_statements'
# rubocop:disable all
module ActiveRecord
module ConnectionAdapters
+
+ # We need #postgresql_version to be public as in ActiveRecord 5 for seed_fu
+ # to work. In ActiveRecord 4, it is protected.
+ # https://github.com/mbleigh/seed-fu/issues/123
+ class PostgreSQLAdapter
+ public :postgresql_version
+ end
+
module PostgreSQL
module SchemaStatements
# Resets the sequence of a table's primary key to the maximum value.