Changeset 6667

Timestamp:

05/06/07 01:48:19 (1 year ago)

Author:

david

Message:

Added short-hand declaration style to migrations (inspiration from Sexy Migrations, http://errtheblog.com/post/2381) [DHH] Updated resource_scaffold and model generators to use short-hand style migrations [DHH]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb (modified) (3 diffs)
• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/rails_generator/generators/components/model/templates/migration.rb (modified) (1 diff)
• trunk/railties/lib/rails_generator/generators/components/scaffold_resource/templates/migration.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-* Improve performance of calling .create on has_many :through associations. [evan]

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

@@ -302 +302 @@
-      # This method returns <tt>self</tt>.
-      #
-===
+
-      #  # Assuming td is an instance of TableDefinition
-      #  td.column(:granted, :boolean)
@@ -323 +323 @@
-      #  def.column(:huge_integer, :decimal, :precision => 30)
-      #    #=> huge_integer DECIMAL(30)
+      #
+      # == Short-hand examples
+      #
+      # Instead of calling column directly, you can also work with the short-hand definitions for the default types.
+      # They use the type as the method name instead of as a parameter and allow for multiple columns to be defined
+      # in a single statement.
+      #
+      # What can be written like this with the regular calls to column:
+      #
+      #   create_table "products", :force => true do |t|
+      #     t.column "shop_id",    :integer
+      #     t.column "creator_id", :integer
+      #     t.column "name",       :string,   :default => "Untitled"
+      #     t.column "value",      :string,   :default => "Untitled"
+      #     t.column "created_at", :datetime
+      #     t.column "updated_at", :datetime
+      #   end
+      #
+      # Can also be written as follows using the short-hand:
+      #
+      #   create_table :products do |t|
+      #     t.integer :shop_id, :creator_id
+      #     t.string  :name, :value, :default => "Untitled"
+      #     t.timestamps
+      #   end
+      #
+      # 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.
-      def column(name, type, options = {})
-        column = self[name] || ColumnDefinition.new(@base, name, type)
@@ -334 +362 @@
-      end
-
+      %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type|
+        class_eval <<-EOV
+          def #{column_type}(*args)
+            options = args.last.is_a?(Hash) ? args.pop : {}
+            column_names = args
+            
+            column_names.each { |name| column(name, '#{column_type}', options) }
+          end
+        EOV
+      end
+      
+      def timestamps
+        column(:created_at, :datetime)
+        column(:updated_at, :datetime)
+      end
+
-      # Returns a String whose contents are the column definitions
-      # concatenated together.  This string can then be pre and appended to

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Updated resource_scaffold and model generators to use short-hand style migrations [DHH]
-
-* Updated initializer to only load #{RAILS_ENV}.rb once. Added deprecation warning for config.breakpoint_server. [Nicholas Seckar]

trunk/railties/lib/rails_generator/generators/components/model/templates/migration.rb

@@ -3 +3 @@
-    create_table :<%= table_name %> do |t|
-<% for attribute in attributes -%>
-column :<%= attribute.name %>, :<%= attribute.typ
+<%= attribute.type %> :<%= attribute.nam
-<% end -%>
-    end

trunk/railties/lib/rails_generator/generators/components/scaffold_resource/templates/migration.rb

@@ -3 +3 @@
-    create_table :<%= table_name %> do |t|
-<% for attribute in attributes -%>
-column :<%= attribute.name %>, :<%= attribute.typ
+<%= attribute.type %> :<%= attribute.nam
-<% end -%>
-    end