schema_plus_pg_indexes 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809e25804e94035df8d24a57d5a255c8d64c8eb8
-  data.tar.gz: 92e7716fb86ece5c7f420b22ce6a75cfd36f3677
+  metadata.gz: 23c0466d72bdac73b797047b1b0db33bbb840672
+  data.tar.gz: 51c899f934b0d2b480d63e2759b4b9d148b3351d
 SHA512:
-  metadata.gz: ef0acdf61aeda8a0c6980dba96ccbdb4357f7719476238742700cae71d83d757230b44bf19c353cc468a4ea1e479b1d4b1814e4b75911fcd3876b126af6b331f
-  data.tar.gz: 2bd3c3b3fb713678d041633c833c7c791e3a9d6909c2b714ce9197105471c38da4dbfcd00c38c90a9c014848a6f21dda7c61d92a05906bf12e16554fa9e9874b
+  metadata.gz: e1690a53c5d96bbdfa7f5a33a12db3a91f72c59c3907bee9908f1556bc83eaaa2c629080ac5ed5c9ee57989094fb27d63e43b40b70574b88e65bc13cc4ea1ce1
+  data.tar.gz: b5fc2d3442f501ec154f79f8f2a0d018ca667ea11e266df1232fe2a45be825d3989234c540f31a60366009aaaf20c8e3fdda96f0bfb0a967bdf1bdeba64cc743

data/README.md

@@ -61,6 +61,7 @@ schema_plus_pg_indexes is tested on
 
 ## History
 
+* v0.1.7 - Bug fix: mix of columns & expressions (#5)
 * v0.1.6 - Bug fix: operator class & multiple columns (#4).  Thanks to [@nbudin](https://github.com/nbudin)
 * v0.1.5 - Bug fix: `t.index` without column in `change_table`
 * v0.1.1 through v0.1.4 - Conform to schema_dev updates

data/lib/schema_plus_pg_indexes/middleware/postgresql/dumper.rb

@@ -11,16 +11,13 @@ module SchemaPlusPgIndexes
 
             env.table.indexes.each do |index_dump|
               index_def = index_defs.find(&its.name == index_dump.name)
-              if index_def.columns.blank?
-                index_dump.add_option "expression: #{index_def.expression.inspect}" if index_def.expression and index_def.columns.blank?
-              else
-                index_dump.add_option "case_sensitive: false" unless index_def.case_sensitive?
-                unless index_def.operator_classes.blank?
-                  if index_def.columns.uniq.length == 1 && index_def.operator_classes.values.uniq.length == 1
-                    index_dump.add_option "operator_class: #{index_def.operator_classes.values.first.inspect}"
-                  else
-                    index_dump.add_option "operator_class: {" + index_def.operator_classes.map{|column, val| "#{column.inspect}=>#{val.inspect}"}.join(", ") + "}"
-                  end
+              index_dump.add_option "case_sensitive: false" unless index_def.case_sensitive?
+              index_dump.add_option "expression: #{index_def.expression.inspect}" if index_def.expression and index_def.case_sensitive?
+              unless index_def.operator_classes.blank?
+                if index_def.columns.uniq.length == 1 && index_def.operator_classes.values.uniq.length == 1
+                  index_dump.add_option "operator_class: #{index_def.operator_classes.values.first.inspect}"
+                else
+                  index_dump.add_option "operator_class: {" + index_def.operator_classes.map{|column, val| "#{column.inspect}=>#{val.inspect}"}.join(", ") + "}"
                 end
               end
             end

data/lib/schema_plus_pg_indexes/middleware/postgresql/schema.rb

@@ -76,13 +76,13 @@ module SchemaPlusPgIndexes
               # only applies to character, character varying, and text
               if expression
                 rexp_lower = %r{\blower\(\(?([^)]+)(\)::text)?\)}
-                if expression.match /\A#{rexp_lower}(?:, #{rexp_lower})*\z/
+                if expression.match /\A#{rexp_lower}(?:, #{rexp_lower})*\z/i
                   case_insensitive_columns = expression.scan(rexp_lower).map(&:first).select{|column| %W[char varchar text].include? types[column]}
                   if case_insensitive_columns.any?
                     case_sensitive = false
                     column_names = index_keys.map { |index_key|
                       index_key == '0' ? case_insensitive_columns.shift : columns[index_key]
-                    }.compact
+                    }.compact | column_names
                   end
                 end
               end

data/lib/schema_plus_pg_indexes/middleware/postgresql/sql.rb

@@ -52,9 +52,7 @@ module SchemaPlusPgIndexes
               operator_classes = Hash[column_names.map {|name| [name, operator_classes]}]
             end
 
-            if expression
-              env.sql.columns = expression
-            elsif operator_classes or case_insensitive
+            if operator_classes or case_insensitive
               option_strings = Hash[column_names.map {|name| [name, '']}]
               (operator_classes||{}).stringify_keys.each do |column, opclass|
                 option_strings[column] += " #{opclass}" if opclass
@@ -72,6 +70,10 @@ module SchemaPlusPgIndexes
 
               env.sql.columns = quoted_column_names.join(', ')
             end
+
+            if expression
+              env.sql.columns = (env.sql.columns.split(/ *, */).reject{|col| expression =~ %r{\b#{col.gsub(/['"]/, '')}\b} } + [expression]).join(', ')
+            end
           end
         end
       end

data/lib/schema_plus_pg_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusPgIndexes
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/index_definition_spec.rb

@@ -5,7 +5,7 @@ describe "Index definition" do
 
   let(:migration) { ::ActiveRecord::Migration }
 
-  before(:all) do
+  before(:each) do
     define_schema do
       create_table :users, :force => true do |t|
         t.string :login
@@ -23,16 +23,6 @@ describe "Index definition" do
     class Post < ::ActiveRecord::Base ; end
   end
 
-  around(:each) do |example|
-    migration.suppress_messages do
-      example.run
-    end
-  end
-
-  after(:each) do
-    migration.remove_index :users, :name => 'users_login_index' if migration.index_name_exists? :users, 'users_login_index', true
-  end
-
   context "when case insensitive is added" do
 
     before(:each) do
@@ -60,7 +50,7 @@ describe "Index definition" do
   end
 
 
-  context "when index contains expression" do
+  context "when index contains an expression" do
     before(:each) do
       migration.execute "CREATE INDEX users_login_index ON users (extract(EPOCH from deleted_at)) WHERE deleted_at IS NULL"
       User.reset_column_information
@@ -89,6 +79,35 @@ describe "Index definition" do
 
   end
 
+  context "when index contains mix of expressions and columns" do
+    before(:each) do
+      define_schema do
+        create_table :users, :force => true do |t|
+          t.string :alpha
+          t.string :beta
+          t.string :gamma
+          t.string :delta
+        end
+        execute "CREATE INDEX multi ON users (alpha, (upper(beta)), gamma, (upper(delta)))"
+      end
+      User.reset_column_information
+      @index = User.indexes.detect { |i| i.expression.present? }
+    end
+
+    it "exists" do
+      expect(@index).not_to be_nil
+    end
+
+    it "havs columns defined" do
+      expect(@index.columns).to eq(["alpha", "gamma"])
+    end
+
+    it "defines expression" do
+      expect(@index.expression).to eq("upper((beta)::text), upper((delta)::text)")
+    end
+
+  end
+
   context "when index has a non-btree type" do
     before(:each) do
       migration.execute "CREATE INDEX users_login_index ON users USING hash(login)"

data/spec/index_spec.rb

@@ -21,10 +21,8 @@ describe "index" do
     context "extra features" do
 
       before(:each) do
-        connection.tables.each do |table| connection.drop_table table, cascade: true end
-
         define_schema do
-          create_table :users, :force => true do |t|
+          create_table :users do |t|
             t.string :login
             t.text :address
             t.jsonb :json_col
@@ -88,7 +86,7 @@ describe "index" do
     context "create table" do
       it "defines index with expression only" do
         define_schema do
-          create_table :users, :force => true do |t|
+          create_table :users do |t|
             t.string :login
             t.index :expression => "upper(login)", name: "no_column"
           end
@@ -96,6 +94,41 @@ describe "index" do
         expect(User.indexes.first.expression).to eq("upper((login)::text)")
         expect(User.indexes.first.name).to eq("no_column")
       end
+
+      it "defines index with expression as column option" do
+        define_schema do
+          create_table :users do |t|
+            t.string :login, index: { expression: "upper(login)" }
+          end
+        end
+        expect(User.indexes.first.expression).to eq("upper((login)::text)")
+        expect(User.indexes.first.name).to eq("index_users_on_login")
+        expect(User.indexes.first.columns).to be_empty
+      end
+
+      it "defines multi-column index with expression as column option" do
+        define_schema do
+          create_table :users do |t|
+            t.string :name
+            t.string :login, index: { with: "name", expression: "upper(login)" }
+          end
+        end
+        expect(User.indexes.first.expression).to eq("upper((login)::text)")
+        expect(User.indexes.first.name).to eq("index_users_on_login_and_name")
+        expect(User.indexes.first.columns).to eq(["name"])
+      end
+
+      it "defines multi-column index with column option expression that doesn't reference column" do
+        define_schema do
+          create_table :users do |t|
+            t.string :name
+            t.string :login, index: { expression: "upper(name)" }
+          end
+        end
+        expect(User.indexes.first.expression).to eq("upper((name)::text)")
+        expect(User.indexes.first.name).to eq("index_users_on_login")
+        expect(User.indexes.first.columns).to eq(["login"])
+      end
     end
 
     context "change table" do

data/spec/schema_dumper_spec.rb

@@ -3,18 +3,18 @@ require 'stringio'
 
 describe "Schema dump" do
 
-  before(:all) do
+  before(:each) do
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do
         connection.tables.each do |table| drop_table table, force: :cascade end
 
-        create_table :users, :force => true do |t|
+        create_table :users do |t|
           t.string :login
           t.datetime :deleted_at
           t.integer :first_post_id
         end
 
-        create_table :posts, :force => true do |t|
+        create_table :posts do |t|
           t.text :body
           t.integer :user_id
           t.integer :first_comment_id
@@ -32,7 +32,7 @@ describe "Schema dump" do
           t.boolean :boolean_col
         end
 
-        create_table :comments, :force => true do |t|
+        create_table :comments do |t|
           t.text :body
           t.integer :post_id
           t.integer :commenter_id
@@ -86,6 +86,13 @@ describe "Schema dump" do
       end
     end
 
+    it "should define multi-column with expression" do
+      with_index Post, :body, :expression => "(least(id, user_id))" do
+        expect(dump_posts).to match(/body.*index.*expression: "LEAST\(id, user_id\)"/)
+      end
+    end
+
+
     it "should define operator_class" do
       with_index Post, :body, :operator_class => 'text_pattern_ops' do
         expect(dump_posts).to match(/body.*index:.*operator_class: "text_pattern_ops"/)
@@ -139,13 +146,7 @@ describe "Schema dump" do
       ActiveRecord::Migration.add_index(model.table_name, columns, options)
     end
     model.reset_column_information
-    begin
-      yield
-    ensure
-      ActiveRecord::Migration.suppress_messages do
-        ActiveRecord::Migration.remove_index(model.table_name, :name => determine_index_name(model, columns, options))
-      end
-    end
+    yield
   end
 
   def determine_index_name(model, columns, options)

data/spec/spec_helper.rb

@@ -17,16 +17,19 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   config.include(SchemaPlusPgIndexesMatchers)
   config.warnings = true
+  config.around(:each) do |example|
+    ActiveRecord::Migration.suppress_messages do
+      example.run
+    end
+  end
 end
 
 def define_schema(&block)
-  ActiveRecord::Migration.suppress_messages do
-    ActiveRecord::Schema.define do
-      connection.tables.each do |table|
-        drop_table table, force: :cascade
-      end
-      instance_eval &block
+  ActiveRecord::Schema.define do
+    connection.tables.each do |table|
+      drop_table table, force: :cascade
     end
+    instance_eval &block
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord