tapsoob 0.8.5-java → 0.8.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb9e75e4bea67137c1dff8803d7c49dbe96b6c46740eba03bb372cb8bf2d0c14
-  data.tar.gz: dda86ad6ec9d02734fce9f1ea9cedeafd745ebf7a0c316a0a329dfa461c61331
+  metadata.gz: 507d0809e6ce3577c927ca3403a84702cd81737987535709ea1ac9d946001727
+  data.tar.gz: 42eac9c4f181ddcb29d046267715d367ba05b65cdef9c6a427eb8181b37b7190
 SHA512:
-  metadata.gz: '093b732d4cdc720f2e6dae958077581f31791236ea40ef57b84ef5a11f7d4282fe79ec8f6cbfffa1009d08c98f8e939a33440138cc901a61774f1f4d368f6ee6'
-  data.tar.gz: cd1fb4eaa2eab1aeb561a53ee4d1b1b6aef040ab461917c2577a75479060a692fb90ce9aedf601e04acd5fe8cdb8882759209b6fce9b8997c88c99336a20a6c3
+  metadata.gz: d4a69103da5d43b36acc62bbf186dcc0d3864eeea09ed74fba8c9cbf9807676cdac8ea3bd0bbd66a681661ae9fdc072abad07029f50d2ccb1519cc1a9679f24b
+  data.tar.gz: 191cb27f4048d18c3df96013f7c3275965e348c7a169a928b605901e6d296d6fcd0689717dcd788c9b2539ec6138380ddca33bab916f9484016280b17b5c074b

data/lib/tapsoob/schema.rb

@@ -11,9 +11,9 @@ module Tapsoob
     extend self
 
     def dump(database_url, options = {})
-      db = Sequel.connect(database_url)
-      db.extension :schema_dumper
-      template = ERB.new <<-END_MIG
+      Sequel.connect(database_url) do |db|
+        db.extension :schema_dumper
+        template = ERB.new <<-END_MIG
 Class.new(Sequel::Migration) do
   def up
   <% db.send(:sort_dumped_tables, db.tables, {}).each do |table| %>
@@ -29,7 +29,8 @@ Class.new(Sequel::Migration) do
 end
 END_MIG
 
-      template.result(binding)
+        template.result(binding)
+      end
     end
 
     def dump_table(database_url_or_db, table, options)
@@ -68,15 +69,17 @@ END_MIG
     end
 
     def foreign_keys(database_url)
-      db = Sequel.connect(database_url)
-      db.extension :schema_dumper
-      db.dump_foreign_key_migration
+      Sequel.connect(database_url) do |db|
+        db.extension :schema_dumper
+        db.dump_foreign_key_migration
+      end
     end
 
     def indexes(database_url)
-      db = Sequel.connect(database_url)
-      db.extension :schema_dumper
-      db.dump_indexes_migration
+      Sequel.connect(database_url) do |db|
+        db.extension :schema_dumper
+        db.dump_indexes_migration
+      end
     end
 
     def indexes_individual(database_url)
@@ -105,6 +108,7 @@ END_MIG
     end
 
     def load(database_url_or_db, schema, options = { drop: false })
+      schema = rewrite_non_integer_primary_keys(schema)
       # Accept either a database URL or an existing connection object
       if database_url_or_db.is_a?(Sequel::Database)
         db = database_url_or_db
@@ -158,6 +162,25 @@ END_MIG
       end
     end
 
+    NON_INTEGER_PK_PATTERN = /^(\s*)primary_key\s+(:?\w+),\s*:type=>"([^"]+)"(.*)$/
+    INTEGER_DB_TYPES       = /\A(?:int(?:eger|\d+)?|bigint|smallint|serial|bigserial|smallserial)/i
+
+    # On PG 10+, Sequel's CreateTableGenerator injects `identity: true` into
+    # every primary_key call via serial_primary_key_options. PG rejects IDENTITY
+    # on non-integer types. Rewrite `primary_key :col, :type=>"varchar..."` to
+    # `column :col, "varchar...", primary_key: true, null: false` which bypasses
+    # that code path entirely.
+    def rewrite_non_integer_primary_keys(schema_str)
+      schema_str.gsub(NON_INTEGER_PK_PATTERN) do
+        indent, col, db_type, rest = $1, $2, $3, $4
+        if db_type =~ INTEGER_DB_TYPES
+          "#{indent}primary_key #{col}, :type=>\"#{db_type}\"#{rest}"
+        else
+          "#{indent}column #{col}, \"#{db_type}\", primary_key: true, null: false#{rest}"
+        end
+      end
+    end
+
     def reset_db_sequences(database_url)
       Sequel.connect(database_url) do |db|
         db.extension :schema_dumper

data/lib/tapsoob/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Tapsoob
-  VERSION = "0.8.5".freeze
+  VERSION = "0.8.6".freeze
 end

data/spec/integration/postgres_spec.rb

@@ -105,12 +105,24 @@ RSpec.describe 'PostgreSQL round-trip', :integration do
 
     after(:each) do
       @src_db.run("DROP TABLE IF EXISTS varchar_pk_table")
+      @dst_db.run("DROP TABLE IF EXISTS varchar_pk_table")
     end
 
     it 'skips reset without logging a warning (no sequence attached to varchar PK)' do
       expect(Tapsoob.log).not_to receive(:warn)
       Tapsoob::Schema.reset_db_sequences(@src_url)
     end
+
+    it 'round-trips the table without identity column errors' do
+      dump_dir = Dir.mktmpdir
+      begin
+        pull(src_url, dump_dir)
+        expect { push(dst_url, dump_dir) }.not_to raise_error
+        expect(dst_db[:varchar_pk_table].where(id: 'abc-123').count).to eq(1)
+      ensure
+        FileUtils.rm_rf(dump_dir)
+      end
+    end
   end
 
   context 'when reset_primary_key_sequence raises a DatabaseError' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: java
 authors:
 - Félix Bellanger