rein 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c092acce07a6896465dbff427aa22bbac84a4b9
-  data.tar.gz: 7cdc3ad273b86b172930826e82264d29c938326a
+  metadata.gz: aaa40d32186ff9860ca6bec250fbd45b907d4806
+  data.tar.gz: a665283cac4d00701e507f057e4f61d7153c2041
 SHA512:
-  metadata.gz: 591a05bf15e0857934e00ec98cc91644fed9d5ba5d793dfd8216e9cf51b5ecf797e16f7e78cd43aaef887299b079b7d0c2702c4210f742b38e385c604083b378
-  data.tar.gz: cd84ac0a68c41f37969debd3c719e502750f002725287f72a2e829bcce58a998239935d503144553d7d5ab48444c2675a335913e72472b36754aa95532f2f7bb
+  metadata.gz: b3c07e416e2e6d633b962317e277242feee7f8c7c2b2570734e695a37a090109e507eabd3b438e406e12ffeb2d4e795e770b9b03633df6ba8b438e40436fb7ee
+  data.tar.gz: 156fcb4153daf846be853980248472d2bdb6d0e2db83581acd3fedc81bc8cdcd5ab26b6bae0b14b7bd971caa38e36e90c455689978805ec8e53af40382c1b578

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.4.0 / 2018-03-23
+
+  * Wrap column and table names in foreign key constraints
+
 ## 3.3.0
 - Add unique constraint.
 

data/README.md

@@ -32,6 +32,7 @@ advantage of reversible Rails migrations.
 * [Views](#views)
 * [Schemas](#schemas)
 * [Examples](#examples)
+* [Contribute](#contribute)
 * [License](#license)
 
 ## Getting Started
@@ -498,6 +499,19 @@ class CreateArchivedBooksTable < ActiveRecord::Migration
 end
 ```
 
+## Contribute
+
+PRs are always welcome! :heart: To work with rein, there is a
+[Makefile](https://en.wikipedia.org/wiki/Makefile) to keep things simple.
+
+Before you do anything, you'll need to bootstrap your environment:
+
+    make config
+
+Make sure you run the tests before submitting a PR:
+
+    make test
+
 ## License
 
 Rein is licensed under the [MIT License](/LICENSE.md).

data/lib/rein/constraint/foreign_key.rb

@@ -25,10 +25,10 @@ module Rein
         referencing_attribute = (options[:referencing] || "#{referenced_table.to_s.singularize}_id").to_sym
         referenced_attribute = (options[:referenced] || 'id').to_sym
         name = Util.constraint_name(referencing_table, referencing_attribute, 'fk', options)
-        sql = "ALTER TABLE #{referencing_table}"
+        sql = "ALTER TABLE #{Util.wrap_identifier(referencing_table)}"
         sql << " ADD CONSTRAINT #{name}"
-        sql << " FOREIGN KEY (#{referencing_attribute})"
-        sql << " REFERENCES #{referenced_table} (#{referenced_attribute})"
+        sql << " FOREIGN KEY (#{Util.wrap_identifier(referencing_attribute)})"
+        sql << " REFERENCES #{referenced_table} (#{Util.wrap_identifier(referenced_attribute)})"
         sql << " ON DELETE #{referential_action(options[:on_delete])}" if options[:on_delete].present?
         sql << " ON UPDATE #{referential_action(options[:on_update])}" if options[:on_update].present?
         execute(sql)
@@ -38,7 +38,7 @@ module Rein
       def _remove_foreign_key_constraint(referencing_table, referenced_table, options = {})
         referencing_attribute = options[:referencing] || "#{referenced_table.to_s.singularize}_id".to_sym
         name = Util.constraint_name(referencing_table, referencing_attribute, 'fk', options)
-        execute("ALTER TABLE #{referencing_table} DROP CONSTRAINT #{name}")
+        execute("ALTER TABLE #{Util.wrap_identifier(referencing_table)} DROP CONSTRAINT #{name}")
         remove_index(referencing_table, referencing_attribute) if options[:index] == true
       end
 

data/lib/rein/constraint/inclusion.rb

@@ -24,13 +24,16 @@ module Rein
 
       def _add_inclusion_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'inclusion', options)
+        table = Util.wrap_identifier(table)
         values = options[:in].map { |value| quote(value) }.join(', ')
+        attribute = Util.wrap_identifier(attribute)
         conditions = Util.conditions_with_if("#{attribute} IN (#{values})", options)
         execute("ALTER TABLE #{table} ADD CONSTRAINT #{name} CHECK (#{conditions})")
       end
 
       def _remove_inclusion_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'inclusion', options)
+        table = Util.wrap_identifier(table)
         execute("ALTER TABLE #{table} DROP CONSTRAINT #{name}")
       end
     end

data/lib/rein/constraint/length.rb

@@ -31,6 +31,8 @@ module Rein
 
       def _add_length_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'length', options)
+        table = Util.wrap_identifier(table)
+        attribute = Util.wrap_identifier(attribute)
         attribute_length = "length(#{attribute})"
         conditions = OPERATORS.slice(*options.keys).map { |key, operator|
           value = options[key]
@@ -42,6 +44,7 @@ module Rein
 
       def _remove_length_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'length', options)
+        table = Util.wrap_identifier(table)
         execute("ALTER TABLE #{table} DROP CONSTRAINT #{name}")
       end
     end

data/lib/rein/constraint/match.rb

@@ -29,6 +29,8 @@ module Rein
 
       def _add_match_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'match', options)
+        table = Util.wrap_identifier(table)
+        attribute = Util.wrap_identifier(attribute)
         conditions = OPERATORS.slice(*options.keys).map { |key, operator|
           value = options[key]
           [attribute, operator, "'#{value}'"].join(' ')
@@ -39,6 +41,7 @@ module Rein
 
       def _remove_match_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'match', options)
+        table = Util.wrap_identifier(table)
         execute("ALTER TABLE #{table} DROP CONSTRAINT #{name}")
       end
     end

data/lib/rein/constraint/null.rb

@@ -24,12 +24,15 @@ module Rein
 
       def _add_null_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'null', options)
+        table = Util.wrap_identifier(table)
+        attribute = Util.wrap_identifier(attribute)
         conditions = Util.conditions_with_if("#{attribute} IS NOT NULL", options)
         execute("ALTER TABLE #{table} ADD CONSTRAINT #{name} CHECK (#{conditions})")
       end
 
       def _remove_null_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'null', options)
+        table = Util.wrap_identifier(table)
         execute("ALTER TABLE #{table} DROP CONSTRAINT #{name}")
       end
     end

data/lib/rein/constraint/numericality.rb

@@ -31,6 +31,8 @@ module Rein
 
       def _add_numericality_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'numericality', options)
+        table = Util.wrap_identifier(table)
+        attribute = Util.wrap_identifier(attribute)
         conditions = OPERATORS.slice(*options.keys).map { |key, operator|
           value = options[key]
           [attribute, operator, value].join(' ')
@@ -41,6 +43,7 @@ module Rein
 
       def _remove_numericality_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'numericality', options)
+        table = Util.wrap_identifier(table)
         execute("ALTER TABLE #{table} DROP CONSTRAINT #{name}")
       end
     end

data/lib/rein/constraint/presence.rb

@@ -24,6 +24,8 @@ module Rein
 
       def _add_presence_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'presence', options)
+        table = Util.wrap_identifier(table)
+        attribute = Util.wrap_identifier(attribute)
         conditions = Util.conditions_with_if(
           "(#{attribute} IS NOT NULL) AND (#{attribute} !~ '^\\s*$')",
           options
@@ -33,6 +35,7 @@ module Rein
 
       def _remove_presence_constraint(table, attribute, options = {})
         name = Util.constraint_name(table, attribute, 'presence', options)
+        table = Util.wrap_identifier(table)
         execute("ALTER TABLE #{table} DROP CONSTRAINT #{name}")
       end
     end

data/lib/rein/constraint/primary_key.rb

@@ -19,11 +19,13 @@ module Rein
       private
 
       def _add_primary_key(table, options = {})
+        table = Util.wrap_identifier(table)
         attribute = (options[:column] || 'id').to_sym
         execute("ALTER TABLE #{table} ADD PRIMARY KEY (#{attribute})")
       end
 
       def _remove_primary_key(table, options = {})
+        table = Util.wrap_identifier(table)
         attribute = (options[:column] || 'id').to_sym
         execute("ALTER TABLE #{table} DROP CONSTRAINT #{attribute}_pkey")
       end

data/lib/rein/constraint/unique.rb

@@ -25,6 +25,8 @@ module Rein
       def _add_unique_constraint(table, attributes, options = {})
         attributes = [attributes].flatten
         name = Util.constraint_name(table, attributes.join('_'), 'unique', options)
+        table = Util.wrap_identifier(table)
+        attributes = attributes.map { |attribute| Util.wrap_identifier(attribute) }
         initially = options[:deferred] ? 'DEFERRED' : 'IMMEDIATE'
         sql = "ALTER TABLE #{table} ADD CONSTRAINT #{name} UNIQUE (#{attributes.join(', ')})"
         sql << " DEFERRABLE INITIALLY #{initially}" unless options[:deferrable] == false
@@ -34,6 +36,7 @@ module Rein
       def _remove_unique_constraint(table, attributes, options = {})
         attributes = [attributes].flatten
         name = Util.constraint_name(table, attributes.join('_'), 'unique', options)
+        table = Util.wrap_identifier(table)
         execute("ALTER TABLE #{table} DROP CONSTRAINT #{name}")
       end
     end

data/lib/rein/util.rb

@@ -1,17 +1,23 @@
 module Rein
-  module Constraint
-    # The {Util} module provides utility methods for handling options.
-    module Util
-      def self.conditions_with_if(conditions, options = {})
-        if options[:if].present?
-          "NOT (#{options[:if]}) OR (#{conditions})"
-        else
-          conditions
-        end
+  # The {Util} module provides utility methods for handling options.
+  module Util
+    def self.conditions_with_if(conditions, options = {})
+      if options[:if].present?
+        "NOT (#{options[:if]}) OR (#{conditions})"
+      else
+        conditions
       end
+    end
+
+    def self.constraint_name(table, attribute, suffix, options = {})
+      options[:name].presence || "#{table}_#{attribute}_#{suffix}"
+    end
 
-      def self.constraint_name(table, attribute, suffix, options = {})
-        options[:name].presence || "#{table}_#{attribute}_#{suffix}"
+    def self.wrap_identifier(attribute)
+      if /^".*"$/.match?(attribute)
+        attribute
+      else
+        "\"#{attribute}\""
       end
     end
   end

data/lib/rein/version.rb

@@ -1,3 +1,3 @@
 module Rein
-  VERSION = '3.3.0'.freeze
+  VERSION = '3.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rein
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Joshua Bassett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord