pg_power 1.6.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba398c2e068fec17d58c4785188309ae33248b95
-  data.tar.gz: f4b9bd5557f8875600e8c33bdc40f41dfffa88bd
+  metadata.gz: c8b564bc64ebb7c31041272596e103eaad58e60e
+  data.tar.gz: 988c4d9cf044dc4b247e8437658011987efe6a31
 SHA512:
-  metadata.gz: 329c679047292bfbec8ccf5f8303be6fb7da481e08fb1cc1537ac1c3d9e4216234eebd9915455cea8ee238bc3cb8912f65a9bfea20c915f90a93e1e4ab9fba17
-  data.tar.gz: 589bf58b9678b12788d684ccdf7d4749231a708b58f5f2567f028f360337d8901f6a791be076e42e91c6f8cc13f49b108a618430fcf4ea1217006cf8d88bdc05
+  metadata.gz: 6497ef6e095d1bfe922a57c5ed692feb1bc8e93cf00ac1385ea3a844d442dbde8e9c3da8e0d92ec184547c332980834e40b8df5bafccf7dcb66b74c7d7f8a666
+  data.tar.gz: fe88de2ff07fe6f5969e2f43b75d7ffe03a45d468b2c387a60ac06ebe6d5a5eb786f7ab07a2be2e8c4bea55312f5e79f91076e09b34d2841d40d01bc59ede91b

data/README.markdown

@@ -145,7 +145,7 @@ add_foreign_key(:comments, :posts)
 ```
 Does not add an index:
 ```ruby
-    add_foreign_key(:comments, :posts, :exclude_index => true)
+add_foreign_key(:comments, :posts, :exclude_index => true)
 ```
 ## Partial Indexes
 
@@ -172,15 +172,15 @@ expressions are supported.
 Add an index to a column with a function
 
 ```ruby
-  add_index(:comments, "lower(text)")
+add_index(:comments, "lower(text)")
 ```
 
 You can also specify index access method
 
 ```ruby
-  create_extension 'btree_gist'
-  create_extension 'fuzzystrmatch'
-  add_index(:comments, 'dmetaphone(author)', :using => 'gist')
+create_extension 'btree_gist'
+create_extension 'fuzzystrmatch'
+add_index(:comments, 'dmetaphone(author)', :using => 'gist')
 ```
 
 ## Concurrent index creation
@@ -193,13 +193,13 @@ DSL on index and foreign keys creation.
 Add an index concurrently to a table
 
 ```ruby
-    add_index :table, :column_id, :concurrently => true
+add_index :table, :column_id, :concurrently => true
 ```
 
 Add an index concurrently along with foreign key
 
 ```ruby
-    add_foreign_key :table1, :table2, :column => :column_id, :concurrent_index => true
+add_foreign_key :table1, :table2, :column => :column_id, :concurrent_index => true
 ```
 
 ## Loading/Unloading postgresql extension modules
@@ -218,7 +218,7 @@ Load [fuzzystrmatch](http://www.postgresql.org/docs/9.1/static/fuzzystrmatch.htm
 and create its objects in schema *public*:
 
 ```ruby
-   create_extension "fuzzystrmatch"
+create_extension "fuzzystrmatch"
 ```
 
 
@@ -226,13 +226,13 @@ Load version *1.0* of the [btree_gist](http://www.postgresql.org/docs/9.1/static
 and create its objects in schema *demography*.
 
 ```ruby
-   create_extension "btree_gist", :schema_name => "demography", :version => "1.0"
+create_extension "btree_gist", :schema_name => "demography", :version => "1.0"
 ```
 
 Unload extension module:
 
 ```ruby
-  drop_extension "fuzzystrmatch"
+drop_extension "fuzzystrmatch"
 ```
 
 ## Views
@@ -243,7 +243,7 @@ that it is preliminary 'alpha' at best.
 ### Example
 
 ```ruby
-  create_view "demography.citizens_view", "select * from demography.citizens"
+create_view "demography.citizens_view", "select * from demography.citizens"
 ```
 
 ## Tools
@@ -256,6 +256,15 @@ PgPower::Tools.drop_schema "services"                   # => remove the PG schem
 PgPower::Tools.schemas                                  # => ["public", "information_schema", "nets"]
 PgPower::Tools.index_exists?(table, columns, options)   # => returns true if an index exists for the given params
 ```
+
+## Rails 3
+
+If you are using rails 3.x, use previous pg_power version:
+
+```ruby
+gem 'pg_power', '~> 1.6.4'
+```
+
 ## Running tests:
 
 * Ensure your postgresql has postgres-contrib (Ubuntu) package installed. Tests depend on btree_gist and fuzzystrmatch extensions

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

@@ -5,6 +5,9 @@ module ActiveRecord
       # function call
       FUNCTIONAL_INDEX_REGEXP = /(\w+)\(((?:'.+'(?:::\w+)?, *)*)(\w+)\)/
 
