diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2017-10-26 02:50:52 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-26 02:50:52 +0900 |
commit | d4fb64b316f0f55468b17c58b50c384b04c5972b (patch) | |
tree | abbba650c00a2d859492420fb601ad26e3a824dc /activerecord | |
parent | 55fdb125db82da0ff5b17466f226d96661df0cdb (diff) | |
parent | cf4ba2fa46933f6b450a95c14aa175eae4a4e9ba (diff) | |
download | rails-d4fb64b316f0f55468b17c58b50c384b04c5972b.tar.gz rails-d4fb64b316f0f55468b17c58b50c384b04c5972b.tar.bz2 rails-d4fb64b316f0f55468b17c58b50c384b04c5972b.zip |
Merge pull request #30984 from yahonda/schema_dumper_pg
Move `extensions` to `PostgreSQL::SchemaDumper`
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb | 12 | ||||
-rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb index c0dbb166b7..84643d20da 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb @@ -5,6 +5,18 @@ module ActiveRecord module PostgreSQL class SchemaDumper < ConnectionAdapters::SchemaDumper # :nodoc: private + + def extensions(stream) + extensions = @connection.extensions + if extensions.any? + stream.puts " # These are extensions that must be enabled in order to support this database" + extensions.sort.each do |extension| + stream.puts " enable_extension #{extension.inspect}" + end + stream.puts + end + end + def prepare_column_options(column) spec = super spec[:array] = "true" if column.array? diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index 8d0311fabd..66f7d29886 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -82,16 +82,8 @@ HEADER stream.puts "end" end + # extensions are only supported by PostgreSQL def extensions(stream) - return unless @connection.supports_extensions? - extensions = @connection.extensions - if extensions.any? - stream.puts " # These are extensions that must be enabled in order to support this database" - extensions.sort.each do |extension| - stream.puts " enable_extension #{extension.inspect}" - end - stream.puts - end end def tables(stream) |