pg_saurus 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0699c08577482320986e7c3c11746ec17ab377ac8adba585cc583352fbe018bc'
-  data.tar.gz: b1839cae5b6259986dfbbcb56682d856acb25dde4a3c4d1244c70437df225f81
+  metadata.gz: ac3e7bc1ed09c54ead47c936f659d1976deca96b498347b748de3411969bbd84
+  data.tar.gz: 1c0dbd26312b9cbde30f6fd7a659fa6760b3d7800f092828d9e81542fa5ceb2c
 SHA512:
-  metadata.gz: ab4b6daefe71da060aaf4d44ad007cdb2796a2062a65f6d0f3e6f59cba12387de295b8c42241cf74bea9422f5d0857650411918d2d6f6c05a9a79c3fc9bbf165
-  data.tar.gz: b693cf128dad8b392c9380a3b260c9c73a6ee21685a9ca6b26853abf3be535b852e07737887eec7ab2026c73e61959b19d42f61d529966478ba274a15478fb05
+  metadata.gz: 5b2fdd24acf0bbe74f4607f9d189fb90054c4f92092508a390323c0f320d8364f74638b0ff64f358a287ccc20bca78bbd63ed826018387fd7e6b6841afe7efa1
+  data.tar.gz: 3e53da8b488c17cfc6f0c168aa59c21d93dc4a1796423efe85cbc36c84b47448ff26cde61f851c24f5faed176fc39202ef383e70d5228975d326fad556728e22

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

@@ -9,6 +9,12 @@ module ActiveRecord # :nodoc:
       # Regex to find where clause in index statements
       INDEX_WHERE_EXPRESSION = /WHERE (.+)$/
 
+      # Taken from https://github.com/postgres/postgres/blob/master/src/include/catalog/pg_index.h#L75
+      # Values are in reverse order
+      INDOPTION_DESC        = 1
+      # NULLs are first instead of last
+      INDOPTION_NULLS_FIRST = 2
+
       # Returns the list of all tables in the schema search path or a specified schema.
       #
       # == Patch:
@@ -71,7 +77,14 @@ module ActiveRecord # :nodoc:
         schemas = schema ? "ARRAY['#{schema}']" : 'current_schemas(false)'
 
         result = query(<<-SQL, name)
-          SELECT distinct i.relname, d.indisunique, d.indkey,  pg_get_indexdef(d.indexrelid), t.oid, am.amname, d.indclass
+          SELECT distinct i.relname,
+                          d.indisunique,
+                          d.indkey,
+                          pg_get_indexdef(d.indexrelid),
+                          t.oid,
+                          am.amname,
+                          d.indclass,
+                          d.indoption
           FROM pg_class t
           INNER JOIN pg_index d ON t.oid = d.indrelid
           INNER JOIN pg_class i ON d.indexrelid = i.oid
@@ -91,7 +104,8 @@ module ActiveRecord # :nodoc:
             :definition    => row[3],
             :id            => row[4],
             :access_method => row[5], 
-            :operators     => row[6].split(" ")
+            :operators     => row[6].split(" "),
+            :options       => row[7].split(" ").map(&:to_i)
           }
 
           column_names = find_column_names(table_name, index)
@@ -140,6 +154,25 @@ module ActiveRecord # :nodoc:
               remove_type(functional_name)
             end
           end
+        else
+          # In case if column_names if not empty it contains list of column name taken from pg_attribute table.
+          # So we need to check indoption column and add DESC and NULLS LAST based on its value.
+          # https://stackoverflow.com/questions/18121103/how-to-get-the-index-column-orderasc-desc-nulls-first-from-postgresql/18128457#18128457
+          column_names = column_names.map.with_index do |column_name, column_index|
+            option = index[:options][column_index]
+
+            if option != 0
+              column_name << " DESC" if option & INDOPTION_DESC > 0
+
+              if option & INDOPTION_NULLS_FIRST > 0
+                column_name << " NULLS FIRST"
+              else
+                column_name << " NULLS LAST"
+              end
+            end
+
+            column_name
+          end
         end
 
         column_names

data/lib/pg_saurus/version.rb

@@ -1,4 +1,4 @@
 module PgSaurus
   # Version of pg_saurus gem.
-  VERSION = "3.7.0"
+  VERSION = "3.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Potapov Sergey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg