Changeset 9056

Timestamp:

03/18/08 18:23:14 (6 months ago)

Author:

bitsweat

Message:

Migrations: create_table supports primary_key_prefix_type. Closes #10314.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb (modified) (1 diff)
• trunk/activerecord/test/cases/migration_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Migrations: create_table supports primary_key_prefix_type.  #10314 [student, thechrisoshow]
-
-* Added logging for dependency load errors with fixtures #11056 [stuthulhu]

trunk/activerecord/lib/active_record/base.rb

@@ -975 +975 @@
-
-      def reset_primary_key #:nodoc:
+        key = get_primary_key(base_class.name)
+        set_primary_key(key)
+        key
+      end
+
+      def get_primary_key(base_name) #:nodoc:
-        key = 'id'
-        case primary_key_prefix_type
-          when :table_name
-class.
+
-          when :table_name_with_underscore
-
-
-
+
+
-        key
-      end

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

@@ -90 +90 @@
-      def create_table(table_name, options = {})
-        table_definition = TableDefinition.new(self)
-"id"
+Base.get_primary_key(table_name)
-
-        yield table_definition

trunk/activerecord/test/cases/migration_test.rb

@@ -181 +181 @@
-      Person.connection.drop_table :testings rescue nil
-    end
+
+    def test_create_table_with_primary_key_prefix_as_table_name_with_underscore
+      ActiveRecord::Base.primary_key_prefix_type = :table_name_with_underscore
+
+      Person.connection.create_table :testings do |t|
+          t.column :foo, :string
+      end
+
+      assert_equal %w(foo testings_id), Person.connection.columns(:testings).map { |c| c.name }.sort
+    ensure
+      Person.connection.drop_table :testings rescue nil
+      ActiveRecord::Base.primary_key_prefix_type = nil
+    end
+
+    def test_create_table_with_primary_key_prefix_as_table_name
+      ActiveRecord::Base.primary_key_prefix_type = :table_name
+
+      Person.connection.create_table :testings do |t|
+          t.column :foo, :string
+      end
+
+      assert_equal %w(foo testingsid), Person.connection.columns(:testings).map { |c| c.name }.sort
+    ensure
+      Person.connection.drop_table :testings rescue nil
+      ActiveRecord::Base.primary_key_prefix_type = nil
+    end
+
-
-    # SQL Server, Sybase, and SQLite3 will not allow you to add a NOT NULL