schema_plus_core 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc1ffe7f432c8e74c488bcf10f95dbe2f2050a7d2b8981a90b154689a635965
-  data.tar.gz: 01dc5cb4e3dccaacd7c9fe1eb800dab7646fc001e82ec12bcd1cac90b0d47db3
+  metadata.gz: 7a77d048b0af1593358c7a3a3a65eb57eddb2e8088fa5ac0d1704a65d0fe90ea
+  data.tar.gz: 6509557c46101b4fccf4f8cf51100a2c00980a31d4b273523ad3e5be15b470cb
 SHA512:
-  metadata.gz: 675a1ccf6531d7bacc97e1354772c77690fa2ba956402f8054bdb47e60f8c32363a9c54287acf24019b66a74270ac3e39d06a8d8d803f57827d6a2f7eee68d6d
-  data.tar.gz: '09513084a2643ec5a9a1bb30a9f6aaa308f3e2ed6dc065067b9f2bcec956ef954a9db19ca20ec51cce17794f3a5e4b027bc58b2d44abfbd11c8ffbc1085662af'
+  metadata.gz: 666b330c46324e8b198b649cffa95fce5cba396ca2897919ed05ee93dcf03e5ea52ed6698a2567dd851a2ce18ca06f4e47c5d7da53429623afe20a513da0f786
+  data.tar.gz: 38188d56fc44dcd55bb200f732dec9625d6aa0e22dac55a534c5062d127f59224fe93d05b250b2dda161e85ba611067977e73f104230ca112936d7454d6aa37b

data/README.md

@@ -444,6 +444,7 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
 ## Release Notes
 
+* 2.2.2 Fixed dumping tables in postgresql in AR 5.2 when the PK is not a bigint.
 * 2.2.1 Fixed expression index handling in AR5.x.
 * 2.2.0 Added AR5.2 support.  Thanks to [@jeremyyap](https://github.com/jeremyyap)
 * 2.1.1 Bug fix: Don't lose habtm options.  Thanks to [@iagopiimenta ](https://github.com/iagopiimenta)

data/gemfiles/activerecord-5.0/Gemfile.postgresql

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "pg"
+  gem "pg", "< 1"
 end
 
 platform :jruby do
   gem 'activerecord-jdbcpostgresql-adapter'
-end
+end

data/gemfiles/activerecord-5.1/Gemfile.postgresql

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "pg"
+  gem "pg", "< 1"
 end
 
 platform :jruby do
   gem 'activerecord-jdbcpostgresql-adapter'
-end
+end

data/lib/schema_plus/core.rb

@@ -26,7 +26,7 @@ require_relative "core/schema_dump"
 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
 

data/lib/schema_plus/core/active_record/connection_adapters/postgresql/schema_dumper.rb

@@ -5,7 +5,6 @@ module SchemaPlus
         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 SchemaPlus
               #
               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
 

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Core
-    VERSION = "2.2.1"
+    VERSION = "2.2.2"
   end
 end

data/spec/dumper_spec.rb

@@ -82,6 +82,15 @@ describe SchemaMonkey::Middleware::Dumper do
 
   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

data/spec/spec_helper.rb

@@ -16,6 +16,12 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Provides an internal extension API to ActiveRecord