fix a serial pk on rails 5.2+

SchemaPlus · Dec 14, 2018 · 7ec5928 · 7ec5928
1 parent dc6cb03
commit 7ec5928
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/lib/schema_plus/core.rb b/lib/schema_plus/core.rb
@@ -26,7 +26,7 @@ module ConnectionAdapters
 require_relative "core/sql_struct"
 require_relative "core/version"
 
-if ActiveRecord.version >= Gem::Version.new('5.2.0.rc1')
+if ActiveRecord.version >= Gem::Version.new('5.2')
   require_relative "core/active_record/connection_adapters/postgresql/schema_dumper"
 end
 

diff --git a/lib/schema_plus/core/active_record/connection_adapters/postgresql/schema_dumper.rb b/lib/schema_plus/core/active_record/connection_adapters/postgresql/schema_dumper.rb
@@ -5,7 +5,6 @@ module ConnectionAdapters
         module PostgreSQL
           module PostgreSQL # need two PostgreSQLs because the first gets stripped by schema_monkey
             module SchemaDumper
-
               # quick hack fix quoting of column default functions to allow eval() when we
               # capture the stream.
               #
@@ -20,7 +19,7 @@ module SchemaDumper
               #
               def prepare_column_options(column, *) # :nodoc:
                 spec = super
-                spec[:default] = "%q{#{column.default_function}}" if column.default_function
+                spec[:default] = "%q{#{column.default_function}}" if column.default_function && !column.serial?
                 spec
               end
 

diff --git a/spec/dumper_spec.rb b/spec/dumper_spec.rb
@@ -82,6 +82,15 @@ def after(env)
 
   context TestDumper::Middleware::Dumper::Tables do
     Then { expect(dump).to match(/create_table "other".*create_table "#{middleware}".*create_table "things"/m) }
+
+    context 'int PK handling in rails 5.2+', postgresql: :only, rails: ['>= 5.2.0'] do
+      before(:each) do
+        migration.create_table "inttable", id: :serial do |t|
+        end
+      end
+
+      Then { expect(dump).to_not match(/create_table "inttable", id: :serial.*default:/m) }
+    end
   end
 
   context TestDumper::Middleware::Dumper::Table do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -16,6 +16,12 @@
 SchemaDev::Rspec.setup
 
 RSpec.configure do |config|
+
+  config.filter_run_excluding rails: -> (v) {
+    rails_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+    test = Gem::Requirement.new(v)
+    !test.satisfied_by?(rails_version)
+  }
   config.warnings = true
   config.around(:each) do |example|
     ActiveRecord::Migration.suppress_messages do