prodder 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffad577e74259c3700295becff4baeafd8fa42038529e104e46edf6cbd59ca2
-  data.tar.gz: 0283df1e58d3b49ea8c51bf7b715230bffbf9b51e031ae5450c5c9d83dcb6c36
+  metadata.gz: 837adeb9529887b429bbe128bbb9162f29d0ca5001fbd94b28aba2aa105caacb
+  data.tar.gz: e3b410b12794de3b1a04d55adad8ac789c83658526c4a749b8494878381c7e0a
 SHA512:
-  metadata.gz: 0cd59679ebdf492e96a0f1858217660dca26f68b910d38df60cd9877de773a4998e90280900cc539ad4eb286ae4ce995e33aebfb3f8f8a76ee4925dc95da9203
-  data.tar.gz: 6e144e41880ed23e55f11ab6688b5bfdcba6fdf46faa451cb096c42c38a1e8778f98e558adbfee27f40981f0b56f1b3a095b325c29af0da4656f09c39d773d0e
+  metadata.gz: d5982600241c08dc3c623c8c1e6153cfbd10bd6c20f3fa3074f4cf45335f6fd091c58e31e2e26da624c956b6624458ce21ce117568b933ec72aab8f2f30d295d
+  data.tar.gz: 697799d716ab1bd9a7fbc19b3a346681621ffd8cf3b732ee2eed41acb86b7626fb0eb16f239a307c62c797f890a1cfc9c8e2d6db367fb1542ed174ca14512aee

data/.travis.yml

@@ -2,24 +2,20 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
+  - 2.5.8
+  - 2.7.2
 
 env:
   matrix:
-    - PG_VERSION=9.3
-    - PG_VERSION=9.4
-    - PG_VERSION=9.5
+    - PG_VERSION=11
 
 before_install:
   - git config --global user.name "Prodder In Travis-CI"
   - git config --global user.email "prodder@example.com"
-  # install postgresql v9.5
-  - if [[ "$PG_VERSION" = "9.5" ]]; then echo "installing pg9.5"; sudo /etc/init.d/postgresql stop; sudo apt-get -y autoremove; sudo apt-key adv --keyserver keys.gnupg.net --recv-keys 7FCC7D46ACCC4CF8; sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main 9.5" >> /etc/apt/sources.list.d/postgresql.list'; sudo apt-get update; sudo apt-get -y install postgresql-9.5; sudo cp /etc/postgresql/9.4/main/pg_hba.conf /etc/postgresql/9.5/main/pg_hba.conf; sudo sed -i 's/5433/5432/' /etc/postgresql/9.5/main/postgresql.conf; sudo /etc/init.d/postgresql restart; else echo "not installing pg9.5"; fi
-  # setup travis user
-  - if [[ "$PG_VERSION" = "9.5" ]]; then echo "setting up users for pg9.5"; PGUSER=postgres createuser --superuser travis || echo role travis already exists.; fi
+  # install postgres
+  - sudo apt-get install postgresql-client-$PG_VERSION postgresql-server-dev-$PG_VERSION
   # setup pg_dump
+  - ls -al /usr/lib/postgresql/
   - sudo ln -sfn /usr/lib/postgresql/$PG_VERSION/bin/pg_dump /usr/bin/pg_dump
   # start up the specific version of PG
   - sudo -E sh -c 'service postgresql stop'

data/features/commit.feature

@@ -29,7 +29,7 @@ Feature: Commiting updated dumps to a project's repository
     And  I run `prodder dump -c prodder.yml`
     And  I run `prodder commit -c prodder.yml`
     And  2 commits by "prodder auto-commit" should be in the "blog" repository
-    And  the latest commit should have changed "db/structure.sql" to contain "CREATE TABLE linkbacks"
+    And  the latest commit should have changed "db/structure.sql" to contain "CREATE TABLE public.linkbacks"
     And  the latest commit should not have changed "db/seeds.sql"
     And  the latest commit should not have changed "db/quality_checks.sql"
 
@@ -52,7 +52,7 @@ Feature: Commiting updated dumps to a project's repository
     And  I run `prodder dump -c prodder.yml`
     And  I run `prodder commit -c prodder.yml`
     Then 2 commits by "prodder auto-commit" should be in the "blog" repository
-    And  the latest commit should have changed "db/structure.sql" to contain "CREATE TABLE captchas"
+    And  the latest commit should have changed "db/structure.sql" to contain "CREATE TABLE public.captchas"
     And  the latest commit should have changed "db/seeds.sql" to contain "Bob McBobbington"
     And  the latest commit should not have changed "db/quality_checks.sql"
 
@@ -64,6 +64,6 @@ Feature: Commiting updated dumps to a project's repository
     And  I run `prodder dump -c prodder.yml`
     And  I run `prodder commit -c prodder.yml`
     And  2 commits by "prodder auto-commit" should be in the "blog" repository
-    And  the latest commit should have changed "db/permissions.sql" to contain "GRANT ALL ON TABLE gotchas TO prodder"
+    And  the latest commit should have changed "db/permissions.sql" to contain "GRANT ALL ON TABLE public.gotchas TO prodder"
     And  the latest commit should not have changed "db/seeds.sql"
     And  the latest commit should not have changed "db/quality_checks.sql"

data/features/dump.feature

@@ -6,11 +6,10 @@ Feature: prodder dump
   Scenario: Happy path: dump structure.sql, listed seed tables, quality_checks.sql, permissions.sql and settings.sql
     When I run `prodder dump -c prodder.yml`
     Then the exit status should be 0
-    And  the workspace file "blog/db/structure.sql" should match /CREATE TABLE posts/
-    And  the workspace file "blog/db/structure.sql" should match /CREATE TABLE authors/
-    And  the workspace file "blog/db/seeds.sql" should match /COPY posts/
-    And  the workspace file "blog/db/seeds.sql" should match /COPY authors/
-    And  the workspace file "blog/db/quality_checks.sql" should match /SET search_path/
+    And  the workspace file "blog/db/structure.sql" should match /CREATE TABLE public.posts/
+    And  the workspace file "blog/db/structure.sql" should match /CREATE TABLE public.authors/
+    And  the workspace file "blog/db/seeds.sql" should match /COPY public.posts/
+    And  the workspace file "blog/db/seeds.sql" should match /COPY public.authors/
     And  the workspace file "blog/db/quality_checks.sql" should match /CREATE TRIGGER /
     And  the workspace file "blog/db/permissions.sql" should match /GRANT /
     And  the workspace file "blog/db/settings.sql" should match /ALTER DATABASE /
@@ -123,6 +122,7 @@ Feature: prodder dump
     Given I add a custom parameter "c.p" with value "v" in the "blog" project's database
     When  I run `prodder dump -c prodder.yml`
     Then the workspace file "blog/db/settings.sql" should match /ALTER DATABASE :DBNAME SET c.p=v;/
+    And the workspace file "blog/db/settings.sql" should match /ALTER DATABASE :DBNAME SET search_path=foo,bar,public;/
 
   Scenario: Verify empty db setting is quoted
     Given I add a custom parameter "empty.setting" with value "" in the "blog" project's database
@@ -184,8 +184,8 @@ Feature: prodder dump
       """
     When I run `prodder dump -c prodder.yml`
     Then the exit status should be 0
-    And  the workspace file "blog/db/seeds.sql" should match /COPY posts/
-    But  the workspace file "blog/db/seeds.sql" should not match /COPY authors/
+    And  the workspace file "blog/db/seeds.sql" should match /COPY public.posts/
+    But  the workspace file "blog/db/seeds.sql" should not match /COPY public.authors/
 
   Scenario: YAML file listing seed tables does not exist
     Given the prodder config in "prodder.yml" says to read the "blog" seed tables from "db/seeds.yml"

data/features/support/prodder__blog_prod.sql

@@ -1,4 +1,5 @@
 ALTER DATABASE prodder__blog_prod SET custom.parameter = 1;
+ALTER DATABASE prodder__blog_prod SET search_path TO foo, bar, public;
 
 CREATE TABLE authors (
   author_id serial primary key,

data/lib/prodder/pg.rb

@@ -125,7 +125,6 @@ module Prodder
     ACL_REVOKE = /^REVOKE /
     DEFAULT_PRIVILEGES = /^ALTER DEFAULT PRIVILEGES /
     SET_OBJECT_OWNERSHIP = /.* OWNER TO /
-    SEARCH_PATH = /SET search_path = .*/
 
     def dump_db_access_control(db_name, user_list, options)
       perm_out_sql = ""
@@ -153,8 +152,7 @@ module Prodder
           if line.match(ACL_GRANT)           ||
              line.match(ACL_REVOKE)          ||
              line.match(DEFAULT_PRIVILEGES)  ||
-             line.match(SET_OBJECT_OWNERSHIP)||
-             line.match(SEARCH_PATH)
+             line.match(SET_OBJECT_OWNERSHIP)
 
             unless irrelevant_login_roles.include?(line.match(/ (\S*);$/)[1])
               perm_out_sql << line

data/lib/prodder/prodder.rake

@@ -362,7 +362,8 @@ namespace :db do
 
   def as(user, opts = {}, &block)
     if File.exist?('db/permissions.sql')
-      config, config_was = ActiveRecord::Base.configurations.deep_dup, ActiveRecord::Base.configurations.deep_dup
+      # `ActiveRecord::Base.configurations` in Rails 6 now returns an object instead of a hash
+      config, config_was = ActiveRecord::Base.configurations.deep_dup.to_h, ActiveRecord::Base.configurations.deep_dup
       in_env = Array(opts[:in]) || config.keys
       if config.all? { |env, config_hash| in_env.include?(env) ? config_hash[user] : true }
         disconnect

data/lib/prodder/project.rb

@@ -45,11 +45,8 @@ module Prodder
         contents = File.readlines(structure_file_name)
         rgx = /^\-\- .* Type: INDEX; |^\-\- .* Type: TRIGGER; |^\-\- .* Type: FK CONSTRAINT; /
         structure, *quality = contents.slice_before(rgx).to_a
-        # the first search path setting for constraints gets left over
-        # in the structure, so we need to *attempt* to grab that
-        quality_checks = (structure.grep(/SET search_path/).last || '') + quality.join
 
-        File.open(quality_check_file_name, 'w') { |f| f.write(quality_checks) }
+        File.open(quality_check_file_name, 'w') { |f| f.write(quality.join) }
         File.open(structure_file_name, 'w') { |f| f.write(structure.join) }
       end
 

data/lib/prodder/version.rb

@@ -1,3 +1,3 @@
 module Prodder
-  VERSION = "1.7.6"
+  VERSION = "1.7.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prodder
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Kyle Hargraves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deject
@@ -81,8 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Maintain your Rails apps' structure, seed and quality_checks files using