lib/pgsync/utils.rb in pgsync-0.5.5 vs lib/pgsync/utils.rb in pgsync-0.6.0

@@ -16,31 +16,71 @@
       else
         message
       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 search_tree(file)
-      return file if File.exist?(file)
+    def first_schema
+      @first_schema ||= source.search_path.find { |sp| sp != "pg_catalog" }
+    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 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