pg_power 1.3.1 → 1.4.0

data/README.markdown

@@ -16,6 +16,9 @@ ActiveRecord extension to get more from PostgreSQL:
 
 It was tested with Rails 3.1.x and 3.2.x, Ruby 1.8.7 REE and 1.9.3.
 
+NOTE: JRuby is not yet supported. The current ActiveRecord JDBC
+adapter has its own Rails4-compatible method named "create_schema" which
+conflicts with this gem.
 
 ## Schemas
 

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

@@ -3,7 +3,7 @@ module ActiveRecord
     module SchemaStatements # :nodoc:
       # Regexp used to find the function name and function argument of a
       # function call
-      FUNCTIONAL_INDEX_REGEXP = /(\w+)\((\w+)\)/
+      FUNCTIONAL_INDEX_REGEXP = /(\w+)\(((?:'.+'(?:::\w+)?, *)*)(\w+)\)/
 
       # Adds a new index to the table.  +column_name+ can be a single Symbol, or
       # an Array of Symbols.
@@ -149,7 +149,7 @@ module ActiveRecord
       def quoted_columns_for_index(column_names, options = {})
         column_names.map do |name|
           if name =~ FUNCTIONAL_INDEX_REGEXP
-            "#{$1}(#{quote_column_name($2)})"
+            "#{$1}(#{$2}#{quote_column_name($3)})"
           else
             quote_column_name(name)
           end
@@ -160,7 +160,7 @@ module ActiveRecord
       # Map an expression to a name appropriate for an index
       def expression_index_name(column_name)
         if column_name =~ FUNCTIONAL_INDEX_REGEXP
-          "#{$1.downcase}_#{$2}"
+          "#{$1.downcase}_#{$3}"
         else
           column_name
         end

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

@@ -95,7 +95,7 @@ module ActiveRecord # :nodoc:
         if column_names.empty?
           definition = index[:definition].sub(INDEX_WHERE_EXPRESION, '')
           if column_expression = definition.match(INDEX_COLUMN_EXPRESSION)[1]
-            column_names = column_expression.split(',').map do |functional_name|
+            column_names = split_expression(column_expression).map do |functional_name|
               remove_type(functional_name)
             end
           end
@@ -104,6 +104,33 @@ module ActiveRecord # :nodoc:
         column_names
       end
 
+      # Splits only on commas outside of parens
+      def split_expression(expression)
+        result = []
+        parens = 0
+        buffer = ""
+
+        expression.chars do |char|
+          case char
+          when ','
+            if parens == 0
+              result.push(buffer)
+              buffer = ""
+              next
+            end
+          when '('
+            parens += 1
+          when ')'
+            parens -= 1
+          end
+
+          buffer << char
+        end
+
+        result << buffer unless buffer.empty?
+        result
+      end
+
       # Find where statement from index definition
       #
       # @param [Hash] index index attributes

data/lib/pg_power/version.rb

@@ -1,4 +1,4 @@
 module PgPower
   # Version of pg_power gem.
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_power
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2099156202754981641
+      hash: 509296341304110115
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extensions for PostgreSQL.