tapsoob 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b462af6073abaf47bcb13d46504696b4dfa6f7dc7dca762e050b9664b6a6da9
-  data.tar.gz: e2e46b8b2d1f08cfe67a82c8c1ab542e39e801793142ad1a93ae6aaf63175790
+  metadata.gz: 30cfe2b3b3f3c8e9daa9283eec5d3a3cdf6e6a689a60d21d8e4ad3306740a9aa
+  data.tar.gz: 3980451f8e14dd52c7fbf22de83cacf32ebc57de19c8c704a261575c5e92adb4
 SHA512:
-  metadata.gz: 3f26a3c56a9a824fbd855924fc59fd6abdf4b8ff0f8c44747ecfbc26316f77dca7d603e39fce09cda03f3c4eabeed6522da1c7a8e8f6baa3c95e277531120f35
-  data.tar.gz: 0f22b48db14b094b3a93375ac9004f1f520537ce45918a7069a6e7141dfb437c4b0382c8376e1c52216d4407d83d15875adb1a11d6b9970bd333cf859167f179
+  metadata.gz: baf8a2278be1d5499ad64a4ef89be355f7cc3e82f3efd759c51c254cc3e28567955fce8b6f5e4025bf451a08f8cf0fe7e236c09e536f6e09ffd71875eb276246
+  data.tar.gz: 20ae520ae8daa165509b91f3b448268b2a3927f2285e422a2540b5eab75d3b66839aad441b90c58c0b8e83edd43004c27921c41bdcf9c80088e8745f5892d523

data/lib/tapsoob/schema.rb

@@ -112,12 +112,14 @@ END_MIG
         if options[:drop]
           # Start special hack for MySQL
           db.run("SET foreign_key_checks = 0") if [:mysql, :mysql2].include?(db.adapter_scheme)
+          db.run("PRAGMA foreign_keys = OFF") if db.adapter_scheme == :sqlite
 
           # Run down migration
           klass.apply(db, :down)
 
           # End special hack for MySQL
           db.run("SET foreign_key_checks = 1") if [:mysql, :mysql2].include?(db.adapter_scheme)
+          db.run("PRAGMA foreign_keys = ON") if db.adapter_scheme == :sqlite
         end
         klass.apply(db, :up)
       else
@@ -127,12 +129,14 @@ END_MIG
           if options[:drop]
             # Start special hack for MySQL
             db.run("SET foreign_key_checks = 0") if [:mysql, :mysql2].include?(db.adapter_scheme)
+            db.run("PRAGMA foreign_keys = OFF") if db.adapter_scheme == :sqlite
 
             # Run down migration
             klass.apply(db, :down)
 
             # End special hack for MySQL
             db.run("SET foreign_key_checks = 1") if [:mysql, :mysql2].include?(db.adapter_scheme)
+            db.run("PRAGMA foreign_keys = ON") if db.adapter_scheme == :sqlite
           end
           klass.apply(db, :up)
         end
@@ -158,6 +162,10 @@ END_MIG
       db.extension :schema_dumper
       return unless db.respond_to?(:reset_primary_key_sequence)
       db.tables.each do |table|
+        pk = db.primary_key(table)
+        next unless pk
+        pk_type = db.schema(table).find { |col, _| col.to_s == pk.to_s }&.last&.dig(:db_type)
+        next unless pk_type&.match?(/int|serial/i)
         db.reset_primary_key_sequence(table)
       end
     end

data/lib/tapsoob/version.rb

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

data/spec/integration/postgres_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'tapsoob/schema'
 
 # PostgreSQL integration suite.
 # In CI: supplied by the postgres service container via POSTGRES_* env vars.
@@ -94,4 +95,22 @@ RSpec.describe 'PostgreSQL round-trip', :integration do
       expect_same_counts(src_db, dst_db)
     end
   end
+
+  context 'with a varchar primary key table' do
+    before(:each) do
+      @src_db.run("DROP TABLE IF EXISTS varchar_pk_table")
+      @src_db.run("CREATE TABLE varchar_pk_table (id varchar(36) PRIMARY KEY, label text)")
+      @src_db.run("INSERT INTO varchar_pk_table VALUES ('abc-123', 'test')")
+    end
+
+    after(:each) do
+      @src_db.run("DROP TABLE IF EXISTS varchar_pk_table")
+    end
+
+    it 'reset_db_sequences does not raise on a varchar primary key' do
+      expect {
+        Tapsoob::Schema.reset_db_sequences(@src_url)
+      }.not_to raise_error
+    end
+  end
 end

metadata

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