tapsoob 0.4.22-java → 0.4.26-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24ebcbf2da1819077b890ed4cd70f997c2198ea2199721ff082f3b27838b86f3
-  data.tar.gz: 4374df62d0b72a66144d7cc96ce73f66c65e77aad417d85eae9e029f3c729d5c
+  metadata.gz: 8e3cbb277f5cdce47dedb68f56ac4122c47e44fa3b3206c6a319c35e86958781
+  data.tar.gz: bd35fe8afb0c23aaf477ea253fd3caee584bc2d889ab44edbd0e06531a657e73
 SHA512:
-  metadata.gz: 16630f8226647e49146656d6d6a93602aba3d2154e50bd73f7744fbf11bb942004292fe8e5a2a43e1d2f4c4686cbc3fd6694abc24f241b8c56c9e165455d8d37
-  data.tar.gz: 48ced3dcfc19dcba1196961ee2fa0544a490f56a4357d3c5cec52ea5759ba3e499fd9fa4fc89e3a260549326034938c9c0bd29840f05f8ba5148af2564c09114
+  metadata.gz: 7810d544770e15e4ed266f367f6e5f9477df1909122ec02c9c542d59cad422cdb80bd789286a21a4109634562f41159a5b4723bb45b129f6ff44ee4d770a2b7f
+  data.tar.gz: ad0409458ec17dfc37d274a8fa4245c16cc242e77423407bd46eb6c1dd62bfa625041b7d6fef4603052baea5f47849c9ba2f8a41bd058dcfe9c6e0283ede6086

data/lib/tapsoob/cli/data_stream.rb

@@ -12,7 +12,6 @@ module Tapsoob
     class DataStream < Thor
       desc "pull DATABASE_URL [DUMP_PATH]", "Pull data from a database."
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
-      option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       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 :progress, desc: "Show progress", default: true, type: :boolean, aliases: "-p"
@@ -24,7 +23,6 @@ module Tapsoob
 
       desc "push DATABASE_URL [DUMP_PATH]", "Push data to a database."
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
-      option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       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 :progress, desc: "Show progress", default: true, type: :boolean, aliases: "-p"
@@ -65,6 +63,7 @@ module Tapsoob
           # Default options
           opts = {
             progress: options[:progress],
+            tables: options[:tables],
             debug: options[:debug]
           }
 
@@ -78,15 +77,6 @@ module Tapsoob
             opts[:default_chunksize] = (options[:chunksize] < 10 ? 10 : options[:chunksize])
           end
 
-          # Regex filter
-          opts[:table_filter] = options[:filter] if options[:filter]
-
-          # Table filter
-          if options[:tables]
-            r_tables = options[:tables].collect { |t| "^#{t}" }.join("|")
-            opts[:table_filter] = "#{r_tables}"
-          end
-
           # Exclude tables
           opts[:exclude_tables] = options[:"exclude-tables"] if options[:"exclude-tables"]
 

data/lib/tapsoob/cli/root.rb

@@ -15,7 +15,6 @@ module Tapsoob
       option :resume, desc: "Resume a Tapsoob Session from a stored file", type: :string, aliases: "-r"
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
       option :"disable-compression", desc: "Disable Compression", default: false, type: :boolean, aliases: "-g"
-      option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       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 :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
@@ -35,7 +34,6 @@ module Tapsoob
       option :resume, desc: "Resume a Tapsoob Session from a stored file", type: :string, aliases: "-r"
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
       option :"disable-compression", desc: "Disable Compression", default: false, type: :boolean, aliases: "-g"
-      option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       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"
@@ -70,6 +68,7 @@ module Tapsoob
             skip_schema: options[:"skip-schema"],
             indexes_first: options[:"indexes_first"],
             disable_compression: options[:"disable-compression"],
+            tables: options[:tables],
             debug: options[:debug]
           }
 
@@ -92,15 +91,6 @@ module Tapsoob
             opts[:default_chunksize] = (options[:chunksize] < 10 ? 10 : options[:chunksize])
           end
 
-          # Regex filter
-          opts[:table_filter] = options[:filter] if options[:filter]
-
-          # Table filter
-          if options[:tables]
-            r_tables = options[:tables].collect { |t| "^#{t}" }.join("|")
-            opts[:table_filter] = "#{r_tables}"
-          end
-
           # Exclude tables
           opts[:exclude_tables] = options[:"exclude-tables"] if options[:"exclude-tables"]
 

data/lib/tapsoob/operation.rb

@@ -30,7 +30,7 @@ module Tapsoob
     end
 
     def table_filter
-      opts[:table_filter]
+      opts[:tables] || []
     end
 
     def exclude_tables
@@ -38,19 +38,18 @@ module Tapsoob
     end
 
     def apply_table_filter(tables)
-      return tables unless table_filter || exclude_tables
+      return tables if table_filter.empty? && exclude_tables.empty?
 
-      re = table_filter ? Regexp.new(table_filter) : nil
       if tables.kind_of?(Hash)
         ntables = {}
         tables.each do |t, d|
-          if !exclude_tables.include?(t.to_s) && (!re || !re.match(t.to_s).nil?)
+          if !exclude_tables.include?(t.to_s) && (!table_filter.empty? && table_filter.include?(t.to_s))
             ntables[t] = d
           end
         end
         ntables
       else
-        tables.reject { |t| exclude_tables.include?(t.to_s) || (re && re.match(t.to_s).nil?) }
+        tables.reject { |t| exclude_tables.include?(t.to_s) }.select { |t| table_filter.include?(t.to_s) }
       end
     end
 
@@ -182,7 +181,7 @@ module Tapsoob
         schema_data = Tapsoob::Schema.dump_table(database_url, table_name)
         log.debug "Table: #{table_name}\n#{schema_data}\n"
         output = Tapsoob::Utils.export_schema(dump_path, table_name, schema_data)
-        puts output if output
+        puts output if dump_path.nil? && output
         progress.inc(1)
       end
       progress.finish
@@ -290,7 +289,7 @@ module Tapsoob
     def pull_indexes
       log.info "Receiving indexes"
 
-      raw_idxs = Tapsoob::Utils.schema_bin(:indexes_individual, database_url)
+      raw_idxs = Tapsoob::Schema.indexes_individual(database_url)
       idxs     = (raw_idxs && raw_idxs.length >= 2 ? JSON.parse(raw_idxs) : {})
 
       apply_table_filter(idxs).each do |table, indexes|
@@ -298,7 +297,7 @@ module Tapsoob
         progress = ProgressBar.new(table, indexes.size)
         indexes.each do |idx|
           output = Tapsoob::Utils.export_indexes(dump_path, table, idx)
-          puts output if output
+          puts output if dump_path.nil? && output
           progress.inc(1)
         end
         progress.finish
@@ -309,7 +308,7 @@ module Tapsoob
       log.info "Resetting sequences"
 
       output = Tapsoob::Utils.schema_bin(:reset_db_sequences, database_url)
-      puts output if output
+      puts output if dump_path.nil? && output
     end
   end
 
@@ -393,7 +392,7 @@ module Tapsoob
       log.info "#{tables.size} tables, #{format_number(record_count)} records"
 
       tables.each do |table_name, count|
-        next unless File.exists?(File.join(dump_path, "data", "#{table_name}.json")) || JSON.parse(File.read(File.join(dump_path, "data", "#{table_name}.json")))["data"].size == 0
+        next unless File.exists?(File.join(dump_path, "data", "#{table_name}.json")) || File.exists?(File.join(dump_path, "data", "#{table_name}.json")) && JSON.parse(File.read(File.join(dump_path, "data", "#{table_name}.json")))["data"].size == 0
         db[table_name.to_sym].truncate if @opts[:purge]
         stream = Tapsoob::DataStream.factory(db, {
           :table_name => table_name,

data/lib/tapsoob/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.26
 platform: java
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement