Pre-merge update

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # To test against different rails versions with TravisCI
-rails_version = ENV["RAILS_VERSION"] || "~> 6"
+rails_version = ENV["RAILS_VERSION"] || "~> 6.0"
 
 # NOTE: This is a Gemfile for a gem.
 # Using "platforms" is contraindicated because they won't make it into

lib/pg_saurus/connection_adapters/abstract_adapter/schema_methods.rb

@@ -4,17 +4,19 @@ module PgSaurus::ConnectionAdapters::AbstractAdapter::SchemaMethods
 
   # Provide :schema option to +create_table+ method.
   def create_table(table_name, options = {}, &block)
-    options     = options.dup
-    schema_name = options.delete(:schema)
-    table_name  = "#{schema_name}.#{table_name}" if schema_name
+    table_name, options = extract_table_options(table_name, options)
     super(table_name, options, &block)
   end
 
   # Provide :schema option to +drop_table+ method.
   def drop_table(table_name, options = {})
+    super(*extract_table_options(table_name, options))
+  end
+
+  def extract_table_options(table_name, options)
     options     = options.dup
     schema_name = options.delete(:schema)
     table_name  = "#{schema_name}.#{table_name}" if schema_name
-    super(table_name, options)
+    [table_name, options]
   end
 end

lib/pg_saurus/version.rb

@@ -1,4 +1,4 @@
 module PgSaurus
   # Version of pg_saurus gem.
-  VERSION = "4.3.0"
+  VERSION = "5.0.0"
 end

pg_saurus.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pg_saurus 4.3.0 ruby lib
+# stub: pg_saurus 5.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pg_saurus".freeze
-  s.version = "4.3.0"
+  s.version = "5.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Potapov Sergey".freeze, "Arthur Shagall".freeze, "Artem Ignatyev".freeze, "Matt Dressel".freeze, "Bruce Burdick".freeze, "HornsAndHooves".freeze]
-  s.date = "2021-09-22"
+  s.date = "2022-01-06"
   s.description = "ActiveRecord extensions for PostgreSQL. Provides useful tools for schema, foreign_key, index, function, trigger, comment and extension manipulations in migrations.".freeze
   s.email = ["[email protected]".freeze, "[email protected]".freeze, "[email protected]".freeze, "[email protected]".freeze, "[email protected]".freeze]
   s.extra_rdoc_files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.files = [
     "README.markdown",
     "lib/colorized_text.rb",
-    "lib/core_ext/active_record/connection_adapters/postgresql/column.rb",
     "lib/core_ext/active_record/connection_adapters/postgresql/schema_statements.rb",
     "lib/core_ext/active_record/errors.rb",
     "lib/core_ext/active_record/schema_dumper.rb",
@@ -77,7 +76,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/HornsAndHooves/pg_saurus".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.9".freeze
+  s.rubygems_version = "3.0.8".freeze
   s.summary = "ActiveRecord extensions for PostgreSQL.".freeze
 
   if s.respond_to? :specification_version then
@@ -86,10 +85,10 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<pg>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<psych>.freeze, ["~> 3"])
-      s.add_runtime_dependency(%q<railties>.freeze, ["~> 6"])
-      s.add_runtime_dependency(%q<activemodel>.freeze, ["~> 6"])
-      s.add_runtime_dependency(%q<activerecord>.freeze, ["~> 6"])
-      s.add_runtime_dependency(%q<activesupport>.freeze, ["~> 6"])
+      s.add_runtime_dependency(%q<railties>.freeze, ["~> 6.0"])
+      s.add_runtime_dependency(%q<activemodel>.freeze, ["~> 6.0"])
+      s.add_runtime_dependency(%q<activerecord>.freeze, ["~> 6.0"])
+      s.add_runtime_dependency(%q<activesupport>.freeze, ["~> 6.0"])
       s.add_development_dependency(%q<rspec-rails>.freeze, [">= 0"])
       s.add_development_dependency(%q<yard>.freeze, [">= 0"])
       s.add_development_dependency(%q<metric_fu>.freeze, [">= 0"])
@@ -101,10 +100,10 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<pg>.freeze, [">= 0"])
       s.add_dependency(%q<psych>.freeze, ["~> 3"])
-      s.add_dependency(%q<railties>.freeze, ["~> 6"])
-      s.add_dependency(%q<activemodel>.freeze, ["~> 6"])
-      s.add_dependency(%q<activerecord>.freeze, ["~> 6"])
-      s.add_dependency(%q<activesupport>.freeze, ["~> 6"])
+      s.add_dependency(%q<railties>.freeze, ["~> 6.0"])
+      s.add_dependency(%q<activemodel>.freeze, ["~> 6.0"])
+      s.add_dependency(%q<activerecord>.freeze, ["~> 6.0"])
+      s.add_dependency(%q<activesupport>.freeze, ["~> 6.0"])
       s.add_dependency(%q<rspec-rails>.freeze, [">= 0"])
       s.add_dependency(%q<yard>.freeze, [">= 0"])
       s.add_dependency(%q<metric_fu>.freeze, [">= 0"])
@@ -117,10 +116,10 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<pg>.freeze, [">= 0"])
     s.add_dependency(%q<psych>.freeze, ["~> 3"])
-    s.add_dependency(%q<railties>.freeze, ["~> 6"])
-    s.add_dependency(%q<activemodel>.freeze, ["~> 6"])
-    s.add_dependency(%q<activerecord>.freeze, ["~> 6"])
-    s.add_dependency(%q<activesupport>.freeze, ["~> 6"])
+    s.add_dependency(%q<railties>.freeze, ["~> 6.0"])
+    s.add_dependency(%q<activemodel>.freeze, ["~> 6.0"])
+    s.add_dependency(%q<activerecord>.freeze, ["~> 6.0"])
+    s.add_dependency(%q<activesupport>.freeze, ["~> 6.0"])
     s.add_dependency(%q<rspec-rails>.freeze, [">= 0"])
     s.add_dependency(%q<yard>.freeze, [">= 0"])
     s.add_dependency(%q<metric_fu>.freeze, [">= 0"])

spec/dummy/db/schema.rb

@@ -17,7 +17,7 @@
   create_schema_if_not_exists "latest"
 
   create_extension "fuzzystrmatch", version: "1.1"
-  create_extension "btree_gist", schema_name: "demography", version: "1.5"
+  create_extension "btree_gist", schema_name: "demography", version: "1.2"
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gist"