+
+      # Redefine original add_index method to handle :concurrently option.
+      #
       # Adds a new index to the table.  +column_name+ can be a single Symbol, or
       # an Array of Symbols.
       #
@@ -19,8 +22,15 @@ module ActiveRecord
       #  WHERE
       #    active
       #
-      def add_index(table_name, column_name, options = {})
-        name, type, creation_method, columns, opts = add_index_options(table_name, column_name, options)
+      def add_index_with_concurrently(table_name, column_name, options = {})
+        creation_method = options.delete(:concurrently) ? 'CONCURRENTLY' : nil
+
+        index_name,
+        index_type,
+        index_columns,
+        index_options,
+        index_algorithm,
+        index_using      = add_index_options(table_name, column_name, options)
 
         # GOTCHA:
         #   It ensures that there is no existing index only for the case when the index
@@ -33,22 +43,28 @@ module ActiveRecord
         #   indexes. But note that this handles only one of the cases when index
         #   creation can fail!!! All other case should be procesed manually.
         #   -- zekefast 2012-09-25
-        if options.has_key?(:concurrently) && index_exists?(table_name, column_name, options)
-          raise ::PgPower::IndexExistsError, "Index #{name} for `#{table_name}.#{column_name}` " \
-            "column can not be created concurrently, because such index already exists."
+        if creation_method.present? && index_exists?(table_name, column_name, options)
+          raise ::PgPower::IndexExistsError,
+                "Index #{index_name} for `#{table_name}.#{column_name}` " \
+                "column can not be created concurrently, because such index already exists."
         end
 
-        sql = ["CREATE #{type} INDEX"]
-        sql << creation_method.to_s
-        sql << quote_column_name(name)
-        sql << "ON #{quote_table_name(table_name)}"
-        sql << "USING #{options[:using].to_s.downcase}" if options[:using]
-        sql << "(#{columns})#{opts}"
+        statements = []
+        statements << "CREATE #{index_type} INDEX"
+        statements << creation_method      if creation_method.present?
+        statements << index_algorithm      if index_algorithm.present?
+        statements << quote_column_name(index_name)
+        statements << "ON"
+        statements << quote_table_name(table_name)
+        statements << index_using          if index_using.present?
+        statements << "(#{index_columns})" if index_columns.present?
+        statements << index_options        if index_options.present?
 
-        execute sql.join(" ")
+        sql = statements.join(' ')
+        execute(sql)
       end
 
-      # Checks to see if an index exists on a table for a given index definition.
+      # Check to see if an index exists on a table for a given index definition.
       #
       # === Examples
       #  # Check that a partial index exists
@@ -97,7 +113,7 @@ module ActiveRecord
         end
       end
 
-      # Derives the name of the index from the given table name and options hash.
+      # Derive the name of the index from the given table name and options hash.
       def index_name(table_name, options) #:nodoc:
         if Hash === options # legacy support
           if options[:column]
@@ -113,39 +129,7 @@ module ActiveRecord
         end
       end
 
-      # Returns options used to build out index SQL
-      #
-      # Added support for partial indexes implemented using the :where option
-      #
-      def add_index_options(table_name, column_name, options = {})
-        column_names          = Array(column_name)
-        index_name            = index_name(table_name, :column => column_names)
-        index_creation_method = nil
-
-        if Hash === options # legacy support, since this param was a string
-          index_type = options[:unique] ? 'UNIQUE' : ''
-          index_creation_method = options[:concurrently] ? 'CONCURRENTLY' : ''
-          index_name = options[:name].to_s if options.key?(:name)
-          if supports_partial_index?
-            index_options = options[:where] ? " WHERE #{options[:where]}" : ''
-          end
-        else
-          index_type = options
-        end
-
-        if index_name.length > index_name_length
-          raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' is too long; the limit is #{index_name_length} characters"
-        end
-        if index_name_exists?(table_name, index_name, false)
-          raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' already exists"
-        end
-        index_columns = quoted_columns_for_index(column_names, options).join(', ')
-
-        [index_name, index_type, index_creation_method, index_columns, index_options]
-      end
-      protected :add_index_options
-
-      # Override super method to provide support for expression column names
+      # 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
@@ -157,7 +141,7 @@ module ActiveRecord
       end
       protected :quoted_columns_for_index
 
-      # Map an expression to a name appropriate for an 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}"

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

@@ -4,15 +4,6 @@ module ActiveRecord # :nodoc:
     # Patched methods::
     #   * indexes
     class PostgreSQLAdapter
-      # In Rails3.2 method #extract_schema_and_table is moved into Utils module.
-      # In Rails3.1 it's implemented right in PostgreSQLAdapter class.
-      # So it's Rails3.2 we include the module into PostgreSQLAdapter in order to make
-      # it compatible to Rails3.1
-      # -- sergey.potapov 2012-06-25
-      if ActiveRecord::VERSION::STRING =~ /^3\.2/
-        include self::Utils
-      end
-
       # Regex to find columns used in index statements
       INDEX_COLUMN_EXPRESSION = /ON \w+(?: USING \w+ )?\((.+)\)/
       # Regex to find where clause in index statements
@@ -38,7 +29,7 @@ module ActiveRecord # :nodoc:
       # the custom {PgPower::ConnectionAdapters::IndexDefinition}
       #
       def indexes(table_name, name = nil)
-        schema, table = extract_schema_and_table(table_name)
+        schema, table = Utils.extract_schema_and_table(table_name)
         schemas = schema ? "ARRAY['#{schema}']" : 'current_schemas(false)'
 
         result = query(<<-SQL, name)

data/lib/pg_power/connection_adapters/postgresql_adapter.rb

@@ -23,5 +23,6 @@ module PgPower::ConnectionAdapters::PostgreSQLAdapter
 
   included do
     alias_method_chain :tables, :non_public_schema_tables
+    alias_method_chain :add_index, :concurrently
   end
 end

data/lib/pg_power/connection_adapters/postgresql_adapter/extension_methods.rb

@@ -1,7 +1,7 @@
 # Provides methods to extend {ActiveRecord::ConnectionAdapters::PostgreSQLAdapter}
 # to support extensions feature.
 module PgPower::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
-  # Default options for {#create_extension} method
+  # Default options for {#create_extension} method.
   CREATE_EXTENSION_DEFAULTS = {
       :if_not_exists => true,
       :schema_name   => nil,
@@ -9,7 +9,7 @@ module PgPower::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
       :old_version   => nil
   }
 
-  # Default options for {#drop_extension} method
+  # Default options for {#drop_extension} method.
   DROP_EXTENSION_DEFAULTS = {
       :if_exists => true,
       :mode      => :restrict
@@ -29,7 +29,7 @@ module PgPower::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
     true
   end
 
-  # Executes SQL to load a postgresql extension module into the current database
+  # Execute SQL to load a postgresql extension module into the current database.
   #
   # @param [#to_s] extension_name Name of the extension module to load
   # @param [Hash] options
@@ -52,7 +52,7 @@ module PgPower::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
   end
 
 
-  # Executes SQL to remove a postgresql extension module from the current database
+  # Execute SQL to remove a postgresql extension module from the current database.
   #
   # @param [#to_s] extension_name Name of the extension module to unload
   # @param [Hash] options
@@ -80,7 +80,11 @@ module PgPower::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
     execute(sql)
   end
 
-  # Queries pg_catalog for all loaded to the current database extension modules
+  # Query the pg_catalog for all extension modules loaded to the current database.
+  #
+  # @note
+  #   Since Rails 4 connection has method +extensions+ that returns array of extensions.
+  #   This method is slightly different, since it returns also additional options.
   #
   # Please note all extensions which belong to pg_catalog schema are omitted
   # ===Example
@@ -90,7 +94,7 @@ module PgPower::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
   #   }
   #
   # @return [Hash{String => Hash{Symbol => String}}] A list of loaded extensions with their options
-  def extensions
+  def pg_extensions
     # Check postgresql version to not break on Postgresql < 9.1 during schema dump
     pg_version_str = select_value('SELECT version()')
     return {} unless pg_version_str =~ /^PostgreSQL (\d+\.\d+.\d+)/ && ($1 >= '9.1')
@@ -103,7 +107,7 @@ module PgPower::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
     SQL
 
     result = select_all(sql)
-    result.map! do |row|
+    formatted_result = result.map do |row|
       [
           row['ext_name'],
           {
@@ -113,6 +117,6 @@ module PgPower::ConnectionAdapters::PostgreSQLAdapter::ExtensionMethods
       ]
     end
 
-    Hash[result]
+    Hash[formatted_result]
   end
 end

data/lib/pg_power/create_index_concurrently.rb

@@ -116,7 +116,9 @@ module PgPower::CreateIndexConcurrently
 
         options[:column] ||= connection.id_column_name_from_table_name(to_table)
         options = options.merge(:concurrently => options[:concurrent_index])
-        enque(from_table, options[:column], options)
+
+        index_options = { :concurrently => true }
+        enque(from_table, options[:column], index_options)
       end
 
       # GOTCHA:

data/lib/pg_power/schema_dumper/extension_methods.rb

@@ -12,7 +12,7 @@ module PgPower::SchemaDumper::ExtensionMethods
 #
 # @param [#puts] stream Stream to write to
   def dump_extensions(stream)
-    extensions = @connection.extensions
+    extensions = @connection.pg_extensions
     commands = extensions.map do |extension_name, options|
       result = [%Q|create_extension "#{extension_name}"|]
       result << %Q|:schema_name => "#{options[:schema_name]}"| unless options[:schema_name] == 'public'

data/lib/pg_power/version.rb

@@ -1,4 +1,4 @@
 module PgPower
   # Version of pg_power gem.
-  VERSION = '1.6.4'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_power
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -34,14 +34,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveRecord extensions for PostgreSQL. Provides useful tools for schema,
   foreign_key, index, comment and extensios manipulations in migrations.
 email: