pg_saurus 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd0811441685f917cb3168ca74b10c369d4917e8
-  data.tar.gz: aa68ee31da068a3279300beba063e66654dd6e97
+  metadata.gz: b4147b6ee5df11ef09825b5c6b5d59d0521b357b
+  data.tar.gz: ee5a976b7fdd83f17492d3a877a11d4ebbc25a62
 SHA512:
-  metadata.gz: e739fd484fec7e22d448a573d741b4b035c58de4ad7050de42c6b9883e0b46db9836e512ed1f01dd01e38aab9bc0f90dbc091a9ef08586a6c904445a67c42ff6
-  data.tar.gz: 818e66c4fe2e89e5953bab2d700aa4c751ad76a043e5c62f7ef94c20afb3ab9761033eaa4dd380876464376a3cd0360ea60b0772981aecac2753a7c7eb32289c
+  metadata.gz: 8689fb75e3adea700b5a1ced18232efccac99b3989370fbfbfe8ec3e9ef926f6bb97b8302fd0c59b22abfeeb01a716a521000c978fb6aa672a1517c5019402df
+  data.tar.gz: 23c7d58b7eeae4ad725c301cf54393eaccf36b1c7ac6ddbd3740846aafa54401e668c06bc5a2c01abd46ec67aefd55bfc8fa1e8019ff8980a7093ed0c83edfaa

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

@@ -5,9 +5,9 @@ module ActiveRecord # :nodoc:
     #   * indexes
     class PostgreSQLAdapter
       # Regex to find columns used in index statements
-      INDEX_COLUMN_EXPRESSION = /ON \w+(?: USING \w+ )?\((.+)\)/
+      INDEX_COLUMN_EXPRESSION = /ON [\w\.]+(?: USING \w+ )?\((.+)\)/
       # Regex to find where clause in index statements
-      INDEX_WHERE_EXPRESION = /WHERE (.+)$/
+      INDEX_WHERE_EXPRESSION = /WHERE (.+)$/
 
       # Returns the list of all tables in the schema search path or a specified schema.
       #
@@ -99,16 +99,24 @@ module ActiveRecord # :nodoc:
             where   = find_where_statement(index)
             lengths = find_lengths(index)
 
-            PgSaurus::ConnectionAdapters::IndexDefinition.new(table_name, index[:name], index[:unique], column_names, lengths, where, index[:access_method])
+            PgSaurus::ConnectionAdapters::IndexDefinition.new(
+              table_name,
+              index[:name],
+              index[:unique],
+              column_names,
+              lengths,
+              where,
+              index[:access_method]
+            )
           end
         end.compact
       end
 
-      # Find column names from index attributes. If the columns are virtual (ie
+      # Find column names from index attributes. If the columns are virtual (i.e.
       # this is an expression index) then it will try to return the functions
-      # that represent each column
+      # that represent each column.
       #
-      # @param [String] table_name the name of the table
+      # @param [String] table_name the name of the table, possibly schema-qualified
       # @param [Hash] index index attributes
       # @return [Array]
       def find_column_names(table_name, index)
@@ -122,7 +130,7 @@ module ActiveRecord # :nodoc:
         column_names = columns.values_at(*index[:keys]).compact
 
         if column_names.empty?
-          definition = index[:definition].sub(INDEX_WHERE_EXPRESION, '')
+          definition = index[:definition].sub(INDEX_WHERE_EXPRESSION, '')
           if column_expression = definition.match(INDEX_COLUMN_EXPRESSION)[1]
             column_names = split_expression(column_expression).map do |functional_name|
               remove_type(functional_name)
@@ -165,7 +173,7 @@ module ActiveRecord # :nodoc:
       # @param [Hash] index index attributes
       # @return [String] where statement
       def find_where_statement(index)
-        index[:definition].scan(INDEX_WHERE_EXPRESION).flatten[0]
+        index[:definition].scan(INDEX_WHERE_EXPRESSION).flatten[0]
       end
 
       # Find length of index

data/lib/pg_saurus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Potapov Sergey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg