tapsoob 0.5.29-java → 0.5.31-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f222b256d2bc44c66a833cb52cb11f5a4ca0c2cd5f629dd3b99b09e2a4514cfa
-  data.tar.gz: a70f4cafee12c2be3541e0628612e0ae5ccf29600b5378f0c9d58a6feea24be8
+  metadata.gz: 33639d8716323773a82a677847fee240c76e0d01728f900efabb8f2eabaa858b
+  data.tar.gz: 54b4abf4d2fde04504cb086876565b0c283847b2e85ec7fd717b0132ebb3e6b0
 SHA512:
-  metadata.gz: 1d47b6f360c042e49b7fb11174f07c05b822715c9132b07e1f89017c0f72d1807c1a68a5002f12e53f2e96ec744950491e2fe948717212dd9fd6e817452b0290
-  data.tar.gz: c2c5ae50991609f6ebf6a8eaf61ad6da8717097d3aad50b8be9b6a79bd20a596dc2ebc9207f51e25ded59d79856692945daab7fcf5ebc7f15a427fdf31ec959d
+  metadata.gz: c369566e1e8f912f6c7121f09992ccad21f922b7133cfb12afa4469471805438e02b1e9edb49464506f049e04518a225762d1daf48e9b3694b5d9fb748652f4f
+  data.tar.gz: 067272f6c031d01f7ea0fbbbc6c20b8c9ab44aa53e58515bc1676e9c93d210a75659adfbb0ed9412812e0fbfbe8a57adca16f33a76bcd23a5ef495ceda535fb8

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

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.29".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.29
+  version: 0.5.31
 platform: java
 authors:
 - Félix Bellanger