activerecord-postgresql-expression 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d0a7eb8c7e4a647212668965c9a1edfa46b1bd
-  data.tar.gz: 17a7e65e997ed922ee6732202d1ddeb2bc204ce5
+  metadata.gz: cd04f4bc03913154b0cf8bde7d4a4f83b4f8fcd2
+  data.tar.gz: f29baf6079c945d2f547d15fd7cf68bd1be0e288
 SHA512:
-  metadata.gz: 3c4b748ba4b5f70faca61de39027ec105f34921a22cc00c921f6de43d1e9901c71ed99e142e4e644b5cd5c4da1cc42027b411298221fc2ec6f5ca1e3718236ff
-  data.tar.gz: 00000c7c184cf29da52c28af87f35caa1df13de7a23d8fc8b7ff232930bd91ac88b91dda2ff753b4d9049ed83326370a3d7ed771afdb02b3feef77652270fe41
+  metadata.gz: 61a0e6879204ba752aaa6e6980512eb4df5ca41ef649ca87e7c1de6b4ff7ba24763c5f861ff3a0c00b1dd80fb29ce6254ecb854192aa81006d625c65a973b614
+  data.tar.gz: f055fe88f686cb36bc276eb0bb7b56435cbd3dba5ff77312f7dc5554efbf3e694809e1d359ed2f259b121b0cb130c3c8f3aa1bceeb96d14b9ed2ca18b61d7133

data/lib/activerecord-postgresql-expression/active_record/schema_dumper.rb

@@ -8,10 +8,15 @@ module ActiveRecord
         def indexes(table, stream)
           buf = StringIO.new
           super(table, buf)
-          buf = buf.string.chomp
-          output = add_index_with_expression(table) + "\n"
-          stream.print buf
-          stream.print output
+          output = add_index_with_expression(table)
+          if output == ""
+            buf = buf.string
+            stream.print buf
+          else
+            buf = buf.string.chomp
+            stream.print buf
+            stream.print output + "\n\n"
+          end
           stream
         end
 

data/lib/activerecord/postgresql/expression/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module PostgreSQL
     module Expression
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/test/cases/expression_test.rb

@@ -9,23 +9,53 @@ class ExpressionTest < ActiveRecord::TestCase
 
   setup do
     @connection = ActiveRecord::Base.connection
-    @connection.create_table("posts", force: true) do |t|
+    @connection.create_table("gin_and_btree", force: true) do |t|
       t.string "title"
       t.text "content"
     end
-    @connection.add_index :posts, :content, using: :gin, expression: 'to_tsvector(\'english\'::regconfig, (content)::text)'
-    @connection.add_index :posts, :content, name: 'hogehoge', using: :gin, expression: 'to_tsvector(\'english\'::regconfig, (content)::text)'
-    @connection.add_index :posts, :title
+    @connection.add_index :gin_and_btree, :content, using: :gin, expression: 'to_tsvector(\'english\'::regconfig, (content)::text)'
+    @connection.add_index :gin_and_btree, :content, name: 'hogehoge', using: :gin, expression: 'to_tsvector(\'english\'::regconfig, (content)::text)'
+    @connection.add_index :gin_and_btree, :title
+    @connection.create_table("no_index", force: true) do |t|
+      t.string "title"
+      t.text "content"
+    end
+    @connection.create_table("btree", force: true) do |t|
+      t.string "title"
+      t.text "content"
+    end
+    @connection.add_index :btree, :title
+    @connection.create_table("gin", force: true) do |t|
+      t.string "title"
+      t.text "content"
+    end
+    @connection.add_index :gin, :content, using: :gin, expression: 'to_tsvector(\'english\'::regconfig, (content)::text)'
   end
 
   teardown do
-    @connection.drop_table "posts"
+    @connection.drop_table "gin_and_btree"
+    @connection.drop_table "btree"
+    @connection.drop_table "gin"
+    @connection.drop_table "no_index"
   end
 
-  def test_schema_dump_expression
-    schema = dump_table_schema "posts"
-    assert_match %r{add_index\s+\"posts\",\s+\[\"title\"\],\s+name:\s+\"index_posts_on_title\",\s+using:\s+:btree$}, schema
-    assert_match %r{add_index\s+\"posts\",\s+\[\"content\"\],\s+name:\s+\"index_posts_on_content\",\s+using:\s+:gin,\s+expression:\s+\"to_tsvector\('english'::regconfig,\s+content\)\"$}, schema
-    assert_match %r{add_index\s+\"posts\",\s+'',\s+name:\s+\"hogehoge\",\s+using:\s+:gin,\s+expression:\s+\"to_tsvector\('english'::regconfig,\s+content\)\"$}, schema
+  def test_schema_dump_gin_and_btree
+    schema = dump_table_schema "gin_and_btree"
+    assert_match %r{add_index\s+\"gin_and_btree\",\s+\[\"title\"\],\s+name:\s+\"index_gin_and_btree_on_title\",\s+using:\s+:btree$}, schema
+    assert_match %r{add_index\s+\"gin_and_btree\",\s+\[\"content\"\],\s+name:\s+\"index_gin_and_btree_on_content\",\s+using:\s+:gin,\s+expression:\s+\"to_tsvector\('english'::regconfig,\s+content\)\"$}, schema
+    assert_match %r{add_index\s+\"gin_and_btree\",\s+'',\s+name:\s+\"hogehoge\",\s+using:\s+:gin,\s+expression:\s+\"to_tsvector\('english'::regconfig,\s+content\)\"$}, schema
+    assert_match %r{\n\nend$}, schema
+  end
+  def test_schema_dump_gin
+    schema = dump_table_schema "gin"
+    assert_match %r{\n\nend$}, schema
+  end
+  def test_schema_dump_btree
+    schema = dump_table_schema "btree"
+    assert_match %r{\n\nend$}, schema
+  end
+  def test_schema_dump_no_index
+    schema = dump_table_schema "no_index"
+    assert_match %r{end\n\nend$}, schema
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgresql-expression
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naoya Murakami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler