0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Consistently quote primary key column names.  #7763 [toolmantim]
0
+
0
 * Fixtures: fix YAML ordered map support.  #2665 [Manuel Holtgrewe, nfbuckley]
0
 
0
 * Fix has_many :through << with custom foreign keys.  #6466, #7153 [naffis, Rich Collins]

0
@@ -479,7 +479,7 @@
0
       # Deletes the record with the given +id+ without instantiating an object first. If an array of ids is provided, all of them
0
       # are deleted.
0
       def delete(id)
0
-        delete_all([ "#{primary_key} IN (?)", id ])
0
+        delete_all([ "#{connection.quote_column_name(primary_key)} IN (?)", id ])
0
       end
0
 
0
       # Destroys the record with the given +id+ by instantiating the object and calling #destroy (all the callbacks are the triggered).
0
0
@@ -526,12 +526,12 @@
0
       # for looping over a collection where each element require a number of aggregate values. Like the DiscussionBoard
0
       # that needs to list both the number of posts and comments.
0
       def increment_counter(counter_name, id)
0
-        update_all "#{counter_name} = #{counter_name} + 1", "#{primary_key} = #{quote_value(id)}"
0
+        update_all "#{connection.quote_column_name(counter_name)} = #{connection.quote_column_name(counter_name)} + 1", "#{connection.quote_column_name(primary_key)} = #{quote_value(id)}"
0
       end
0
 
0
       # Works like increment_counter, but decrements instead.
0
       def decrement_counter(counter_name, id)
0
-        update_all "#{counter_name} = #{counter_name} - 1", "#{primary_key} = #{quote_value(id)}"
0
+        update_all "#{connection.quote_column_name(counter_name)} = #{connection.quote_column_name(counter_name)} - 1", "#{connection.quote_column_name(primary_key)} = #{quote_value(id)}"
0
       end
0
 
0
 
0
@@ -1020,7 +1020,7 @@
0
       
0
         def find_one(id, options)
0
           conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions]
0
-          options.update :conditions => "#{table_name}.#{primary_key} = #{quote_value(id,columns_hash[primary_key])}#{conditions}"
0
+          options.update :conditions => "#{table_name}.#{connection.quote_column_name(primary_key)} = #{quote_value(id,columns_hash[primary_key])}#{conditions}"
0
 
0
           # Use find_every(options).first since the primary key condition
0
           # already ensures we have a single record. Using find_initial adds
0
@@ -1035,7 +1035,7 @@
0
         def find_some(ids, options)
0
           conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions]
0
           ids_list   = ids.map { |id| quote_value(id,columns_hash[primary_key]) }.join(',')
0
-          options.update :conditions => "#{table_name}.#{primary_key} IN (#{ids_list})#{conditions}"
0
+          options.update :conditions => "#{table_name}.#{connection.quote_column_name(primary_key)} IN (#{ids_list})#{conditions}"
0
 
0
           result = find_every(options)
0
 
0
@@ -1558,7 +1558,7 @@
0
         unless new_record?
0
           connection.delete <<-end_sql, "#{self.class.name} Destroy"
0
             DELETE FROM #{self.class.table_name}
0
-            WHERE #{self.class.primary_key} = #{quoted_id}
0
+            WHERE #{connection.quote_column_name(self.class.primary_key)} = #{quoted_id}
0
           end_sql
0
         end
0
 
0
@@ -1797,7 +1797,7 @@
0
         connection.update(
0
           "UPDATE #{self.class.table_name} " +
0
           "SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} " +
0
-          "WHERE #{self.class.primary_key} = #{quote_value(id)}",
0
+          "WHERE #{connection.quote_column_name(self.class.primary_key)} = #{quote_value(id)}",
0
           "#{self.class.name} Update"
0
         )
0
       end

0
@@ -29,4 +29,5 @@
0
 DROP TABLE keyboards;
0
 DROP TABLE legacy_things;
0
 DROP TABLE numeric_data;
0
+DROP TABLE mixed_case_monkeys;

0
@@ -224,4 +224,9 @@
0
   my_house_population DECIMAL(2),
0
   decimal_number_with_default DECIMAL(3,2) DEFAULT 2.78
0
 );
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+ monkeyID INT NOT NULL PRIMARY KEY,
0
+ fleaCount INT
0
+);

0
@@ -30,6 +30,7 @@
0
 DROP TABLE defaults;
0
 DROP TABLE legacy_things;
0
 DROP TABLE numeric_data;
0
+DROP TABLE mixed_case_monkeys;
0
 
0
 DROP DOMAIN D_BOOLEAN;
0
 
0
@@ -59,4 +60,5 @@
0
 DROP GENERATOR defaults_seq;
0
 DROP GENERATOR legacy_things_seq;
0
 DROP GENERATOR numeric_data_seq;
0
+DROP GENERATOR mixed_case_monkeys_seq;

0
@@ -295,4 +295,11 @@
0
 );
0
 CREATE GENERATOR numeric_data_seq;
0
 SET GENERATOR numeric_data_seq TO 10000;
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+ "monkeyID" BIGINT NOT NULL,
0
+ "fleaCount" INTEGER
0
+);
0
+CREATE GENERATOR mixed_case_monkeys_seq;
0
+SET GENERATOR mixed_case_monkeys_seq TO 10000;

0
@@ -29,4 +29,5 @@
0
 DROP TABLE keyboards CASCADE;
0
 DROP TABLE legacy_things CASCADE;
0
 DROP TABLE numeric_data CASCADE;
0
+DROP TABLE mixed_case_monkeys CASCADE;

0
@@ -260,4 +260,10 @@
0
   primary key ("id")
0
 );
0
 SET UNIQUE FOR numeric_data(id);
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+ "monkeyID" integer DEFAULT unique,
0
+ "fleaCount" integer
0
+);
0
+SET UNIQUE FOR mixed_case_monkeys("monkeyID");

0
@@ -29,4 +29,5 @@
0
 DROP TABLE keyboards;
0
 DROP TABLE legacy_things;
0
 DROP TABLE numeric_data;
0
+DROP TABLE mixed_case_monkeys;

0
@@ -226,4 +226,10 @@
0
   `my_house_population` decimal(2),
0
   `decimal_number_with_default` decimal(3,2) DEFAULT 2.78
0
 ) TYPE=InnoDB;
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+ `monkeyID` int(11) NOT NULL auto_increment,
0
+ `fleaCount` int(11),
0
+ PRIMARY KEY (`monkeyID`)
0
+) TYPE=InnoDB;

0
@@ -292,4 +292,12 @@
0
 go
0
 CREATE PRIMARY KEY numeric_data (id)
0
 go
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+  monkeyID INTEGER NOT NULL DEFAULT _rowid,
0
+  fleaCount INTEGER
0
+);
0
+go
0
+CREATE PRIMARY KEY mixed_case_monkeys (monkeyID)
0
+go

0
@@ -30,6 +30,7 @@
0
 drop table keyboards;
0
 drop table legacy_things;
0
 drop table numeric_data;
0
+drop table mixed_case_monkeys;
0
 
0
 drop sequence accounts_seq;
0
 drop sequence funny_jokes_seq;
0
@@ -61,4 +62,5 @@
0
 drop sequence keyboards_seq;
0
 drop sequence legacy_things_seq;
0
 drop sequence numeric_data_seq;
0
+drop sequence mixed_case_monkeys_seq;

0
@@ -317,4 +317,10 @@
0
   decimal_number_with_default decimal(3,2) DEFAULT 2.78
0
 );
0
 create sequence numeric_data_seq minvalue 10000;
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+ "monkeyID" INTEGER NOT NULL PRIMARY KEY,
0
+ "fleaCount" INTEGER
0
+);
0
+create sequence mixed_case_monkeys_seq minvalue 10000;

0
@@ -34,4 +34,5 @@
0
 DROP TABLE legacy_things;
0
 DROP TABLE numeric_data;
0
 DROP TABLE column_data;
0
+DROP TABLE mixed_case_monkeys;

0
@@ -256,4 +256,9 @@
0
   my_house_population decimal(2),
0
   decimal_number_with_default decimal(3,2) default 2.78
0
 );
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+ "monkeyID" INTEGER PRIMARY KEY,
0
+ "fleaCount" INTEGER
0
+);

0
@@ -29,4 +29,5 @@
0
 DROP TABLE keyboards;
0
 DROP TABLE legacy_things;
0
 DROP TABLE numeric_data;
0
+DROP TABLE mixed_case_monkeys;

0
@@ -208,4 +208,9 @@
0
   'my_house_population' DECIMAL(2),
0
   'decimal_number_with_default' DECIMAL(3,2) DEFAULT 2.78
0
 );
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+ 'monkeyID' INTEGER NOT NULL PRIMARY KEY,
0
+ 'fleaCount' INTEGER
0
+);

0
@@ -31,4 +31,5 @@
0
 DROP TABLE legacy_things;
0
 DROP TABLE numeric_data;
0
 DROP TABLE [order];
0
+DROP TABLE mixed_case_monkeys;

0
@@ -236,4 +236,9 @@
0
   texture varchar(255),
0
   flavor varchar(255)
0
 );
0
+
0
+CREATE TABLE mixed_case_monkeys (
0
+  [monkeyID] int NOT NULL IDENTITY(1, 1),
0
+  [fleaCount] int default NULL
0
+);

0
@@ -29,6 +29,7 @@
0
 DROP TABLE keyboards
0
 DROP TABLE legacy_things
0
 DROP TABLE numeric_data
0
+DROP TABLE mixed_case_monkeys
0
 DROP TABLE schema_info
0
 go

0
@@ -210,5 +210,10 @@
0
   decimal_number_with_default numeric(3,2) DEFAULT 2.78
0
 )
0
 
0
+CREATE TABLE mixed_case_monkeys (
0
+  [monkeyID] numeric(9,0) IDENTITY PRIMARY KEY,
0
+  [fleaCount] numeric(9,0)
0
+);
0
+
0
 go

0
@@ -1 +1,4 @@
0
+class MixedCaseMonkey < ActiveRecord::Base
0
+  set_primary_key 'monkeyID'
0
+end

0
@@ -1 +1,7 @@
0
+first:
0
+  monkeyID: 1
0
+  fleaCount: 42
0
+second:
0
+  monkeyID: 2
0
+  fleaCount: 43

0
@@ -4,9 +4,10 @@
0
 require 'fixtures/subscriber'
0
 require 'fixtures/movie'
0
 require 'fixtures/keyboard'
0
+require 'fixtures/mixed_case_monkey'
0
 
0
 class PrimaryKeysTest < Test::Unit::TestCase
0
-  fixtures :topics, :subscribers, :moviess
0
+  fixtures :topics, :subscribers, :movies, :mixed_case_monkeys
0
 
0
   def test_integer_key
0
     topic = Topic.find(1)
0
@@ -77,6 +78,28 @@
0
     ActiveRecord::Base.primary_key_prefix_type = nil
0
     Topic.reset_primary_key
0
     assert_equal "id", Topic.primary_key
0
+  end
0
+  
0
+  def test_delete_should_quote_pkey
0
+    assert_nothing_raised { MixedCaseMonkey.delete(1) }
0
+  end
0
+  def test_increment_counter_should_quote_pkey_and_quote_counter_columns
0
+    assert_nothing_raised { MixedCaseMonkey.increment_counter(:fleaCount, 1) }
0
+  end
0
+  def test_decrement_counter_should_quote_pkey_and_quote_counter_columns
0
+    assert_nothing_raised { MixedCaseMonkey.decrement_counter(:fleaCount, 1) }
0
+  end
0
+  def test_find_with_one_id_should_quote_pkey
0
+    assert_nothing_raised { MixedCaseMonkey.find(1) }
0
+  end
0
+  def test_find_with_multiple_ids_should_quote_pkey
0
+    assert_nothing_raised { MixedCaseMonkey.find([1,2]) }
0
+  end
0
+  def test_instance_update_should_quote_pkey
0
+    assert_nothing_raised { MixedCaseMonkey.find(1).save }
0
+  end
0
+  def test_instance_destry_should_quote_pkey
0
+    assert_nothing_raised { MixedCaseMonkey.find(1).destroy }
0
   end
0
 end