pgsync 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4a582f7fd5b997ba91247f2b57ad68aae7b5fad282c32dca873d75667922af
-  data.tar.gz: a7ae6518b84d28c8ad14786793b8d4257d898214b8071ccc6c91e9d4d144e316
+  metadata.gz: 531d7975b4942abc5670b8c4ad43717da1326eacacc3b95f5d5797236cb82bb3
+  data.tar.gz: e32dfb82469fa2ebeeea844f0a09e87b8068bd7a201111b90d374eef779381af
 SHA512:
-  metadata.gz: f008b6d7114e3f11395479de0e85006c5eb48681b13ab613e1468d20a99acf0121566fe5499e236d1e8b07fdd12acc2c3a99399daac3e3e99269efac5e6bd4e5
-  data.tar.gz: 536af357b17f35c7afb0e8efba5411a0ecbec67adbfe364d465a8831dd0e56d108055b1ccb55bc0203d92d9a3215a11d3a287f52e89b40b6526534ddfbc8371e
+  metadata.gz: 4a33a680baaf706ad25fed35eaee3a8c3b191c7a5f6600b4ada42e55143a12226b0e1be189cf4c29d4866982e4f8c7b4915c4517375913083f3210f5fb131598
+  data.tar.gz: a3825c52c5e96c869ea06ed0ec969e1835aec5614f8bd1eb9255995972bdb3e526dd2996802e4d467b1497cfe371509b8a973cc8e3b61988d55f7fb0824d5293

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.6.2 (2020-06-09)
+
+- Added support for `--disable-integrity` on Amazon RDS
+- Fixed error when excluded table not found in source
+
 ## 0.6.1 (2020-06-07)
 
 - Added Django and Laravel integrations

data/README.md

@@ -220,6 +220,8 @@ To disable foreign key triggers and potentially break referential integrity, use
 pgsync --disable-integrity
 ```
 
+This requires superuser privileges on the `to` database. If syncing to (not from) Amazon RDS, use the `rds_superuser` role. If syncing to (not from) Heroku, there doesn’t appear to be a way to disable integrity.
+
 ## Triggers
 
 Disable user triggers with:

data/lib/pgsync/client.rb

@@ -70,6 +70,8 @@ Options:}
       o.boolean "--defer-constraints", "defer constraints", default: false
       o.boolean "--disable-user-triggers", "disable non-system triggers", default: false
       o.boolean "--disable-integrity", "disable foreign key triggers", default: false
+      # private, for testing
+      o.boolean "--disable-integrity-v2", "disable foreign key triggers", default: false, help: false
       o.boolean "-v", "--version", "print the version"
       o.boolean "-h", "--help", "prints help"
       o

data/lib/pgsync/init.rb

@@ -62,7 +62,7 @@ module PgSync
     end
 
     def django?
-      (File.read("manage.py") =~ /django/i) rescue false
+      file_exists?("manage.py", /django/i)
     end
 
     def heroku?
@@ -70,11 +70,21 @@ module PgSync
     end
 
     def laravel?
-      File.exist?("artisan")
+      file_exists?("artisan")
     end
 
     def rails?
-      File.exist?("bin/rails")
+      file_exists?("bin/rails")
+    end
+
+    def file_exists?(path, contents = nil)
+      if contents
+        File.read(path).match(contents)
+      else
+        File.exist?(path)
+      end
+    rescue
+      false
     end
   end
 end

data/lib/pgsync/task.rb

@@ -275,7 +275,7 @@ module PgSync
     end
 
     def maybe_disable_triggers
-      if opts[:disable_integrity] || opts[:disable_user_triggers]
+      if opts[:disable_integrity] || opts[:disable_integrity_v2] || opts[:disable_user_triggers]
         destination.transaction do
           triggers = destination.triggers(table)
           triggers.select! { |t| t["enabled"] == "t" }
@@ -283,7 +283,17 @@ module PgSync
           integrity_triggers = internal_triggers.select { |t| t["integrity"] == "t" }
           restore_triggers = []
 
-          if opts[:disable_integrity]
+          # both --disable-integrity options require superuser privileges
+          # however, only v2 works on Amazon RDS, which added specific support for it
+          # https://aws.amazon.com/about-aws/whats-new/2014/11/10/amazon-rds-postgresql-read-replicas/
+          #
+          # session_replication_role disables more than foreign keys (like triggers and rules)
+          # this is probably fine, but keep the current default for now
+          if opts[:disable_integrity_v2] || (opts[:disable_integrity] && rds?)
+            # SET LOCAL lasts until the end of the transaction
+            # https://www.postgresql.org/docs/current/sql-set.html
+            destination.execute("SET LOCAL session_replication_role = replica")
+          elsif opts[:disable_integrity]
             integrity_triggers.each do |trigger|
               destination.execute("ALTER TABLE #{quoted_table} DISABLE TRIGGER #{quote_ident(trigger["name"])}")
             end
@@ -311,5 +321,9 @@ module PgSync
         yield
       end
     end
+
+    def rds?
+      destination.execute("SELECT name, setting FROM pg_settings WHERE name LIKE 'rds.%'").any?
+    end
   end
 end

data/lib/pgsync/task_resolver.rb

@@ -148,7 +148,7 @@ module PgSync
           regex = Regexp.new('\A' + Regexp.escape(value).gsub('\*','[^\.]*') + '\z')
           tables.reject! { |t| regex.match(t.full_name) || regex.match(t.name) }
         else
-          tables -= [fully_resolve(to_table(value))]
+          tables -= [fully_resolve(to_table(value), error: false)].compact
         end
       end
 
@@ -181,9 +181,11 @@ module PgSync
     end
 
     # for tables without a schema, find the table in the search path
-    def fully_resolve(table)
+    def fully_resolve(table, error: true)
       return table if table.schema
-      no_schema_tables[table.name] || (raise Error, "Table not found in source: #{table.name}")
+      resolved_table = no_schema_tables[table.name]
+      raise Error, "Table not found in source: #{table.name}" if !resolved_table && error
+      resolved_table
     end
 
     # parse command line arguments and YAML

data/lib/pgsync/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel