Ticket #7085: schema_dumper.diff

activesupport/test/inflector_test.rb

@@ -141 +141 @@
-    "Person" => "personid",
-    "MyApplication::Billing::Account" => "accountid"
-  }
+  
+  TableNameToPrimaryKeyWithUnderscore = {
+    'people' => 'person_id'
+  }
-
+  TableNameToPrimaryKeyWithoutUnderscore = {
+    'people' => 'personid'
+  }
+  
-  ClassNameToTableName = {
-    "PrimarySpokesman" => "primary_spokesmen",
-    "NodeChild"        => "node_children"
@@ -265 +273 @@
-      assert_equal(foreign_key, Inflector.foreign_key(klass, false))
-    end
-  end
+  
+  def test_primary_key
+    TableNameToPrimaryKeyWithUnderscore.each do |table, primary_key|
+      assert_equal(primary_key, Inflector.primary_key(table))
+    end
+    
+    TableNameToPrimaryKeyWithoutUnderscore.each do |table, primary_key|
+      assert_equal(primary_key, Inflector.primary_key(table, false))
+    end
+  end
-
-  def test_tableize
-    ClassNameToTableName.each do |class_name, table_name|

activesupport/lib/active_support/inflector.rb

@@ -234 +234 @@
-  def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
-    underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
-  end
+  
+  def primary_key(table_name, separate_class_name_and_id_with_underscore = true)
+    singularize(table_name) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
+  end
-
-  # Constantize tries to find a declared constant with the name specified
-  # in the string. It raises a NameError when the name is not in CamelCase

activerecord/test/schema_dumper_test.rb

@@ -96 +96 @@
-      output = stream.string
-      assert_match %r{:precision => 3,[[:space:]]+:scale => 2,[[:space:]]+:default => 2.78}, output
-    end
+    
+    def test_tablename_primary_key
+      ActiveRecord::Base.primary_key_prefix_type = :table_name
+      output = standard_dump
+      assert_no_match %r{create_table "prefixes", :id => false}, output
+      assert_match %r{create_table "prefixes", :primary_key => "prefixid"}, output
+      ActiveRecord::Base.primary_key_prefix_type = nil
+    end
+    
+    def test_tablename_with_underscore_primary_key
+      ActiveRecord::Base.primary_key_prefix_type = :table_name_with_underscore
+      output = standard_dump
+      assert_no_match %r{create_table "underscored_prefixes", :id => false}, output
+      assert_match %r{create_table "underscored_prefixes", :primary_key => "underscored_prefix_id"}, output
+      ActiveRecord::Base.primary_key_prefix_type = nil
+    end
-  end
-
-end

activerecord/test/fixtures/db_definitions/mysql.sql

@@ -226 +226 @@
-  `my_house_population` decimal(2),
-  `decimal_number_with_default` decimal(3,2) DEFAULT 2.78
-) TYPE=InnoDB;
+
+CREATE TABLE `prefixes` (
+  `prefixid` int(11) NOT NULL auto_increment,
+  `name` VARCHAR(255) NOT NULL,
+  PRIMARY KEY  (`prefixid`)
+) TYPE=InnoDB;
+
+CREATE TABLE `underscored_prefixes` (
+  `underscored_prefix_id` int(11) NOT NULL auto_increment,
+  `name` VARCHAR(255) NOT NULL,
+  PRIMARY KEY  (`underscored_prefix_id`)
+) TYPE=InnoDB;

activerecord/test/fixtures/db_definitions/mysql.drop.sql

@@ -29 +29 @@
-DROP TABLE keyboards;
-DROP TABLE legacy_things;
-DROP TABLE numeric_data;
+DROP TABLE prefixes;
+DROP TABLE underscored_prefixes;

activerecord/lib/active_record/schema_dumper.rb

@@ -72 +72 @@
-          if @connection.respond_to?(:pk_and_sequence_for)
-            pk, pk_seq = @connection.pk_and_sequence_for(table)
-          end
-
+
+
+
+
+
+
+
+
+
-
-          tbl.print "  create_table #{table.inspect}"
-          if columns.detect { |c| c.name == pk }