active_record-postgres-constraints 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ff6e3c4d2843cef1ef885a47229ce08d7b1c1464
-  data.tar.gz: 99953ab207b97f628c2750f1c1f96f84c8f86a95
+SHA256:
+  metadata.gz: 590c9903ba5ee75b0ee276ced8118f89b9c0d20d8e29953afa0b5e2c596a7998
+  data.tar.gz: 880f0d33689a35515e3a56c6a847d3766da94d21fee5a16e2b64ab1d3f1e1c76
 SHA512:
-  metadata.gz: 652b7f44473db5a57194f344b37a9a4930df83180a363fab18333a519b31fcd1bb5db3780f4bb202af54a434977ba105189de7171b219ddf8107dcc574a6cef5
-  data.tar.gz: c9e6256c894e13f477e763326ada5df24787a8f0eb5461486521e3128f4024619c77ac39d14c46835ed807da23e59e66d916d04814f5c140ca4fc465466d69fc
+  metadata.gz: 9f8aa9f3635049259ff5cd216f96a76f080e1d7cd3c49c2bc0089716cb765457f329e467fbd2a072299f11847375fbcb94236e57fdcd5515b5e07d70c209bdc4
+  data.tar.gz: 9fae7cacb9bd526a05acd2b59e9b073c9e9834e9b6b5e9b4eaefa7193f9d9b4ae08cb3c9ed12c8c7df6453d42e5ac6b73d41413256601692d0c3e4e6c4da3c08

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/lib/active_record/postgres/constraints.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'constraints/command_recorder'
 require_relative 'constraints/postgresql_adapter'
 require_relative 'constraints/railtie'
@@ -22,6 +23,7 @@ module ActiveRecord
           end
 
           return conditions.first if 1 == conditions.length
+
           "(#{conditions.join(') AND (')})"
         end
 

data/lib/active_record/postgres/constraints/command_recorder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveRecord
   module Postgres
     module Constraints

data/lib/active_record/postgres/constraints/postgresql_adapter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveRecord
   module Postgres
     module Constraints

data/lib/active_record/postgres/constraints/railtie.rb

@@ -1,31 +1,49 @@
 # frozen_string_literal: true
+
 module ActiveRecord
   module Postgres
     module Constraints
       class Railtie < Rails::Railtie
-        initializer 'active_record.postgres.constraints.patch_active_record' do
+        initializer 'active_record.postgres.constraints.patch_active_record' do |*_args|
+          engine = self
           ActiveSupport.on_load(:active_record) do
             AR_CAS = ::ActiveRecord::ConnectionAdapters
 
-            connection = ActiveRecord::Base.connection
-            using_pg = connection.class.to_s == "#{AR_CAS}::PostgreSQLAdapter"
-            if using_pg
-              Rails.logger.info do
-                'Applying Postgres Constraints patches to ActiveRecord'
-              end
-              AR_CAS::TableDefinition.include TableDefinition
-              AR_CAS::PostgreSQLAdapter.include PostgreSQLAdapter
-              AR_CAS::AbstractAdapter::SchemaCreation.prepend SchemaCreation
+            engine.apply_patch! if engine.pg?
+          end
+        end
+
+        def apply_patch!
+          Rails.logger.info do
+            'Applying Postgres Constraints patches to ActiveRecord'
+          end
+          AR_CAS::TableDefinition.include TableDefinition
+          AR_CAS::PostgreSQLAdapter.include PostgreSQLAdapter
+          AR_CAS::AbstractAdapter::SchemaCreation.prepend SchemaCreation
 
-              ::ActiveRecord::Migration::CommandRecorder.include CommandRecorder
-              ::ActiveRecord::SchemaDumper.prepend SchemaDumper
-            else
-              Rails.logger.warn do
-                'Not applying Postgres Constraints patches to ActiveRecord ' \
-                  'since the database is not postgres'
-              end
+          ::ActiveRecord::Migration::CommandRecorder.include CommandRecorder
+          ::ActiveRecord::SchemaDumper.prepend SchemaDumper
+        end
+
+        def pg?
+          begin
+            connection = ActiveRecord::Base.connection
+          rescue ActiveRecord::NoDatabaseError
+            Rails.logger.warn do
+              'Not applying Postgres Constraints patches to ActiveRecord ' \
+                'since the database does not exist'
             end
+            return false
+          end
+
+          pg = connection.class.to_s == "#{AR_CAS}::PostgreSQLAdapter"
+          return true if pg
+
+          Rails.logger.warn do
+            'Not applying Postgres Constraints patches to ActiveRecord ' \
+              'since the database is not postgres'
           end
+          false
         end
       end
     end

data/lib/active_record/postgres/constraints/schema_creation.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
+
 module ActiveRecord
   module Postgres
     module Constraints
       module SchemaCreation
-        # rubocop:disable Style/MethodName
-        def visit_TableDefinition(o)
-          # rubocop:enable Style/MethodName
+        # rubocop:disable Naming/MethodName
+        def visit_TableDefinition(table_definition)
+          # rubocop:enable Naming/MethodName
           result = super
-          return result unless o.check_constraints
+          return result unless table_definition.check_constraints
+
           nesting = 0
           # Find the closing paren of the "CREATE TABLE ( ... )" clause
           index = result.length.times do |i|
@@ -15,7 +17,7 @@ module ActiveRecord
             nesting, should_break = adjust_nesting(nesting, token)
             break i if should_break
           end
-          result[index] = ", #{o.check_constraints.join(', ')})"
+          result[index] = ", #{table_definition.check_constraints.join(', ')})"
           result
         end
 

data/lib/active_record/postgres/constraints/schema_dumper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveRecord
   module Postgres
     module Constraints
@@ -7,6 +8,7 @@ module ActiveRecord
           super
           constraints = @connection.constraints(table)
           return unless constraints.any?
+
           constraint_statements = constraints.map do |constraint|
             name = constraint['conname']
             conditions = constraint['consrc']

data/lib/active_record/postgres/constraints/table_definition.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveRecord
   module Postgres
     module Constraints

data/lib/active_record/postgres/constraints/version.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module ActiveRecord
   module Postgres
     module Constraints
-      VERSION = '0.1.2'
+      VERSION = '0.1.3'
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_record-postgres-constraints
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -25,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: osm-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Store your constraints in db/schema.rb