pgsync 0.5.5 → 0.6.0

data/lib/pgsync/utils.rb

@@ -18,29 +18,69 @@ module PgSync
       end
     end
 
+    def warning(message)
+      log colorize(message, :yellow)
+    end
+
+    def deprecated(message)
+      warning "[DEPRECATED] #{message}"
+    end
+
     def output
       $stderr
     end
 
-    def config_file
-      search_tree(db_config_file(@options[:db]) || @options[:config] || ".pgsync.yml")
+    def db_config_file(db)
+      ".pgsync-#{db}.yml"
     end
 
-    def db_config_file(db)
-      ".pgsync-#{db}.yml" if db
+    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
+      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 search_tree(file)
-      return file if File.exist?(file)
+    def friendly_name(table)
+      if table.schema == first_schema
+        table.name
+      else
+        table.full_name
+      end
+    end
 
-      path = Dir.pwd
-      # prevent infinite loop
-      20.times do
-        absolute_file = File.join(path, file)
-        break absolute_file if File.exist?(absolute_file)
-        path = File.dirname(path)
-        break if path == "/"
+    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.5"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -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,141 +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
-      @groups = config["groups"] || {}
-    end
-
-    def group?(group)
-      @groups.key?(group)
-    end
-
-    def tables
-      tables = {}
-      sql = args[1]
-
-      groups = to_arr(opts[:groups])
-      tables2 = to_arr(opts[:tables])
-
-      if args[0]
-        # could be a group, table, or mix
-        to_arr(args[0]).each do |tag|
-          group, id = tag.split(":", 2)
-          if group?(group)
-            groups << tag
-          else
-            tables2 << tag
-          end
-        end
-      end
-
-      groups.each do |tag|
-        group, id = tag.split(":", 2)
-        raise Error, "Group not found: #{group}" unless group?(group)
-
-        # 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.", :yellow)
-        #   log colorize("Use `pgsync group --var 1=value` instead.", :yellow)
-        # end
-
-        @groups[group].each do |table|
-          table_sql = nil
-          if table.is_a?(Array)
-            table, table_sql = table
-          end
-          add_table(tables, table, id, sql || table_sql)
-        end
-      end
-
-      tables2.each do |tag|
-        table, id = tag.split(":", 2)
-        raise Error, "Cannot use parameters with tables" if id
-        add_table(tables, table, id, sql)
-      end
-
-      if !opts[:groups] && !opts[:tables] && !args[0]
-        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
-
-        (tabs - exclude).each do |k|
-          tables[k] = {}
-        end
-      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_table(tables, table, id, sql)
-      tables2 =
-        if table.include?("*")
-          regex = Regexp.new('\A' + Regexp.escape(table).gsub('\*','[^\.]*') + '\z')
-          source.tables.select { |t| regex.match(t) || regex.match(t.split(".", 2).last) }
-        else
-          [table]
-        end
-
-      tables2.each do |tab|
-        tables[tab] = {}
-        tables[tab][:sql] = table_sql(sql, id) if sql
-      end
-    end
-
-    def table_sql(sql, id)
-      # 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 = sql.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?
-
-      sql
-    end
-
-    # TODO quote vars in next major version
-    def cast(value)
-      value.to_s.gsub(/\A\"|\"\z/, '')
-    end
-  end
-end