schema_plus 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dceee81f9c7bd38bbbc3f07765b6cc0318d13efe
-  data.tar.gz: dbccc00e2a96548bd1a1aee0650dea2f07cbb791
+  metadata.gz: bf8e4b864566ead9c19844204623de10e2ab44df
+  data.tar.gz: 71de29b1196886aa34275654f2a17d7b350585c2
 SHA512:
-  metadata.gz: 952c02e9cafdc50a2ae72221ec1f8a2011b9bc96541a85f02265100c9cfca51a3fc83dbde3d4a6bc11683aa440ff8ed7d8cc6b70829effca31d9cb4425d24b07
-  data.tar.gz: 01cd8a88036ce14e328b6754a51eb4b44f6ae2384e05b11ea01843033301cb0e2fab2cf32a1013e27b55e7a38bc2043f40c5fb519712acc534d9eb6a8351a446
+  metadata.gz: f65586a99e11078912f78c57778a2f4f133e7b6107b992eaf1753a9b7a59bd2fd0d48ede133f5aee0b48fd2e24ea7b4d1476467bfca482c22efc54ed1d10fc74
+  data.tar.gz: 5571cc83bf774b15bccafc15550af99d4cf1ed3e80dada6d3200f757a460b496171cea0cd40b3f85d6a1445c3a0d4ad5d5c03d025ee0dcf6de9416ad304b1e8b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Change Log
 
+## 1.8.8
+
+* Bug fix: Postgres index creation was ignoring option `algorithm: :concurrently` (#209)
+
 ## 1.8.7
 
 * Bug fix: Postgres schema dump failed when using case_sensitive => false and operator_class together (#204).  Thanks to [@mikeauclair](https://github.com/mikeauclair)

data/README.md

@@ -1,5 +1,5 @@
 > ## This is the README for schema_plus 1.8.x
-> which supports Rails 3.2, 4.0, 4.1, and 4.2.  Ongoing development towards schema_plus 2.0 takes place in the [master branch](https://github.com/SchemaPlus/schema_plus/tree/master), supporting only Rails >= 4.2
+> which supports Rails 3.2, 4.0, 4.1, and 4.2.0.  Ongoing development towards schema_plus 2.0 takes place in the [master branch](https://github.com/SchemaPlus/schema_plus/tree/master), supporting only Rails >= 4.2
 
 ---
 
@@ -24,7 +24,7 @@ For added rails DRYness see also the gems
 
 SchemaPlus supports all combinations of:
 
-*   Rails/ActiveRecord 3.2, 4.0, 4.1, and 4.2
+*   Rails/ActiveRecord 3.2, 4.0, 4.1, and 4.2.0
 *   PostgreSQL, MySQL (using mysql2 gem; mysql gem only supported with Rails
     3.2), or SQLite3 (using sqlite3 >= 3.7.7 for foreign key support, >= 3.8 for partial indexes)
 *   MRI Ruby >= 1.9.3

data/lib/schema_plus/active_record/connection_adapters/postgresql_adapter.rb

@@ -102,8 +102,9 @@ module SchemaPlus
             raise ArgumentError, "Index name not given. Pass :name option" unless options[:name]
           end
 
-          index_type = options[:unique] ? "UNIQUE" : ""
+          index_type = options[:unique] ? "UNIQUE" : nil
           index_name = options[:name] || index_name(table_name, column_names)
+          concurrently = options[:algorithm] == :concurrently
           conditions = options[:conditions]
           kind       = options[:kind]
           operator_classes = options[:operator_class]
@@ -111,14 +112,22 @@ module SchemaPlus
             operator_classes = Hash[column_names.map {|name| [name, operator_classes]}]
           end
 
+          sql = []
+          sql << 'CREATE'
+          sql << index_type
+          sql << 'INDEX'
+          sql << 'CONCURRENTLY' if concurrently
+          sql << quote_column_name(index_name)
+          sql << 'ON'
+          sql << quote_table_name(table_name)
+
           if expression = options[:expression] then
             raise ArgumentError, "Cannot specify :case_sensitive => false with an expression.  Use LOWER(column_name)" if options[:case_sensitive] == false
             # Wrap expression in parentheses if necessary
             expression = "(#{expression})" if expression !~ /(using|with|tablespace|where)/i
             expression = "USING #{kind} #{expression}" if kind
             expression = "#{expression} WHERE #{conditions}" if conditions
-
-            sql = "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} #{expression}"
+            sql << expression
           else
             option_strings = Hash[column_names.map {|name| [name, '']}]
             (operator_classes||{}).each do |column, opclass|
@@ -138,10 +147,10 @@ module SchemaPlus
             expression = "(#{quoted_column_names.join(', ')})"
             expression = "USING #{kind} #{expression}" if kind
 
-            sql = "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} #{expression}"
-            sql += " WHERE (#{ ::ActiveRecord::Base.send(:sanitize_sql, conditions, quote_table_name(table_name)) })" if conditions
+            sql << expression
+            sql << "WHERE (#{ ::ActiveRecord::Base.send(:sanitize_sql, conditions, quote_table_name(table_name)) })" if conditions
           end
-          execute sql
+          execute sql.compact.join(' ')
         rescue => e
           SchemaStatements.add_index_exception_handler(self, table_name, column_names, options, e)
         end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.8.7"
+  VERSION = "1.8.8"
 end

data/schema_plus.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("activerecord", ">= 3.2", "< 4.3")
+  s.add_dependency("activerecord", ">= 3.2", "<= 4.2.0")
   s.add_dependency("valuable")
 
   s.add_development_dependency("schema_dev", "~> 1.4")

data/spec/index_spec.rb

@@ -61,6 +61,11 @@ describe "index" do
       expect(index_for([:login, :deleted_at]).orders).to eq({"login" => :desc, "deleted_at" => :asc})
     end
 
+    it "should respect algorithm: :concurrently", :postgresql => :only do
+      expect(connection).to receive(:execute).with(/CREATE INDEX CONCURRENTLY/)
+      add_index(:users, :login, :algorithm => :concurrently)
+    end if ActiveRecord::VERSION::MAJOR > 3
+
     context "for duplicate index" do
       it "should not complain if the index is the same" do
         add_index(:users, :login)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,9 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement