pgsync 0.5.2 → 0.6.1

data/lib/pgsync/utils.rb

@@ -1,46 +1,86 @@
 module PgSync
   module Utils
+    COLOR_CODES = {
+      red: 31,
+      green: 32,
+      yellow: 33
+    }
+
     def log(message = nil)
-      $stderr.puts message
+      output.puts message
     end
 
-    def colorize(message, color_code)
-      if $stderr.tty?
-        "\e[#{color_code}m#{message}\e[0m"
+    def colorize(message, color)
+      if output.tty?
+        "\e[#{COLOR_CODES[color]}m#{message}\e[0m"
       else
         message
       end
     end
 
-    def config_file
-      return @config_file if instance_variable_defined?(:@config_file)
+    def warning(message)
+      log colorize(message, :yellow)
+    end
+
+    def deprecated(message)
+      warning "[DEPRECATED] #{message}"
+    end
 
-      @config_file =
-        search_tree(
-          if @options[:db]
-            db_config_file(@options[:db])
-          else
-            @options[:config] || ".pgsync.yml"
-          end
-        )
+    def output
+      $stderr
     end
 
     def db_config_file(db)
-      return unless db
       ".pgsync-#{db}.yml"
     end
 
-    def search_tree(file)
-      path = Dir.pwd
-      # prevent infinite loop
-      20.times do
-        absolute_file = File.join(path, file)
-        if File.exist?(absolute_file)
-          break absolute_file
+    def confirm_tables_exist(data_source, tasks, description)
+      tasks.map(&:table).each do |table|
+        unless data_source.table_exists?(table)
+          raise Error, "Table not found in #{description}: #{table}"
         end
-        path = File.dirname(path)
-        break if path == "/"
       end
     end
+
+    def first_schema
+      @first_schema ||= source.search_path.find { |sp| sp != "pg_catalog" }
+    end
+
+    def task_name(task)
+      friendly_name(task.table)
+    end
+
+    def friendly_name(table)
+      if table.schema == first_schema
+        table.name
+      else
+        table.full_name
+      end
+    end
+
+    def quote_ident_full(ident)
+      if ident.is_a?(Table)
+        [quote_ident(ident.schema), quote_ident(ident.name)].join(".")
+      else # temp table names are strings
+        quote_ident(ident)
+      end
+    end
+
+    def quote_ident(value)
+      PG::Connection.quote_ident(value)
+    end
+
+    def escape(value)
+      if value.is_a?(String)
+        "'#{quote_string(value)}'"
+      else
+        value
+      end
+    end
+
+    # activerecord
+    def quote_string(s)
+      s.gsub(/\\/, '\&\&').gsub(/'/, "''")
+    end
   end
 end

data/lib/pgsync/version.rb

@@ -1,3 +1,3 @@
 module PgSync
-  VERSION = "0.5.2"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.8.1
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -124,9 +124,12 @@ files:
 - lib/pgsync/client.rb
 - lib/pgsync/data_source.rb
 - lib/pgsync/init.rb
+- lib/pgsync/schema_sync.rb
 - lib/pgsync/sync.rb
-- lib/pgsync/table_list.rb
+- lib/pgsync/table.rb
 - lib/pgsync/table_sync.rb
+- lib/pgsync/task.rb
+- lib/pgsync/task_resolver.rb
 - lib/pgsync/utils.rb
 - lib/pgsync/version.rb
 homepage: https://github.com/ankane/pgsync

data/lib/pgsync/table_list.rb

@@ -1,143 +0,0 @@
-module PgSync
-  class TableList
-    include Utils
-
-    attr_reader :args, :opts, :source, :config
-
-    def initialize(args, options, source, config)
-      @args = args
-      @opts = options
-      @source = source
-      @config = config
-    end
-
-    def tables
-      tables = nil
-
-      if opts[:groups]
-        tables ||= Hash.new { |hash, key| hash[key] = {} }
-        specified_groups = to_arr(opts[:groups])
-        specified_groups.map do |tag|
-          group, id = tag.split(":", 2)
-          if (t = (config["groups"] || {})[group])
-            add_tables(tables, t, id, args[1])
-          else
-            raise Error, "Group not found: #{group}"
-          end
-        end
-      end
-
-      if opts[:tables]
-        tables ||= Hash.new { |hash, key| hash[key] = {} }
-        to_arr(opts[:tables]).each do |tag|
-          table, id = tag.split(":", 2)
-          raise Error, "Cannot use parameters with tables" if id
-          add_table(tables, table, id, args[1])
-        end
-      end
-
-      if args[0]
-        # could be a group, table, or mix
-        tables ||= Hash.new { |hash, key| hash[key] = {} }
-        specified_groups = to_arr(args[0])
-        specified_groups.map do |tag|
-          group, id = tag.split(":", 2)
-          if (t = (config["groups"] || {})[group])
-            add_tables(tables, t, id, args[1])
-          else
-            raise Error, "Cannot use parameters with tables" if id
-            add_table(tables, group, id, args[1])
-          end
-        end
-      end
-
-      tables ||= begin
-        exclude = to_arr(opts[:exclude])
-        exclude = source.fully_resolve_tables(exclude).keys if exclude.any?
-
-        tabs = source.tables
-        unless opts[:all_schemas]
-          schemas = Set.new(opts[:schemas] ? to_arr(opts[:schemas]) : source.search_path)
-          tabs.select! { |t| schemas.include?(t.split(".", 2)[0]) }
-        end
-
-        Hash[(tabs - exclude).map { |k| [k, {}] }]
-      end
-
-      source.fully_resolve_tables(tables)
-    end
-
-    private
-
-    def to_arr(value)
-      if value.is_a?(Array)
-        value
-      else
-        # Split by commas, but don't use commas inside double quotes
-        # https://stackoverflow.com/questions/21105360/regex-find-comma-not-inside-quotes
-        value.to_s.split(/(?!\B"[^"]*),(?![^"]*"\B)/)
-      end
-    end
-
-    def add_tables(tables, t, id, boom)
-      # if id
-      #   # TODO show group name and value
-      #   log colorize("`pgsync group:value` is deprecated and will have a different function in 0.6.0.", 33) # yellow
-      #   log colorize("Use `pgsync group --var 1=value` instead.", 33) # yellow
-      # end
-
-      t.each do |table|
-        sql = nil
-        if table.is_a?(Array)
-          table, sql = table
-        end
-        add_table(tables, table, id, boom || sql)
-      end
-    end
-
-    def add_table(tables, table, id, boom, wildcard = false)
-      if table.include?("*") && !wildcard
-        regex = Regexp.new('\A' + Regexp.escape(table).gsub('\*','[^\.]*') + '\z')
-        t2 = source.tables.select { |t| regex.match(t) }
-        t2.each do |tab|
-          add_table(tables, tab, id, boom, true)
-        end
-      else
-        tables[table] = {}
-        if boom
-          sql = boom.dup
-          # vars must match \w
-          missing_vars = sql.scan(/{\w+}/).map { |v| v[1..-2] }
-
-          vars = {}
-
-          # legacy
-          if id
-            vars["id"] = cast(id)
-            vars["1"] = cast(id)
-          end
-
-          # opts[:var].each do |value|
-          #   k, v = value.split("=", 2)
-          #   vars[k] = v
-          # end
-
-          sql = boom.dup
-          vars.each do |k, v|
-            # only sub if in var list
-            sql.gsub!("{#{k}}", cast(v)) if missing_vars.delete(k)
-          end
-
-          raise Error, "Missing variables: #{missing_vars.uniq.join(", ")}" if missing_vars.any?
-
-          tables[table][:sql] = sql
-        end
-      end
-    end
-
-    # TODO quote vars in next major version
-    def cast(value)
-      value.to_s.gsub(/\A\"|\"\z/, '')
-    end
-  end
-end