tapsoob 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e0df11d8a5cbaca53aab795175f2addae2e0c08c39f3955e4dad7f1e08ff436
-  data.tar.gz: 991a74bb27b76dd013966c70590b953d8854c1982a7070ab05ec200b92ef3d30
+  metadata.gz: 5a0fdb4596821c1247ddc3e3c8530389f4bea8f5fb9de06b26ed6a2c2b454e69
+  data.tar.gz: 1b915563ac7c12021087409945d1b1ad0f451ce2f55d16ad2783cc45dd8b0e22
 SHA512:
-  metadata.gz: ee3899b17e99f919977cc2b77af18324c31cb9a7658f4a38d16f97d1cf8e2f2b1bdcd96e39b58e1545e273a22da52b96958b9c4246e1dd84739be18f427d380e
-  data.tar.gz: d52a2ba30e681ccb522f5ea8b5c05114b44d09ce1e378afc509436edd51ba49f428262294b0b3207eb5aa4d6f47db138fde6cc1ce3886ede1b0852650ade1f1a
+  metadata.gz: bd6289dc4bc12fc2fefe130e31343eada9f335bc4374acd51a0d83fa755f01cfa4fd394b62f111e61c1594b069594b6e08ccf4383138dc1114eda044ed456ee7
+  data.tar.gz: 955346a7e225032bf46429e878332757b0860f480ed07bab065d03634dedcb9fe54236beefe3a5f931ae3f8547aff4db322900b17ea75a8fd6e453b87a174424

data/lib/tapsoob/cli/root.rb

@@ -47,6 +47,7 @@ module Tapsoob
       option :tables, desc: "Shortcut to filter on a list of tables", type: :array, aliases: "-t"
       option :"exclude-tables", desc: "Shortcut to exclude a list of tables", type: :array, aliases: "-e"
       option :purge, desc: "Purge data in tables prior to performing the import", default: false, type: :boolean, aliases: "-p"
+      option :"drop-tables", desc: "Drop tables before pushing the schema (implies --schema)", default: false, type: :boolean
       option :"skip-duplicates", desc: "Remove duplicates when loading data", default: false, type: :boolean
       option :"discard-identity", desc: "Remove identity when pushing data (may result in creating duplicates)", default: false, type: :boolean
       option :parallel, desc: "Number of parallel workers for table processing (default: 1)", default: 1, type: :numeric, aliases: "-j"
@@ -97,6 +98,7 @@ module Tapsoob
 
           # Push only options
           opts[:purge] = options[:purge] if options.key?(:purge)
+          opts[:"drop-tables"] = options[:"drop-tables"] if options.key?(:"drop-tables")
           opts[:"skip-duplicates"] = options[:"skip-duplicates"] if options.key?(:"skip-duplicates")
           opts[:"discard-identity"] = options[:"discard-identity"] if options.key?(:"discard-identity")
 

data/lib/tapsoob/operation/push.rb

@@ -71,11 +71,12 @@ module Tapsoob
         log.info "Sending schema"
         Tapsoob::ProgressEvent.schema_start(tables.size)
 
+        schema_opts = { drop: opts[:"drop-tables"] || false }
         progress = opts[:progress] ? Tapsoob::Progress::Bar.new('Schema', tables.size) : nil
         tables.each do |table, count|
           log.debug "Loading '#{table}' schema\n"
           # Reuse existing db connection for better performance
-          Tapsoob::Utils.load_schema(dump_path, db, table)
+          Tapsoob::Utils.load_schema(dump_path, db, table, schema_opts)
           progress.inc(1) if progress
         end
         progress.finish if progress

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

data/lib/tapsoob/utils.rb

@@ -174,13 +174,13 @@ Data : #{data}
       end
     end
 
-    def load_schema(dump_path, database_url_or_db, table)
+    def load_schema(dump_path, database_url_or_db, table, options = {})
       schema_file = File.join(dump_path, "schemas", "#{table}.rb")
       schema_content = File.read(schema_file)
 
       # If we have a connection object, use it directly for better performance
       if database_url_or_db.is_a?(Sequel::Database)
-        Tapsoob::Schema.load(database_url_or_db, schema_content)
+        Tapsoob::Schema.load(database_url_or_db, schema_content, options)
       else
         schema_bin(:load, database_url_or_db, schema_file)
       end

data/lib/tapsoob/version.rb

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

data/spec/integration/sqlite_spec.rb

@@ -79,6 +79,37 @@ RSpec.describe 'SQLite round-trip', :integration do
     end
   end
 
+  context 'with --drop-tables' do
+    let(:drop_dir) { Dir.mktmpdir }
+    after { FileUtils.rm_rf(drop_dir) }
+
+    it 'succeeds when destination tables already exist' do
+      pull(src_url, drop_dir)
+      push(dst_url, drop_dir)
+
+      # Second push with --drop-tables: tables exist, should drop and recreate
+      expect { push(dst_url, drop_dir, :"drop-tables" => true) }.not_to raise_error
+    end
+
+    it 'preserves row counts after drop and re-push' do
+      pull(src_url, drop_dir)
+      push(dst_url, drop_dir)
+      push(dst_url, drop_dir, :"drop-tables" => true)
+
+      expect_same_counts(src_db, dst_db)
+    end
+
+    it 'does not duplicate rows on re-push' do
+      pull(src_url, drop_dir)
+      push(dst_url, drop_dir)
+      push(dst_url, drop_dir, :"drop-tables" => true)
+
+      src_db.tables.each do |table|
+        expect(dst_db[table].count).to eq(src_db[table].count)
+      end
+    end
+  end
+
   context 'with custom chunksize' do
     let(:chunk_dir) { Dir.mktmpdir }
     after { FileUtils.rm_rf(chunk_dir) }

data/tapsoob.gemspec

@@ -20,18 +20,18 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Dependencies
-  s.add_dependency "sequel", "~> 5.96.0"
-  s.add_dependency "thor", "~> 1.4.0"
+  s.add_dependency "sequel", "~> 5.105.0"
+  s.add_dependency "thor", "~> 1.5.0"
 
   if (RUBY_PLATFORM =~ /java/).nil?
     s.add_development_dependency "mysql2",  "~> 0.5.7"
-    s.add_development_dependency "pg",      "~> 1.6.2"
-    s.add_development_dependency "sqlite3", "~> 2.7.4"
+    s.add_development_dependency "pg",      "~> 1.6.3"
+    s.add_development_dependency "sqlite3", "~> 2.9.5"
   else
     s.platform = 'java'
 
     s.add_dependency "jdbc-mysql",    "~> 9.1.0.1"
-    s.add_dependency "jdbc-postgres", "~> 42.7.0"
+    s.add_dependency "jdbc-postgres", "~> 42.7.11"
     s.add_dependency "jdbc-sqlite3",  "~> 3.46.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-12 00:00:00.000000000 Z
+date: 2026-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.96.0
+        version: 5.105.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.96.0
+        version: 5.105.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -59,28 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.9.5
 description: Simple tool to import/export databases inspired by taps but OOB, meaning
   databases are imported/exported from the filesystem.
 email: felix.bellanger@faveod.com