tapsoob 0.5.28 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488bc024b3e68fc52750a34073f6e1fd7544787d3e5d8f9994a31de6e7fa8dc7
-  data.tar.gz: 95f66bd12f95fa6ace15b95a0a8373a3b2665197fe383f1f3588f37f3ba41a6e
+  metadata.gz: bff0c57641151d932d224ec7b245a23c4b993eac3c8da25f10724208b46f5953
+  data.tar.gz: 186003a5f0156be1ebaac8f80ef44a3f985b23544a33a1e127067b776cf50d88
 SHA512:
-  metadata.gz: 90df45cbd8c7da3efda26ce50ce0216c14d45d61b86ea6d20531d4c17f61bf954cd0e07b1211fbbf00134e422e67220e21a4f7195926d9d2a9746e65beb104b6
-  data.tar.gz: 5d5754a77f0e7c85e4e8d347764a94ae1c365cc432d3a98a727dc53c5d0023ea861b4ae7fa1bfe2c7579a27f9de77780c245f01ddd84a92aef6bfdcd21145509
+  metadata.gz: c78e9d29d6247823deae5f9f1a86c59792b4e52c34f4d1536cdd16bc6168a2d38b3bfba434ec96b2be72d633e927f672578e70904387435a4152bc212ac544d5
+  data.tar.gz: 30a3507296d49349a3049fc2e24b61cbc98f49fdd0c38ce05f1714aefa0a598eed832ac5826c213f982b549708b566cc263053acf085b86ecc9fa7beb4ac6837

data/lib/tapsoob/operation.rb

@@ -183,7 +183,8 @@ module Tapsoob
 
       progress = ProgressBar.new('Schema', tables.size)
       tables.each do |table_name, count|
-        schema_data = Tapsoob::Schema.dump_table(database_url, table_name, @opts.slice(:indexes, :same_db))
+        # Reuse existing db connection for better performance
+        schema_data = Tapsoob::Schema.dump_table(db, table_name, @opts.slice(:indexes, :same_db))
         log.debug "Table: #{table_name}\n#{schema_data}\n"
         output = Tapsoob::Utils.export_schema(dump_path, table_name, schema_data)
         puts output if dump_path.nil? && output
@@ -405,7 +406,8 @@ module Tapsoob
       progress = ProgressBar.new('Schema', tables.size)
       tables.each do |table, count|
         log.debug "Loading '#{table}' schema\n"
-        Tapsoob::Utils.load_schema(dump_path, database_url, table)
+        # Reuse existing db connection for better performance
+        Tapsoob::Utils.load_schema(dump_path, db, table)
         progress.inc(1)
       end
       progress.finish
@@ -436,7 +438,9 @@ module Tapsoob
       log.info "#{tables.size} tables, #{format_number(record_count)} records"
 
       tables.each do |table_name, count|
-        next unless File.exist?(File.join(dump_path, "data", "#{table_name}.json")) || File.exist?(File.join(dump_path, "data", "#{table_name}.json")) && JSON.parse(File.read(File.join(dump_path, "data", "#{table_name}.json")))["data"].size == 0
+        # Skip if data file doesn't exist or has no data
+        data_file = File.join(dump_path, "data", "#{table_name}.json")
+        next unless File.exist?(data_file) && count > 0
         db[table_name.to_sym].truncate if @opts[:purge]
         stream = Tapsoob::DataStream.factory(db, {
           :table_name => table_name,
@@ -532,8 +536,13 @@ module Tapsoob
       tbls = Dir.glob(File.join(dump_path, "schemas", "*")).map { |path| File.basename(path, ".rb") }
       tbls.each do |table|
         if File.exist?(File.join(dump_path, "data", "#{table}.json"))
-          data = JSON.parse(File.read(File.join(dump_path, "data", "#{table}.json")))
-          tables_with_counts[table] = data["data"].size
+          # Read NDJSON format - each line is a separate JSON chunk
+          total_rows = 0
+          File.readlines(File.join(dump_path, "data", "#{table}.json")).each do |line|
+            chunk = JSON.parse(line.strip)
+            total_rows += chunk["data"].size if chunk["data"]
+          end
+          tables_with_counts[table] = total_rows
         else
           tables_with_counts[table] = 0
         end

data/lib/tapsoob/schema.rb

@@ -31,9 +31,11 @@ END_MIG
       template.result(binding)
     end
 
-    def dump_table(database_url, table, options)
+    def dump_table(database_url_or_db, table, options)
       table = table.to_sym
-      Sequel.connect(database_url) do |db|
+      # Accept either a database URL or an existing connection object
+      if database_url_or_db.is_a?(Sequel::Database)
+        db = database_url_or_db
         db.extension :schema_dumper
         <<END_MIG
 Class.new(Sequel::Migration) do
@@ -46,6 +48,21 @@ Class.new(Sequel::Migration) do
   end
 end
 END_MIG
+      else
+        Sequel.connect(database_url_or_db) do |db|
+          db.extension :schema_dumper
+          <<END_MIG
+Class.new(Sequel::Migration) do
+  def up
+    #{db.dump_table_schema(table, options)}
+  end
+
+  def down
+    drop_table("#{table}", if_exists: true)
+  end
+end
+END_MIG
+        end
       end
     end
 
@@ -86,8 +103,10 @@ END_MIG
       JSON.generate(idxs)
     end
 
-    def load(database_url, schema, options = { drop: false })
-      Sequel.connect(database_url) do |db|
+    def load(database_url_or_db, schema, options = { drop: false })
+      # Accept either a database URL or an existing connection object
+      if database_url_or_db.is_a?(Sequel::Database)
+        db = database_url_or_db
         db.extension :schema_dumper
         klass = eval(schema)
         if options[:drop]
@@ -101,6 +120,22 @@ END_MIG
           db.run("SET foreign_key_checks = 1") if [:mysql, :mysql2].include?(db.adapter_scheme)
         end
         klass.apply(db, :up)
+      else
+        Sequel.connect(database_url_or_db) do |db|
+          db.extension :schema_dumper
+          klass = eval(schema)
+          if options[:drop]
+            # Start special hack for MySQL
+            db.run("SET foreign_key_checks = 0") if [:mysql, :mysql2].include?(db.adapter_scheme)
+
+            # 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)
+          end
+          klass.apply(db, :up)
+        end
       end
     end
 

data/lib/tapsoob/utils.rb

@@ -161,9 +161,16 @@ Data : #{data}
       end
     end
 
-    def load_schema(dump_path, database_url, table)
-      schema = File.join(dump_path, "schemas", "#{table}.rb")
-      schema_bin(:load, database_url, schema.to_s)
+    def load_schema(dump_path, database_url_or_db, table)
+      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)
+      else
+        schema_bin(:load, database_url_or_db, schema_file)
+      end
     end
 
     def load_indexes(database_url, index)

data/lib/tapsoob/version.rb

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

metadata

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