activerecord-postgresql-extensions 0.0.12 → 0.1.0

data/lib/{postgresql_extensions/postgresql_rules.rb → active_record/postgresql_extensions/rules.rb}

@@ -15,7 +15,7 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Creates a PostgreSQL rule.
       #
       # +event+ can be one of <tt>:select</tt>, <tt>:insert</tt>,
@@ -33,7 +33,7 @@ module ActiveRecord
       # * <tt>:force</tt> - add an <tt>OR REPLACE</tt> clause to the
       #   command.
       # * <tt>:conditions</tt> - a <tt>WHERE</tt> clause to limit the
-      #   rule.
+      #   rule. Alternatively, you can also use the <tt>:where</tt> option.
       #
       # ==== Examples
       #
@@ -79,7 +79,7 @@ module ActiveRecord
         sql = 'CREATE '
         sql << ' OR REPLACE ' if options[:force]
         sql << "RULE #{base.quote_rule(name)} AS ON #{event.to_s.upcase} TO #{base.quote_table_name(table)} "
-        sql << "WHERE #{options[:conditions]} " if options[:conditions]
+        sql << "WHERE #{options[:conditions] || options[:where]} " if options[:conditions] || options[:where]
         sql << "DO #{action.to_s.upcase} "
         sql << if commands.to_s.upcase == 'NOTHING'
           'NOTHING'

data/lib/{postgresql_extensions/postgresql_schemas.rb → active_record/postgresql_extensions/schemas.rb}

@@ -3,7 +3,7 @@ require 'active_record/connection_adapters/postgresql_adapter'
 
 module ActiveRecord
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Creates a new PostgreSQL schema.
       #
       # Note that you can grant privileges on schemas using the

data/lib/{postgresql_extensions/postgresql_sequences.rb → active_record/postgresql_extensions/sequences.rb}

@@ -12,7 +12,7 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Creates a sequence.
       #
       # Note that you can grant privileges on sequences using the
@@ -73,7 +73,7 @@ module ActiveRecord
 
       # Renames the sequence.
       def rename_sequence(name, rename, options = {})
-        execute("ALTER SEQUENCE #{quote_sequence(name)} RENAME TO #{quote_generic_ignore_schema(rename)};")
+        execute("ALTER SEQUENCE #{quote_sequence(name)} RENAME TO #{quote_generic_ignore_scoped_schema(rename)};")
       end
 
       # Alters the sequence's schema.

data/lib/{postgresql_extensions/postgresql_tables.rb → active_record/postgresql_extensions/tables.rb}

@@ -1,4 +1,6 @@
 
+require 'active_record/connection_adapters/postgresql_adapter'
+
 module ActiveRecord
   class InvalidLikeTypes < ActiveRecordError #:nodoc:
     def initialize(likes)
@@ -10,7 +12,7 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Set the schema of a table.
       def alter_table_schema(table_name, schema, options = {})
         execute "ALTER TABLE #{quote_schema(table_name)} SET SCHEMA #{quote_schema(schema)};"
@@ -142,7 +144,7 @@ module ActiveRecord
       # capabilities. You can still access the original method via
       # original_rename_table.
       def rename_table(name, new_name, options = {})
-        execute "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_generic_ignore_schema(new_name)};"
+        execute "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_generic_ignore_scoped_schema(new_name)};"
       end
 
       private
@@ -193,7 +195,7 @@ module ActiveRecord
         sql << "(\n  "
 
         ary = @columns.collect(&:to_sql)
-        ary << @like if @like
+        ary << @like if defined?(@like) && @like
         ary << @table_constraints unless @table_constraints.empty?
         sql << ary * ",\n  "
         sql << "\n)"
@@ -257,6 +259,12 @@ module ActiveRecord
         @table_constraints << PostgreSQLForeignKeyConstraint.new(@base, columns, ref_table, *args)
       end
 
+      # Add an EXCLUDE constraint to the table. See PostgreSQLExcludeConstraint
+      # for more details.
+      def exclude(excludes, options = {})
+        @table_constraints << PostgreSQLExcludeConstraint.new(@base, table_name, excludes, options)
+      end
+
       def column_with_constraints(name, type, *args) #:nodoc:
         options = args.extract_options!
         check = options.delete(:check)
@@ -265,7 +273,13 @@ module ActiveRecord
         column_without_constraints(name, type, options)
 
         if check
-          @table_constraints << Array(check).collect do |c|
+          check = if !check.is_a?(Array)
+            [ check ]
+          else
+            check
+          end
+
+          @table_constraints << check.collect do |c|
             if c.is_a?(Hash)
               PostgreSQLCheckConstraint.new(@base, c.delete(:expression), c)
             else

data/lib/{postgresql_extensions/postgresql_tablespaces.rb → active_record/postgresql_extensions/tablespaces.rb}

@@ -9,7 +9,7 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Creates a new PostgreSQL tablespace.
       def create_tablespace(name, location, options = {})
         sql = "CREATE TABLESPACE #{quote_tablespace(name)} "

data/lib/{postgresql_extensions/postgresql_text_search.rb → active_record/postgresql_extensions/text_search.rb}

@@ -3,7 +3,7 @@ require 'active_record/connection_adapters/postgresql_adapter'
 
 module ActiveRecord
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Creates a new PostgreSQL text search configuration. You must provide
       # either a :parser_name or a :source_config option as per the PostgreSQL
       # text search docs.
@@ -16,7 +16,7 @@ module ActiveRecord
 
         sql = "CREATE TEXT SEARCH CONFIGURATION #{quote_generic_with_schema(name)} ("
 
-        ignore_schema do
+        ignore_scoped_schema do
           sql << if options[:parser_name]
             "PARSER = #{quote_generic_with_schema(options[:parser_name])}"
           else
@@ -110,7 +110,7 @@ module ActiveRecord
         execute("#{sql};")
       end
 
-       def rename_text_search_configuration(old_name, new_name)
+      def rename_text_search_configuration(old_name, new_name)
         execute("ALTER TEXT SEARCH CONFIGURATION %s RENAME TO %s;" % [
           quote_generic_with_schema(old_name),
           quote_generic_with_schema(new_name)

data/lib/{postgresql_extensions/postgresql_triggers.rb → active_record/postgresql_extensions/triggers.rb}

@@ -39,7 +39,7 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Creates a PostgreSQL trigger.
       #
       # The +called+ argument specifies when the trigger is called and

data/lib/{postgresql_extensions/postgresql_types.rb → active_record/postgresql_extensions/types.rb}

@@ -3,7 +3,7 @@ require 'active_record/connection_adapters/postgresql_adapter'
 
 module ActiveRecord
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Returns an Array of available languages.
       def types(name = nil)
         query(%{SELECT typname FROM pg_type;}, name).map { |row| row[0] }

data/lib/active_record/postgresql_extensions/utils.rb

@@ -0,0 +1,23 @@
+
+module ActiveRecord
+  module PostgreSQLExtensions
+    module Utils
+      class << self
+        def hash_or_array_of_hashes(arg)
+          case arg
+            when Hash
+              [ arg ]
+            when Array
+              if arg.detect { |e| !e.is_a?(Hash) }
+                raise ArgumentError.new("Expected an Array of Hashes")
+              else
+                arg
+              end
+            else
+              raise ArgumentError.new("Expected either a Hash or an Array of Hashes")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/postgresql_extensions/version.rb

@@ -0,0 +1,7 @@
+
+module ActiveRecord
+  module PostgreSQLExtensions
+    VERSION = "0.1.0"
+  end
+end
+

data/lib/{postgresql_extensions/postgresql_views.rb → active_record/postgresql_extensions/views.rb}

@@ -3,7 +3,7 @@ require 'active_record/connection_adapters/postgresql_adapter'
 
 module ActiveRecord
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    class PostgreSQLAdapter
       # Creates a new PostgreSQL view.
       #
       # +name+ is the name of the view. View quoting works the same as
@@ -59,7 +59,7 @@ module ActiveRecord
 
       # Renames a view.
       def rename_view(name, new_name, options = {})
-        execute "ALTER TABLE #{quote_view_name(name)} RENAME TO #{quote_generic_ignore_schema(new_name)};"
+        execute "ALTER TABLE #{quote_view_name(name)} RENAME TO #{quote_generic_ignore_scoped_schema(new_name)};"
       end
 
       # Change the ownership of a view.

data/lib/activerecord-postgresql-extensions.rb

@@ -1,34 +1,35 @@
 
 require 'active_record/connection_adapters/postgresql_adapter'
 
-module PostgreSQLExtensions
+module ActiveRecord
+  module PostgreSQLExtensions
+  end
 end
 
-dirname = File.join(File.dirname(__FILE__), 'postgresql_extensions')
+dirname = File.join(File.dirname(__FILE__), *%w{ active_record postgresql_extensions })
 
 %w{
-  postgresql_adapter_extensions
-  postgresql_constraints
-  postgresql_tables
-  postgresql_tablespaces
-  postgresql_indexes
-  postgresql_permissions
-  postgresql_schemas
-  postgresql_languages
-  postgresql_rules
-  postgresql_functions
-  postgresql_sequences
-  postgresql_triggers
-  postgresql_views
-  postgresql_geometry
-  postgresql_types
-  postgresql_roles
-  postgresql_text_search
-  postgresql_extensions
+  adapter_extensions
+  constraints
+  tables
+  tablespaces
+  indexes
+  permissions
+  schemas
+  languages
+  rules
+  functions
+  sequences
+  triggers
+  views
+  geometry
+  types
+  roles
+  text_search
+  extensions
   foreign_key_associations
 }.each do |file|
   require File.join(dirname, file)
 end
 
-ActiveRecord::Base.send(:include, PostgreSQLExtensions::ActiveRecord::ForeignKeyAssociations)
-
+ActiveRecord::Base.send(:include, ActiveRecord::PostgreSQLExtensions::ForeignKeyAssociations)

data/test/adapter_tests.rb

@@ -13,15 +13,15 @@ class AdapterExtensionTests < Test::Unit::TestCase
     assert_equal(%{"foo"."bar"}, ARBC.quote_table_name(:foo => :bar))
   end
 
-  def test_quote_table_name_with_current_schema
+  def test_quote_table_name_with_current_scoped_schema
     assert_equal(%{"foo"."bar"}, ARBC.with_schema(:foo) {
       ARBC.quote_table_name(:bar)
     })
   end
 
-  def test_quote_table_name_with_current_schema_ignored
+  def test_quote_table_name_with_current_scoped_schema_ignored
     assert_equal(%{"bar"}, ARBC.with_schema(:foo) {
-      ARBC.ignore_schema {
+      ARBC.ignore_scoped_schema {
         ARBC.quote_table_name(:bar)
       }
     })
@@ -60,7 +60,7 @@ class AdapterExtensionTests < Test::Unit::TestCase
       %{SET ROLE "foo";},
       %{SET LOCAL ROLE "foo";},
       %{SET SESSION ROLE "foo";}
-    ], ARBC.statements)
+    ], statements)
 
     assert_raise(ArgumentError) do
       ARBC.set_role('foo', :duration => :nonsense)
@@ -69,7 +69,7 @@ class AdapterExtensionTests < Test::Unit::TestCase
 
   def test_reset_role
     ARBC.reset_role
-    assert_equal([ 'RESET ROLE;' ], ARBC.statements)
+    assert_equal([ 'RESET ROLE;' ], statements)
   end
 
   def test_current_role
@@ -79,7 +79,7 @@ class AdapterExtensionTests < Test::Unit::TestCase
     assert_equal([
       'SELECT current_role;',
       'SELECT current_role;'
-    ], ARBC.statements)
+    ], statements)
   end
 
   def test_enable_triggers
@@ -92,7 +92,7 @@ class AdapterExtensionTests < Test::Unit::TestCase
       %{ALTER TABLE "foo" ENABLE TRIGGER "bar";},
       %{ALTER TABLE "foo" ENABLE TRIGGER "bar";},
       %{ALTER TABLE "foo" ENABLE TRIGGER "baz";}
-    ], ARBC.statements)
+    ], statements)
   end
 
   def test_disable_triggers
@@ -105,7 +105,7 @@ class AdapterExtensionTests < Test::Unit::TestCase
       %{ALTER TABLE "foo" DISABLE TRIGGER "bar";},
       %{ALTER TABLE "foo" DISABLE TRIGGER "bar";},
       %{ALTER TABLE "foo" DISABLE TRIGGER "baz";}
-    ], ARBC.statements)
+    ], statements)
   end
 
   def test_without_triggers
@@ -139,6 +139,6 @@ class AdapterExtensionTests < Test::Unit::TestCase
       %{ALTER TABLE "foo" DISABLE TRIGGER "baz";},
       %{ALTER TABLE "foo" ENABLE TRIGGER "bar";},
       %{ALTER TABLE "foo" ENABLE TRIGGER "baz";}
-    ], ARBC.statements)
+    ], statements)
   end
 end

data/test/constraints_tests.rb

@@ -60,6 +60,52 @@ EOF
     ], statements)
   end
 
+  def test_foreign_key_in_column_definition
+    Mig.create_table('foo') do |t|
+      t.integer :foo_id, :references => {
+        :table => :foo,
+        :on_delete => :set_null,
+        :on_update => :cascade
+      }
+
+      t.integer :bar_id, :references => :bar
+
+      t.integer :baz_id, :references => [ :baz ]
+    end
+
+    assert_equal([
+      %{CREATE TABLE "foo" (
+  "id" serial primary key,
+  "foo_id" integer,
+  "bar_id" integer,
+  "baz_id" integer,
+  FOREIGN KEY ("foo_id") REFERENCES "foo" ON DELETE SET NULL ON UPDATE CASCADE,
+  FOREIGN KEY ("bar_id") REFERENCES "bar",
+  FOREIGN KEY ("baz_id") REFERENCES "baz"
+);} ], statements)
+  end
+
+  def test_foreign_key_in_table_definition
+    Mig.create_table('foo') do |t|
+      t.integer :schabba_id
+      t.integer :doo_id
+
+      t.foreign_key :schabba_id, :bar
+      t.foreign_key :doo_id, :baz
+      t.foreign_key [ :schabba_id, :doo_id ], :bar, [ :schabba_id, :doo_id ]
+    end
+
+    assert_equal([
+      %{CREATE TABLE "foo" (
+  "id" serial primary key,
+  "schabba_id" integer,
+  "doo_id" integer,
+  FOREIGN KEY ("schabba_id") REFERENCES "bar",
+  FOREIGN KEY ("doo_id") REFERENCES "baz",
+  FOREIGN KEY ("schabba_id", "doo_id") REFERENCES "bar" ("schabba_id", "doo_id")
+);} ], statements)
+  end
+
   def test_add_foreign_key
     Mig.add_foreign_key(:foo, :bar_id, :bar)
     Mig.add_foreign_key(:foo, :bar_id, :bar, :ogc_fid, :name => 'bar_fk')
@@ -86,6 +132,56 @@ EOF
     ], statements)
   end
 
+  def test_check_constraint_in_column_definition
+    Mig.create_table('foo') do |t|
+      t.integer :foo_id, :check => "foo_id != 1"
+      t.integer :bar_id, :check => { :expression => "bar_id != 1", :name => "bar_id_not_1" }
+      t.integer :baz_id, :check => [ "baz_id != 1", {
+        :expression => "baz_id > 10",
+        :name => "baz_id_gt_10"
+      } ]
+    end
+
+    assert_equal([
+      %{CREATE TABLE "foo" (
+  "id" serial primary key,
+  "foo_id" integer,
+  "bar_id" integer,
+  "baz_id" integer,
+  CHECK (foo_id != 1),
+  CONSTRAINT "bar_id_not_1" CHECK (bar_id != 1),
+  CHECK (baz_id != 1),
+  CONSTRAINT "baz_id_gt_10" CHECK (baz_id > 10)
+);} ], statements)
+  end
+
+  def test_check_constraint_in_table_definition
+    Mig.create_table('foo') do |t|
+      t.integer :foo_id
+      t.integer :bar_id
+      t.integer :baz_id
+
+      t.check_constraint "foo_id != 1"
+      t.check_constraint "bar_id != 1", :name => "bar_id_not_1"
+      t.check_constraint "baz_id != 1"
+      t.check_constraint "baz_id > 10", {
+        :name => "baz_id_gt_10"
+      }
+    end
+
+    assert_equal([
+      %{CREATE TABLE "foo" (
+  "id" serial primary key,
+  "foo_id" integer,
+  "bar_id" integer,
+  "baz_id" integer,
+  CHECK (foo_id != 1),
+  CONSTRAINT "bar_id_not_1" CHECK (bar_id != 1),
+  CHECK (baz_id != 1),
+  CONSTRAINT "baz_id_gt_10" CHECK (baz_id > 10)
+);} ], statements)
+  end
+
   def test_add_check_constraint
     Mig.add_check_constraint(:foo, 'length(name) < 100')
     Mig.add_check_constraint(:foo, 'length(name) < 100', :name => 'name_length_check')
@@ -95,4 +191,63 @@ EOF
       "ALTER TABLE \"foo\" ADD CONSTRAINT \"name_length_check\" CHECK (length(name) < 100);"
     ], statements)
   end
+
+  def test_add_exclude_constraint
+    Mig.add_exclude_constraint(:foo, :element => 'length(name)', :with => '=')
+
+    Mig.add_exclude_constraint(:foo, {
+      :element => 'length(name)',
+      :with => '='
+    }, {
+      :name => 'exclude_name_length'
+    })
+
+    Mig.add_exclude_constraint(:foo, {
+      :element => 'length(name)',
+      :with => '='
+    }, {
+      :name => 'exclude_name_length',
+      :using => :gist
+    })
+
+    Mig.add_exclude_constraint(:foo, [{
+      :element => 'length(name)',
+      :with => '='
+    }, {
+      :element => 'length(title)',
+      :with => '='
+    }])
+
+    Mig.add_exclude_constraint(:foo, {
+      :element => 'length(name)',
+      :with => '='
+    }, {
+      :conditions => Foo.send(:sanitize_sql, {
+        :id => [1,2,3,4]
+      })
+    })
+
+    Mig.add_exclude_constraint(:foo, {
+      :element => 'length(name)',
+      :with => '='
+    }, {
+      :tablespace => 'fubar',
+      :index_parameters => 'FILLFACTOR=10'
+    })
+
+    escaped_array = if ActiveRecord::VERSION::STRING >= "3.0"
+      "(1, 2, 3, 4)"
+    else
+      "(1,2,3,4)"
+    end
+
+    assert_equal([
+      %{ALTER TABLE "foo" ADD EXCLUDE (length(name) WITH =);},
+      %{ALTER TABLE "foo" ADD CONSTRAINT "exclude_name_length" EXCLUDE (length(name) WITH =);},
+      %{ALTER TABLE "foo" ADD CONSTRAINT "exclude_name_length" EXCLUDE USING "gist" (length(name) WITH =);},
+      %{ALTER TABLE "foo" ADD EXCLUDE (length(name) WITH =, length(title) WITH =);},
+      %{ALTER TABLE "foo" ADD EXCLUDE (length(name) WITH =) WHERE ("foos"."id" IN #{escaped_array});},
+      %{ALTER TABLE "foo" ADD EXCLUDE (length(name) WITH =) WITH (FILLFACTOR=10) USING INDEX TABLESPACE "fubar";}
+    ], statements)
+  end
 end