Merge c0109a3 into dc6cb03

SchemaPlus · Dec 14, 2018 · 4c35c25 · 4c35c25
2 parents dc6cb03 + c0109a3
commit 4c35c25
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
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,6 +5,16 @@ module ConnectionAdapters
         module PostgreSQL
           module PostgreSQL # need two PostgreSQLs because the first gets stripped by schema_monkey
             module SchemaDumper
+              def column_spec_for_primary_key(column)
+                spec = super
+
+                spec.delete :default
+
+                spec[:default] = schema_default(column)
+                spec[:default] ||= "nil" if explicit_primary_key_default?(column)
+                spec.compact!
+                spec
+              end
 
               # quick hack fix quoting of column default functions to allow eval() when we
               # capture the stream.

diff --git a/spec/dumper_spec.rb b/spec/dumper_spec.rb
@@ -63,6 +63,8 @@ def after(env)
     migration.create_table "other" do |t|
       t.references :thing
     end
+    migration.create_table "inttable", id: :serial do |t|
+    end
     migration.add_foreign_key("other", "things")
     migration.execute "CREATE TABLE custom_table ( my_column custom_type DEFAULT 'a'::custom_type NOT NULL)" if TestCustomType
   end
@@ -82,6 +84,7 @@ def after(env)
 
   context TestDumper::Middleware::Dumper::Tables do
     Then { expect(dump).to match(/create_table "other".*create_table "#{middleware}".*create_table "things"/m) }
+    Then { expect(dump).to match(/create_table "inttable", id: :serial, force:/m) }
   end
 
   context TestDumper::Middleware::Dumper::Table do