pg_saurus 2.6.0 → 3.0.0

data/lib/pg_saurus/connection_adapters/table/comment_methods.rb

@@ -7,7 +7,7 @@ module PgSaurus::ConnectionAdapters::Table::CommentMethods
   # ====== Set comment on table
   #   t.set_table_comment 'This table stores phone numbers that conform to the North American Numbering Plan.'
   def set_table_comment(comment)
-    @base.set_table_comment(@table_name, comment)
+    @base.set_table_comment(@name, comment)
   end
 
   # Remove any comment from the table.
@@ -16,7 +16,7 @@ module PgSaurus::ConnectionAdapters::Table::CommentMethods
   # ====== Remove table comment
   #   t.remove_table_comment
   def remove_table_comment
-    @base.remove_table_comment(@table_name)
+    @base.remove_table_comment(@name)
   end
 
   # Set the comment for a given column.
@@ -25,7 +25,7 @@ module PgSaurus::ConnectionAdapters::Table::CommentMethods
   # ====== Set comment on the npa column
   #   t.set_column_comment :npa, 'Numbering Plan Area Code - Allowed ranges: [2-9] for first digit, [0-9] for second and third digit.'
   def set_column_comment(column_name, comment)
-    @base.set_column_comment(@table_name, column_name, comment)
+    @base.set_column_comment(@name, column_name, comment)
   end
 
   # Set comments on multiple columns. 'comments' is a hash of column_name => comment pairs.
@@ -35,7 +35,7 @@ module PgSaurus::ConnectionAdapters::Table::CommentMethods
   #  t.set_column_comments :npa => 'Numbering Plan Area Code - Allowed ranges: [2-9] for first digit, [0-9] for second and third digit.',
   #                        :nxx => 'Central Office Number'
   def set_column_comments(comments)
-    @base.set_column_comments(@table_name, comments)
+    @base.set_column_comments(@name, comments)
   end
 
   # Remove any comment for a given column.
@@ -44,7 +44,7 @@ module PgSaurus::ConnectionAdapters::Table::CommentMethods
   # ====== Remove comment from the npa column
   #   t.remove_column_comment :npa
   def remove_column_comment(column_name)
-    @base.remove_column_comment(@table_name, column_name)
+    @base.remove_column_comment(@name, column_name)
   end
 
   # Remove any comments from the given columns.
@@ -53,6 +53,6 @@ module PgSaurus::ConnectionAdapters::Table::CommentMethods
   # ====== Remove comment from the npa and nxx columns
   #   t.remove_column_comment :npa, :nxx
   def remove_column_comments(*column_names)
-    @base.remove_column_comments(@table_name, *column_names)
+    @base.remove_column_comments(@name, *column_names)
   end
 end

data/lib/pg_saurus/connection_adapters/table/trigger_methods.rb

@@ -16,7 +16,7 @@ module PgSaurus::ConnectionAdapters::Table::TriggerMethods
   #                      initially_deferred: true
   #   end
   def create_trigger(proc_name, event, options = {})
-    @base.create_trigger(@table_name, proc_name, event, options)
+    @base.create_trigger(@name, proc_name, event, options)
   end
 
   # Removes a trigger.
@@ -27,7 +27,7 @@ module PgSaurus::ConnectionAdapters::Table::TriggerMethods
   #     t.remove_trigger :pets_not_empty_trigger_proc
   #   end
   def remove_trigger(proc_name, options = {})
-    @base.remove_trigger(@table_name, proc_name, options)
+    @base.remove_trigger(@name, proc_name, options)
   end
 
 end

data/lib/pg_saurus/connection_adapters/table.rb

@@ -2,17 +2,11 @@
 # to support pg_saurus features.
 module PgSaurus::ConnectionAdapters::Table
   extend ActiveSupport::Autoload
-  extend ActiveSupport::Concern
 
   autoload :CommentMethods
-  autoload :ForeignerMethods
   autoload :TriggerMethods
 
   include CommentMethods
-  include ForeignerMethods
   include TriggerMethods
 
-  included do
-    alias_method_chain :references, :foreign_keys
-  end
 end

data/lib/pg_saurus/connection_adapters.rb

@@ -4,7 +4,6 @@ module PgSaurus::ConnectionAdapters # :nodoc:
   autoload :AbstractAdapter
   autoload :PostgreSQLAdapter,  'pg_saurus/connection_adapters/postgresql_adapter'
   autoload :Table
-  autoload :ForeignKeyDefinition
   autoload :IndexDefinition,    'pg_saurus/connection_adapters/index_definition'
   autoload :FunctionDefinition, 'pg_saurus/connection_adapters/function_definition'
   autoload :TriggerDefinition,  'pg_saurus/connection_adapters/trigger_definition'

data/lib/pg_saurus/create_index_concurrently.rb

@@ -70,7 +70,7 @@ module PgSaurus::CreateIndexConcurrently
     #
     # @see ActiveRecord::ConnectionAdapters::SchemaStatements.add_index in pg_saurus gem
     def add_index(table_name, column_name, options = {}, &block)
-      table_name = ::ActiveRecord::Migrator.proper_table_name(table_name)
+      table_name = proper_table_name(table_name)
       # GOTCHA:
       #   checks if index should be created concurretnly then put it into
       #   the queue to wait till queue processing will be called (should be
@@ -86,51 +86,6 @@ module PgSaurus::CreateIndexConcurrently
       nil
     end
 
-    # Add a foreign key.
-    #
-    # == Options:
-    # * :column
-    # * :primary_key
-    # * :dependent
-    # * :exclude_index    [Boolean]
-    # * :concurrent_index [Boolean]
-    #
-    # @param [String, Symbol]          from_table
-    # @param [String, Symbol]          to_table
-    # @param [Hash]                    options
-    # @option options [String, Symbol] :column
-    # @option options [String, Symbol] :primary_key
-    # @option options [Hash]           :dependent
-    # @option options [Boolean]        :exclude_index
-    # @option options [Boolean]        :concurrent_index
-    #
-    # @raise [ArgumentError] in case of conflicted option were set
-    #
-    # @see ::PgSaurus::ConnectionAdapters::PostgreSQLAdapter::ForeignerMethods.add_foreign_key
-    def add_foreign_key(from_table, to_table, options = {}, &block)
-      from_table       = ::ActiveRecord::Migrator.proper_table_name(from_table)
-      concurrent_index = options[:concurrent_index]
-
-      if concurrent_index then
-        if options[:exclude_index]
-          raise ArgumentError, 'Conflicted options(exclude_index, concurrent_index) was found, both are set to true.'
-        end
-
-        options[:column] ||= connection.id_column_name_from_table_name(to_table)
-        options = options.merge(:concurrently => concurrent_index)
-
-        index_options = { :concurrently => true }
-        enque(from_table, options[:column], index_options)
-      end
-
-      # GOTCHA:
-      #   proceed foreign key creation, but giving :concurrent_index => true
-      #   prevent normal index creation in PgSaurus's `add_foreign_key`.
-      #   So, postponed creation could be done after transaction.
-      #   -- zekefast 2012-09-12
-      connection.add_foreign_key(from_table, to_table, options, &block)
-    end
-
     # Execute all postponed index creation.
     #
     # @return [::PgSaurus::CreateIndexConcurrently::Migration]

data/lib/pg_saurus/migration/command_recorder.rb

@@ -6,7 +6,6 @@ module PgSaurus::Migration::CommandRecorder
   autoload :ExtensionMethods
   autoload :SchemaMethods
   autoload :CommentMethods
-  autoload :ForeignerMethods
   autoload :ViewMethods
   autoload :FunctionMethods
   autoload :TriggerMethods
@@ -14,7 +13,6 @@ module PgSaurus::Migration::CommandRecorder
   include ExtensionMethods
   include SchemaMethods
   include CommentMethods
-  include ForeignerMethods
   include ViewMethods
   include FunctionMethods
   include TriggerMethods

data/lib/pg_saurus/schema_dumper/foreign_key_methods.rb

@@ -0,0 +1,49 @@
+# Provides methods to extend ActiveRecord::SchemaDumper to dump
+# foreign keys.
+module PgSaurus::SchemaDumper::ForeignKeyMethods
+
+  # See activerecord/lib/active_record/schema_dumper.rb
+  def foreign_keys_with_indexes(table, stream)
+    if (foreign_keys = @connection.foreign_keys(table)).any?
+      add_foreign_key_statements = foreign_keys.map do |foreign_key|
+
+        from_table = if foreign_key.from_schema && foreign_key.from_schema != 'public'
+                       "#{foreign_key.from_schema}.#{remove_prefix_and_suffix(foreign_key.from_table)}"
+                     else
+                       remove_prefix_and_suffix(foreign_key.from_table)
+                     end
+
+        parts = [
+          "add_foreign_key #{from_table.inspect}",
+          remove_prefix_and_suffix(foreign_key.to_table).inspect,
+        ]
+
+        if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table)
+          parts << "column: #{foreign_key.column.inspect}"
+        end
+
+        if foreign_key.custom_primary_key?
+          parts << "primary_key: #{foreign_key.primary_key.inspect}"
+        end
+
+        if foreign_key.name !~ /^fk_rails_[0-9a-f]{10}$/
+          parts << "name: #{foreign_key.name.inspect}"
+        end
+
+        parts << "on_update: #{foreign_key.on_update.inspect}" if foreign_key.on_update
+        parts << "on_delete: #{foreign_key.on_delete.inspect}" if foreign_key.on_delete
+
+        # Always exclude the index
+        #  If an index was created in a migration, it will get dumped to the schema
+        #  separately from the foreign key.  This will raise an exception if
+        #  add_foreign_key is run without :exclude_index => true.
+        parts << ":exclude_index => true"
+
+        "  #{parts.join(', ')}"
+      end
+
+      stream.puts add_foreign_key_statements.sort.join("\n")
+    end
+  end
+
+end

data/lib/pg_saurus/schema_dumper.rb

@@ -8,7 +8,7 @@ module PgSaurus::SchemaDumper
   autoload :ExtensionMethods
   autoload :CommentMethods
   autoload :SchemaMethods
-  autoload :ForeignerMethods
+  autoload :ForeignKeyMethods
   autoload :ViewMethods
   autoload :FunctionMethods
   autoload :TriggerMethods
@@ -16,7 +16,7 @@ module PgSaurus::SchemaDumper
   include ExtensionMethods
   include CommentMethods
   include SchemaMethods
-  include ForeignerMethods
+  include ForeignKeyMethods
   include ViewMethods
   include FunctionMethods
   include TriggerMethods
@@ -26,9 +26,10 @@ module PgSaurus::SchemaDumper
     alias_method_chain :header, :extensions
 
     alias_method_chain :tables, :views
-    alias_method_chain :tables, :foreign_keys
     alias_method_chain :tables, :functions
     alias_method_chain :tables, :triggers
     alias_method_chain :tables, :comments
+
+    alias_method_chain :foreign_keys, :indexes
   end
 end

data/lib/pg_saurus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_saurus
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Potapov Sergey
@@ -13,102 +13,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +142,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: ActiveRecord extensions for PostgreSQL. Provides useful tools for schema,
-  foreign_key, index, comment and extension manipulations in migrations.
+  foreign_key, index, function, trigger, comment and extension manipulations in migrations.
 email:
 - blake131313@gmail.com
 - arthur.shagall@gmail.com
@@ -233,7 +167,6 @@ files:
 - lib/pg_saurus/connection_adapters.rb
 - lib/pg_saurus/connection_adapters/abstract_adapter.rb
 - lib/pg_saurus/connection_adapters/abstract_adapter/comment_methods.rb
-- lib/pg_saurus/connection_adapters/abstract_adapter/foreigner_methods.rb
 - lib/pg_saurus/connection_adapters/abstract_adapter/function_methods.rb
 - lib/pg_saurus/connection_adapters/abstract_adapter/index_methods.rb
 - lib/pg_saurus/connection_adapters/abstract_adapter/schema_methods.rb
@@ -244,7 +177,7 @@ files:
 - lib/pg_saurus/connection_adapters/postgresql_adapter.rb
 - lib/pg_saurus/connection_adapters/postgresql_adapter/comment_methods.rb
 - lib/pg_saurus/connection_adapters/postgresql_adapter/extension_methods.rb
-- lib/pg_saurus/connection_adapters/postgresql_adapter/foreigner_methods.rb
+- lib/pg_saurus/connection_adapters/postgresql_adapter/foreign_key_methods.rb
 - lib/pg_saurus/connection_adapters/postgresql_adapter/function_methods.rb
 - lib/pg_saurus/connection_adapters/postgresql_adapter/index_methods.rb
 - lib/pg_saurus/connection_adapters/postgresql_adapter/schema_methods.rb
@@ -253,7 +186,6 @@ files:
 - lib/pg_saurus/connection_adapters/postgresql_adapter/view_methods.rb
 - lib/pg_saurus/connection_adapters/table.rb
 - lib/pg_saurus/connection_adapters/table/comment_methods.rb
-- lib/pg_saurus/connection_adapters/table/foreigner_methods.rb
 - lib/pg_saurus/connection_adapters/table/trigger_methods.rb
 - lib/pg_saurus/connection_adapters/trigger_definition.rb
 - lib/pg_saurus/create_index_concurrently.rb
@@ -263,7 +195,6 @@ files:
 - lib/pg_saurus/migration/command_recorder.rb
 - lib/pg_saurus/migration/command_recorder/comment_methods.rb
 - lib/pg_saurus/migration/command_recorder/extension_methods.rb
-- lib/pg_saurus/migration/command_recorder/foreigner_methods.rb
 - lib/pg_saurus/migration/command_recorder/function_methods.rb
 - lib/pg_saurus/migration/command_recorder/schema_methods.rb
 - lib/pg_saurus/migration/command_recorder/trigger_methods.rb
@@ -272,7 +203,7 @@ files:
 - lib/pg_saurus/schema_dumper.rb
 - lib/pg_saurus/schema_dumper/comment_methods.rb
 - lib/pg_saurus/schema_dumper/extension_methods.rb
-- lib/pg_saurus/schema_dumper/foreigner_methods.rb
+- lib/pg_saurus/schema_dumper/foreign_key_methods.rb
 - lib/pg_saurus/schema_dumper/function_methods.rb
 - lib/pg_saurus/schema_dumper/schema_methods.rb
 - lib/pg_saurus/schema_dumper/trigger_methods.rb
@@ -300,8 +231,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extensions for PostgreSQL.
 test_files: []
+has_rdoc: 

data/lib/pg_saurus/connection_adapters/abstract_adapter/foreigner_methods.rb

@@ -1,67 +0,0 @@
-# Extends ActiveRecord::ConnectionAdapters::AbstractAdapter with
-# empty methods for foreign keys feature.
-module PgSaurus::ConnectionAdapters::AbstractAdapter::ForeignerMethods
-  def supports_foreign_keys?
-    false
-  end
-
-  # Adds a new foreign key to the +from_table+, referencing the primary key of +to_table+
-  #
-  # The foreign key will be named after the from and to tables unless you pass
-  # <tt>:name</tt> as an option.
-  #
-  # ===== Examples
-  # ====== Creating a foreign key
-  # add_foreign_key(:comments, :posts)
-  # generates
-  # ALTER TABLE `comments` ADD CONSTRAINT
-  # `comments_post_id_fk` FOREIGN KEY (`post_id`) REFERENCES `posts` (`id`)
-  #
-  # ====== Creating a named foreign key
-  # add_foreign_key(:comments, :posts, :name => 'comments_belongs_to_posts')
-  # generates
-  # ALTER TABLE `comments` ADD CONSTRAINT
-  # `comments_belongs_to_posts` FOREIGN KEY (`post_id`) REFERENCES `posts` (`id`)
-  #
-  # ====== Creating a cascading foreign_key on a custom column
-  # add_foreign_key(:people, :people, :column => 'best_friend_id', :dependent => :nullify)
-  # generates
-  # ALTER TABLE `people` ADD CONSTRAINT
-  # `people_best_friend_id_fk` FOREIGN KEY (`best_friend_id`) REFERENCES `people` (`id`)
-  # ON DELETE SET NULL
-  #
-  # === Supported options
-  # [:column]
-  # Specify the column name on the from_table that references the to_table. By default this is guessed
-  # to be the singular name of the to_table with "_id" suffixed. So a to_table of :posts will use "post_id"
-  # as the default <tt>:column</tt>.
-  # [:primary_key]
-  # Specify the column name on the to_table that is referenced by this foreign key. By default this is
-  # assumed to be "id".
-  # [:name]
-  # Specify the name of the foreign key constraint. This defaults to use from_table and foreign key column.
-  # [:dependent]
-  # If set to <tt>:delete</tt>, the associated records in from_table are deleted when records in to_table table are deleted.
-  # If set to <tt>:nullify</tt>, the foreign key column is set to +NULL+.
-  # [:options]
-  # Any extra options you want appended to the foreign key definition.
-  def add_foreign_key(from_table, to_table, options = {})
-  end
-
-  # Remove the given foreign key from the table.
-  #
-  # ===== Examples
-  # ====== Remove the suppliers_company_id_fk in the suppliers table.
-  # remove_foreign_key :suppliers, :companies
-  # ====== Remove the foreign key named accounts_branch_id_fk in the accounts table.
-  # remove_foreign_key :accounts, :column => :branch_id
-  # ====== Remove the foreign key named party_foreign_key in the accounts table.
-  # remove_foreign_key :accounts, :name => :party_foreign_key
-  def remove_foreign_key(from_table, options)
-  end
-
-  # Return the foreign keys for the schema_dumper
-  def foreign_keys(table_name)
-    []
-  end
-end