pgsync 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12edffcbf1375d06f4a56916e2581053711b3a81
-  data.tar.gz: c1b08b53a4f0dd07d32d87d921400f3718aaa07e
+  metadata.gz: be53714690e45e12a419c524673bddecbb151fa1
+  data.tar.gz: 6c4a70c4296a2bc96121fbfc7b0512dc9e47ab1b
 SHA512:
-  metadata.gz: e6484259d1dd62dde1b95b8472ae487298dae7848a0e14a95f68efc75bc954a370eb8b2ed74121c26dcc98c46c365a00a823386c88abe27e3ca02e81bbfa363a
-  data.tar.gz: e510ca2717985f8d2f1fd0fc2e16219f81a63f6a55171911508e4def6bc22769267c99d393df02dea15713fe80e030dab67690808517179f5a717953fda99308
+  metadata.gz: 13542ba5e8ac5f81be20154f51ba9ea45fd9fc2bfb8d9e3abcbd32eee620f4a3fbb1c71493909ef44664982240ea59e05f0ed829032d8c6ec06f0a4c4b53cf7c
+  data.tar.gz: fe69eac5b5acdfa879664ed5bc88ae99abe853f5cbf4af093b43849be98315acb2695f2fd92ca49b883322a03d541f2da7e79c7914040bbf4ab0943ff68db5c5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.3
+
+- Added `-d` option as an alias for `--db`
+- Added support for wildcard tables
+- Fixed `--schema-only` errors
+
 # 0.3.2
 
 - Prefer `{1}` for interpolation

data/lib/pgsync.rb

@@ -93,8 +93,10 @@ module PgSync
         if opts[:schema_only]
           log "* Dumping schema"
           tables = tables.keys.map { |t| "-t #{t}" }.join(" ")
-          dump_command = "pg_dump --verbose --schema-only --no-owner --no-acl --clean #{tables} #{to_url(source_uri)}"
-          restore_command = "psql -q -d #{to_url(destination_uri)}"
+          psql_version = Gem::Version.new(`psql --version`.split(" ").last)
+          if_exists = psql_version >= Gem::Version.new("9.4.0")
+          dump_command = "pg_dump -Fc --verbose --schema-only --no-owner --no-acl #{tables} #{to_url(source_uri)}"
+          restore_command = "pg_restore --verbose --no-owner --no-acl --clean #{if_exists ? "--if-exists" : nil} -d #{to_url(destination_uri)}"
           system("#{dump_command} | #{restore_command}")
 
           log_completed(start_time)
@@ -245,13 +247,13 @@ module PgSync
 Options:}
         o.string "-t", "--tables", "tables"
         o.string "-g", "--groups", "groups"
+        o.string "-d", "--db", "database"
         o.string "--from", "source"
         o.string "--to", "destination"
         o.string "--where", "where", help: false
         o.integer "--limit", "limit", help: false
         o.string "--exclude", "exclude tables"
         o.string "--config", "config file"
-        o.string "--db", "database"
         # TODO much better name for this option
         o.boolean "--to-safe", "accept danger", default: false
         o.boolean "--debug", "debug", default: false
@@ -516,19 +518,27 @@ Options:}
       end
     end
 
-    def add_tables(tables, t, id, boom)
+    def add_tables(tables, t, id, boom, from_uri)
       t.each do |table|
         sql = nil
         if table.is_a?(Array)
           table, sql = table
         end
-        add_table(tables, table, id, boom || sql)
+        add_table(tables, table, id, boom || sql, from_uri)
       end
     end
 
-    def add_table(tables, table, id, boom)
-      tables[table] = {}
-      tables[table][:sql] = boom.gsub("{id}", cast(id)).gsub("{1}", cast(id)) if boom
+    def add_table(tables, table, id, boom, from_uri, wildcard = false)
+      if table.include?("*") && !wildcard
+        regex = Regexp.new('\A' + Regexp.escape(table).gsub('\*','[^\.]*') + '\z')
+        t2 = with_connection(from_uri) { |conn| self.tables(conn, "public") }.select { |t| regex.match(t) }
+        t2.each do |table|
+          add_table(tables, table, id, boom, from_uri, true)
+        end
+      else
+        tables[table] = {}
+        tables[table][:sql] = boom.gsub("{id}", cast(id)).gsub("{1}", cast(id)) if boom
+      end
     end
 
     def table_list(args, opts, from_uri)
@@ -540,7 +550,7 @@ Options:}
         specified_groups.map do |tag|
           group, id = tag.split(":", 2)
           if (t = (config["groups"] || {})[group])
-            add_tables(tables, t, id, args[1])
+            add_tables(tables, t, id, args[1], from_uri)
           else
             abort "Group not found: #{group}"
           end
@@ -551,7 +561,7 @@ Options:}
         tables ||= Hash.new { |hash, key| hash[key] = {} }
         to_arr(opts[:tables]).each do |tag|
           table, id = tag.split(":", 2)
-          add_table(tables, table, id, args[1])
+          add_table(tables, table, id, args[1], from_uri)
         end
       end
 
@@ -562,9 +572,9 @@ Options:}
         specified_groups.map do |tag|
           group, id = tag.split(":", 2)
           if (t = (config["groups"] || {})[group])
-            add_tables(tables, t, id, args[1])
+            add_tables(tables, t, id, args[1], from_uri)
           else
-            add_table(tables, group, id, args[1])
+            add_table(tables, group, id, args[1], from_uri)
           end
         end
       end

data/lib/pgsync/version.rb

@@ -1,3 +1,3 @@
 module PgSync
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop