Changeset 7973

Timestamp:

10/19/07 02:09:06 (7 months ago)

Author:

nzkoz

Message:

Add t.belongs_to and t.references to sexy migrations [arthurgeek]
Test harness for Sexy Migrations. [Koz]
Closes #9775

Files:

• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb (modified) (2 diffs)
• trunk/activerecord/test/migration_test.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -394 +394 @@
-      # There's a short-hand method for each of the type values declared at the top. And then there's 
-      # TableDefinition#timestamps that'll add created_at and updated_at as datetimes.
+      #
+      # TableDefinition#references will add an appropriately-named _id column, plus a corresponding _type
+      # column if the :polymorphic option is supplied. If :polymorphic is a hash of options, these will be
+      # used when creating the _type column. So what can be written like this:
+      #
+      #   create_table :taggings do |t|
+      #     t.integer :tag_id, :tagger_id, :taggable_id
+      #     t.string  :tagger_type
+      #     t.string  :taggable_type, :default => 'Photo'
+      #   end
+      #
+      # Can also be written as follows using references:
+      #
+      #   create_table :taggings do |t|
+      #     t.references :tag
+      #     t.references :tagger, :polymorphic => true
+      #     t.references :taggable, :polymorphic => { :default => 'Photo' }
+      #   end
-      def column(name, type, options = {})
-        column = self[name] || ColumnDefinition.new(@base, name, type)
@@ -421 +439 @@
-      end
-
+      def references(*args)
+        options = args.extract_options!
+        polymorphic = options.delete(:polymorphic)
+        args.each do |col|
+          column("#{col}_id", :integer, options)
+          unless polymorphic.nil?
+            column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : {})
+          end
+        end
+      end
+      alias :belongs_to :references
+
-      # Returns a String whose contents are the column definitions
-      # concatenated together.  This string can then be pre and appended to

trunk/activerecord/test/migration_test.rb

@@ -869 +869 @@
-      end
-    end
-
-  end
+
+  uses_mocha 'Sexy migration tests' do
+    class SexyMigrationsTest < Test::Unit::TestCase
+      def test_references_column_type_adds_id
+        with_new_table do |t|
+          t.expects(:column).with('customer_id', :integer, {})
+          t.references :customer
+        end
+      end
+ 
+      def test_references_column_type_with_polymarphic_adds_type
+        with_new_table do |t|
+          t.expects(:column).with('taggable_type', :string, {})
+          t.expects(:column).with('taggable_id', :integer, {})
+          t.references :taggable, :polymorphic => true
+        end
+      end
+      
+      def test_belongs_to_works_like_references
+        with_new_table do |t|
+          t.expects(:column).with('customer_id', :integer, {})
+          t.belongs_to :customer
+        end
+      end
+      
+      protected
+      def with_new_table
+        Person.connection.create_table :delete_me do |t|
+          yield t
+        end
+      ensure
+        Person.connection.drop_table :delete_me rescue nil
+      end
+      
+    end # SexyMigrationsTest
+  end # uses_mocha
-end
-