schema_plus 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72d678562e79aad7720350482d28f4a9f5c49130
-  data.tar.gz: 5d64c187a751e8a22c1b00af12c8e93e2e426318
+  metadata.gz: fb0e9e9c0ae722f3745bf153ca27e10feba32557
+  data.tar.gz: 475c3532ec3953c3b34c68357dec44b69b5554e5
 SHA512:
-  metadata.gz: c30849dd3016aa030dbd39aaceaa6358931908492159aca58703f3a2d7d57821ce17365f137dae123fb44a574beb86f08f06d40a819ae538764186fedede689c
-  data.tar.gz: 1c654a69c17dd13a6d898b5b308c865d4487f1df33e95fc1672e011a0ad9e756cf6df8252eec5dbd7034d2b1d72f3e75a0115b6b0796d89f22cebd99e60bdb38
+  metadata.gz: b0e183c3f7af709ebe5b8fb73f9278a3c5a9cf1a9d31ae39934d12ef727df309772edc43dfbf5e06b4202a5216f19307d4438da67c883e6a974ec2c581b0692d
+  data.tar.gz: 5fe1d3eaacef6220fa894d3b491fddeac460856567e32972a63d95373e590e9a0ddc58111bd6ee198dd3baa1e520ee834cedc81dc798f1e5f3bd19735c904dfa

data/README.md

@@ -300,6 +300,11 @@ of foreign key constraints, you can re-enable it:
 
 * *nothing currently waiting to be released*
 
+### 1.3.3
+
+* Bug fix, dump unique index with expression (Issue #142)
+
+
 ### 1.3.2
 
 * Bug fix, remove_index with if_exists but no name
@@ -409,3 +414,7 @@ of foreign key constraints, you can re-enable it:
     contributors](https://github.com/lomba/schema_plus/graphs/contributors)
     since then
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/lomba/schema_plus/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/gemfiles/rails-edge/Gemfile.base

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec :path => File.expand_path('../../..', __FILE__)
-gem "rails", ">= 4.0.0", :github => "rails/rails"
+gem "rails", "~> 4.0.0"

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

@@ -215,7 +215,10 @@ module SchemaPlus
         # Prepass to replace each ActiveRecord::DB_DEFAULT with a literal
         # DEFAULT in the sql string.  (The underlying pg gem provides no
         # way to bind a value that will replace $n with DEFAULT)
-        def exec_cache_with_schema_plus(sql, binds)
+        def exec_cache_with_schema_plus(sql, *args)
+          name_passed = (2 == args.size)
+          binds, name = args.reverse
+
           if binds.any?{ |col, val| val.equal? ::ActiveRecord::DB_DEFAULT}
             j = 0
             binds.each_with_index do |(col, val), i|
@@ -228,7 +231,9 @@ module SchemaPlus
             end
             binds = binds.reject{|col, val| val.equal? ::ActiveRecord::DB_DEFAULT}
           end
-          exec_cache_without_schema_plus(sql, binds)
+
+          args = name_passed ? [name, binds] : [binds]
+          exec_cache_without_schema_plus(sql, *args)
         end
 
         def foreign_keys(table_name, name = nil) #:nodoc:

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -118,18 +118,17 @@ module SchemaPlus
       def dump_indexes(table) #:nodoc:
         @connection.indexes(table).collect{ |index|
           dump = "    t.index"
+          dump << " #{index.columns.inspect}," unless index.columns.blank?
+          dump << " :name => #{index.name.inspect}"
+          dump << ", :unique => true" if index.unique
+          dump << ", :kind => \"#{index.kind}\"" unless index.kind.blank?
           unless index.columns.blank? 
-            dump << " #{index.columns.inspect}, :name => #{index.name.inspect}"
-            dump << ", :unique => true" if index.unique
-            dump << ", :kind => \"#{index.kind}\"" unless index.kind.blank?
             dump << ", :case_sensitive => false" unless index.case_sensitive?
             dump << ", :conditions => #{index.conditions.inspect}" unless index.conditions.blank?
             index_lengths = index.lengths.compact if index.lengths.is_a?(Array)
             dump << ", :length => #{Hash[*index.columns.zip(index.lengths).flatten].inspect}" if index_lengths.present?
             dump << ", :order => {" + index.orders.map{|column, val| "#{column.inspect} => #{val.inspect}"}.join(", ") + "}" unless index.orders.blank?
           else
-            dump << " :name => #{index.name.inspect}"
-            dump << ", :kind => \"#{index.kind}\"" unless index.kind.blank?
             dump << ", :expression => #{index.expression.inspect}"
           end
           dump << "\n"

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/schema_plus.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec")
+  s.add_development_dependency("rdoc")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("simplecov-gem-adapter")
 end

data/spec/schema_dumper_spec.rb

@@ -221,6 +221,13 @@ describe "Schema dump" do
       end
     end
 
+    it "should dump unique: true with expression (Issue #142)" do
+      with_index Post, :name => "posts_user_body_index", :unique => true, :expression => "BTRIM(LOWER(body))" do
+        dump_posts.should match(%r{#{to_regexp(%q{t.index :name => "posts_user_body_index", :unique => true, :expression => "btrim(lower(body))"})}$})
+      end
+    end
+
+
     it "should not define :case_sensitive => false with non-trivial expression" do
       with_index Post, :name => "posts_user_body_index", :expression => "BTRIM(LOWER(body))" do
         dump_posts.should match(%r{#{to_regexp(%q{t.index :name => "posts_user_body_index", :expression => "btrim(lower(body))"})}$})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,6 +67,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement