pg_saurus 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95526ab7651625ecb8d454074e855cbddb574524
-  data.tar.gz: a44975a7e86b74893dbec2ded843a2a82b80780c
+  metadata.gz: bfdd2685401333873ea9a135aae494ceadae569c
+  data.tar.gz: f9655837b68a589bf27decdf20c2f4601bd71536
 SHA512:
-  metadata.gz: edde7148883c2b70be2f90ec6894fd4cabb644c6e981af6a224c8842ab9f6b221e2a4e4c624f396d4f54b0249d09fbd2eee79666fd2e815fbdb1d78f910e773b
-  data.tar.gz: ab9d11096b351eb872a7c8a16e5569ccce00a657863a4293987d34a5f844c3c19f9df540f2b7466a3a07544d172ed2f5a9299e9ce83a4ee3b3e62f54a14322c5
+  metadata.gz: 56a742d9ee24d6c27e5057aa87a9fb9034670e0e577a8ef66128850a489321019d0e5016ad0160f54a2e01dc3c8be66f992dc692d94e6d8c0f8734c6be250ed5
+  data.tar.gz: 4c047507f0762b571c64aec2a85a000d779bab42f98aed65652fe2e918f5f25291ea5cf62f0aa3a918d04cf5557958432281cfdae8e477247bf15f3dc97f3eea

data/README.markdown

@@ -11,6 +11,7 @@ An ActiveRecord extension to get more from PostgreSQL:
 * [Enhancements to the Rails 4.2 foreign key support](#foreign-keys).
 * Use [partial indexes](#partial-indexes).
 * Use [indexes on expressions](#indexes-on-expressions).
+* Use [indexes with custom ops classes](#indexes-with-operator-classes).
 * [Run index creation concurrently](#concurrent-index-creation).
 * Create/drop [views](#views).
 * Create/drop [functions](#functions).
@@ -241,6 +242,18 @@ create_extension 'fuzzystrmatch'
 add_index(:comments, 'dmetaphone(author)', using: 'gist')
 ```
 
+## Indexes with operator classes
+
+Specifying an [operator class on each column of an index](https://www.postgresql.org/docs/10/indexes-opclass.html) is supported.
+
+### Examples
+
+Add an index with a custom ops class:
+
+```ruby
+add_index(:books, "title varchar_pattern_ops")
+```
+
 ## Concurrent index creation
 
 PostgreSQL supports concurrent index creation. PgSaurus supports that feature by adding support

data/lib/core_ext/active_record/connection_adapters/abstract/schema_statements.rb

@@ -5,6 +5,8 @@ module ActiveRecord
       # function call
       FUNCTIONAL_INDEX_REGEXP = /(\w+)\(((?:'.+'(?:::\w+)?, *)*)(\w+)\)/
 
+      # Regexp used to find the operator name
+      OPERATOR_REGEXP = /(.+)\s(\w+)$/
 
       # Redefine original add_index method to handle :concurrently option.
       #
@@ -132,24 +134,46 @@ module ActiveRecord
       # Override super method to provide support for expression column names.
       def quoted_columns_for_index(column_names, options = {})
         column_names.map do |name|
-          if name =~ FUNCTIONAL_INDEX_REGEXP
-            "#{$1}(#{$2}#{quote_column_name($3)})"
-          else
-            quote_column_name(name)
-          end
+          column_name, operator_name = split_column_name(name)
+
+          result_name = if column_name =~ FUNCTIONAL_INDEX_REGEXP
+                          "#{$1}(#{$2}#{quote_column_name($3)})"
+                        else
+                          quote_column_name(column_name)
+                        end
+          
+          result_name += " " + operator_name if operator_name
+
+          result_name
         end
       end
       protected :quoted_columns_for_index
 
       # Map an expression to a name appropriate for an index.
-      def expression_index_name(column_name)
-        if column_name =~ FUNCTIONAL_INDEX_REGEXP
-          "#{$1.downcase}_#{$3}"
+      def expression_index_name(name)
+        column_name, operator_name = split_column_name(name)
+
+        result_name = if column_name =~ FUNCTIONAL_INDEX_REGEXP
+                        "#{$1.downcase}_#{$3}"
+                      else
+                        column_name
+                      end
+
+        result_name += "_" + operator_name if operator_name
+
+        result_name
+      end
+      private :expression_index_name
+
+      # Split column name to name and operator class if possible.
+      def split_column_name(name)
+        if name =~ OPERATOR_REGEXP
+          return $1, $2
         else
-          column_name
+          return name, nil
         end
       end
-      private :expression_index_name
+      private :split_column_name
     end
   end
 end

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

@@ -71,7 +71,7 @@ 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
+          SELECT distinct i.relname, d.indisunique, d.indkey,  pg_get_indexdef(d.indexrelid), t.oid, am.amname, d.indclass
           FROM pg_class t
           INNER JOIN pg_index d ON t.oid = d.indrelid
           INNER JOIN pg_class i ON d.indexrelid = i.oid
@@ -90,11 +90,14 @@ module ActiveRecord # :nodoc:
             :keys          => row[2].split(" "),
             :definition    => row[3],
             :id            => row[4],
-            :access_method => row[5]
+            :access_method => row[5], 
+            :operators     => row[6].split(" ")
           }
 
           column_names = find_column_names(table_name, index)
 
+          operator_names = find_operator_names(column_names, index)
+
           unless column_names.empty?
             where   = find_where_statement(index)
             lengths = find_lengths(index)
@@ -106,7 +109,8 @@ module ActiveRecord # :nodoc:
               column_names,
               lengths,
               where,
-              index[:access_method]
+              index[:access_method],
+              operator_names
             )
           end
         end.compact
@@ -141,6 +145,29 @@ module ActiveRecord # :nodoc:
         column_names
       end
 
+      # Find non-default operator class names for columns from index.
+      #
+      # @param column_names [Array] List of columns from index.
+      # @param index [Hash] index index attributes
+      # @return [Hash]
+      def find_operator_names(column_names, index)
+        column_names.each_with_index.inject({}) do |class_names, (column_name, column_index)|
+          result = query(<<-SQL, "Classes for columns for index #{index[:name]} for column #{column_name}")
+            SELECT op.opcname, op.opcdefault
+            FROM pg_opclass op
+            WHERE op.oid = #{index[:operators][column_index]};
+          SQL
+
+          row = result.first
+
+          if row && row[1] == "f"
+            class_names[column_name] = row[0]
+          end
+
+          class_names
+        end
+      end
+
       # Splits only on commas outside of parens
       def split_expression(expression)
         result = []

data/lib/core_ext/active_record/schema_dumper.rb

@@ -15,9 +15,15 @@ module ActiveRecord #:nodoc:
     def indexes(table, stream)
       if (indexes = @connection.indexes(table)).any?
         add_index_statements = indexes.map do |index|
+          columns = index.columns.map do |column_name|
+            column_name += ' ' +index.operators[column_name] if index.operators.key?(column_name)
+
+            column_name
+          end
+
           statement_parts = [
             ('add_index ' + index.table.inspect),
-            index.columns.inspect,
+            columns.inspect,
             (':name => ' + index.name.inspect),
           ]
           statement_parts << ':unique => true' if index.unique

data/lib/pg_saurus/connection_adapters/index_definition.rb

@@ -3,6 +3,6 @@ module PgSaurus::ConnectionAdapters
   # Overrides ActiveRecord::ConnectionAdapters::IndexDefinition
   # with the additional :where parameter.
   class IndexDefinition < Struct.new( :table, :name, :unique, :columns,
-                                      :lengths, :where, :access_method )
+                                      :lengths, :where, :access_method, :operators )
   end
 end

data/lib/pg_saurus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg