schema_plus_pg_indexes 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90cf88d2c3f18bd96b37a1e8f3992d3aab05279e
-  data.tar.gz: 49d6ff69c0bde3a80ec17e74c7a8404b46eb3e11
+  metadata.gz: 5586f2b3408a3890cc6967d852d27ce9644380f7
+  data.tar.gz: 7d22c43ab14375ce9b48106e2e380f1d19ed6564
 SHA512:
-  metadata.gz: 752811cfa4644870286808f4662ac4e1178d81f2de43745a7d1b438f35a782a5a5f54a9059f4e55896a90ec1be3077cfd9065489f341c112d22042f34b66435f
-  data.tar.gz: f865110fc609f48e0965765b4c8220d8e5494389ae27522deebfbca6141b29afa88daeab02dd8bd9e6ebc3dc45e26dfa4e6370801f5e9488de57e753673819e2
+  metadata.gz: a0e0425e6f627918c211b4ece0f892088dd1d4446a19dd26fac39bc26d10aebcae04acbe69f9d7d1a5c1a842242a6353de444c4a8eab448abaf61c03d8f90af3
+  data.tar.gz: e075301f4c44a74edf3bfe577663caeed80afb1288764e5c54ce88bb2c16fdd05be173cfdf1b671e2b2520689547de03b6791a730d19d8732422baa459c82be2

data/README.md

@@ -62,6 +62,7 @@ schema_plus_pg_indexes is tested on
 
 ## Release Notes
 
+* v0.3.1  - Bug fix: schema dump for complex order clause (#19).  Thanks to [@joxxoxo](https://github.com/joxxoxo).
 * v0.3.0  - Added Rails 5.1.0 support
 * v0.2.1  - Added Rails 5.0.1 support (Removed Rails 5.0.0 support)
 * v0.2.0  - Added Rails 5 support (Removed Rails 4.2 support)

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

@@ -93,9 +93,16 @@ module SchemaPlusPgIndexes
               ]
               operator_classes.delete_if{|k,v| v.nil?}
 
-              # add info on sort order for columns (only desc order is explicitly specified, asc is the default)
-              desc_order_columns = inddef.scan(/(\w+) DESC/).flatten
-              orders = desc_order_columns.any? ? Hash[column_names.map {|column| [column, desc_order_columns.include?(column) ? :desc : :asc]}] : {}
+              orders = {}
+              order_clause = inddef[/\((\w+[^)]+)\)\z/, 1]
+              if order_clause && (using.downcase == "btree")
+                order_clause.split(/,\s+/).each do |order_by_column|
+                  match = /\A(\w+)\s*(.+)?\z/.match(order_by_column)
+                  column, order = match[1], match[2] || 'asc'
+                  order = order.downcase.to_sym if order && order =~ /\A(desc|asc)\z/i
+                  orders[column] = order
+                end
+              end
 
               ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(env.table_name, column_names,
                                                                       name:             index_name,

data/lib/schema_plus_pg_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusPgIndexes
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/schema_dumper_spec.rb

@@ -130,6 +130,33 @@ describe "Schema dump" do
       end
     end
 
+    it "should define index with order" do
+      with_index Post, [:str_short], order: 'desc' do
+        potential_lines = dump_posts.each_line.grep(/str_short/).join.strip
+        expect(potential_lines).to match(/t\.string\s+"str_short",\s+:index=>{:name=>"index_posts_on_str_short", :order=>{.*str_short.*=>:desc}}/)
+      end
+    end
+
+    it "should define index with order for multiple columns" do
+      with_index Post, [:str_short, :string_no_default], order: { str_short: :desc, string_no_default: :asc } do
+        potential_lines = dump_posts.each_line.grep(/str_short/).join.strip
+        expect(potential_lines).to match(/t\.string\s+"str_short",\s+:index=>{[^}]+:order=>{.*str_short.*=>:desc, .*string_no_default.*=>:asc}}/)
+      end
+    end
+
+    it "should define index with order with NULLS specified" do
+      with_index Post, [:str_short], order: 'desc NULLS LAST' do
+        potential_lines = dump_posts.each_line.grep(/str_short/).join.strip
+        expect(potential_lines).to match(/t\.string\s+"str_short",\s+:index=>{[^}]+:order=>{.*str_short.*=>"DESC NULLS LAST"}}/)
+      end
+    end
+
+    it "should define index with order with NULLS specified for multiple columns" do
+      with_index Post, [:str_short, :string_no_default], order: { str_short: 'desc NULLS LAST', string_no_default: :desc } do
+        potential_lines = dump_posts.each_line.grep(/str_short/).join.strip
+        expect(potential_lines).to match(/t\.string\s+"str_short",\s+:index=>{[^}]+:order=>{.*str_short.*=>"DESC NULLS LAST", .*string_no_default.*=>:desc}}/)
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord