remove deprecated set_table_name and set_primary_key calls in test suite

test/h2_simple_test.rb

@@ -15,8 +15,8 @@ def setup
     @connection.execute("set schema s2");
     CreateUsers.up
     @connection.execute("set schema public");
-    Entry.set_table_name 's1.entries'
-    User.set_table_name 's2.users'
+    Entry.table_name = 's1.entries'
+    User.table_name = 's2.users'
     user = User.create! :login => "something"
     Entry.create! :title => "title", :content => "content", :rating => 123.45, :user => user
   end

test/manualTestDatabase.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env jruby
 
-if ARGV.length < 2  
+if ARGV.length < 2
   $stderr.puts "syntax: #{__FILE__} [filename] [configuration-name]"
   $stderr.puts "  where filename points to a YAML database configuration file"
   $stderr.puts "  and the configuration name is in this file"
@@ -21,7 +21,7 @@
 ActiveRecord::Schema.define do
   drop_table :authors rescue nil
   drop_table :author rescue nil
-  
+
   create_table :author, :force => true do |t|
     t.column :name, :string, :null => false
   end
@@ -42,13 +42,13 @@
   change_column_default :author, :female, false if /db2|derby|mssql|firebird/ !~ ARGV[1]
   remove_column :author, :died if /db2|derby/ !~ ARGV[1]
   rename_column :author, :wakeup_time, :waking_time if /db2|derby|mimer/ !~ ARGV[1]
- 
+
   add_index :author, :name, :unique if /db2/ !~ ARGV[1]
   add_index :author, [:age,:female], :name => :is_age_female if /db2/ !~ ARGV[1]
- 
+
   remove_index :author, :name if /db2/ !~ ARGV[1]
   remove_index :author, :name => :is_age_female if /db2/ !~ ARGV[1]
-  
+
   rename_table :author, :authors if /db2|firebird|mimer/ !~ ARGV[1]
 
 
@@ -73,7 +73,7 @@
 end
 
 class Author < ActiveRecord::Base;
-  set_table_name "author" if /db2|firebird|mimer/ =~ ARGV[1]
+  self.table_name = "author" if /db2|firebird|mimer/ =~ ARGV[1]
 end
 
 class Order < ActiveRecord::Base
@@ -83,7 +83,7 @@ class Order < ActiveRecord::Base
 class Product < ActiveRecord::Base
   has_many :orders, :through => :line_items
   has_many :line_items
-  
+
   def self.find_products_for_sale
     find(:all, :order => "title")
   end
@@ -95,51 +95,51 @@ class LineItem < ActiveRecord::Base
 end
 
     Product.create(:title => 'Pragmatic Project Automation',
-    :description => 
+    :description =>
     %{<p>
-       <em>Pragmatic Project Automation</em> shows you how to improve the 
-       consistency and repeatability of your project's procedures using 
+       <em>Pragmatic Project Automation</em> shows you how to improve the
+       consistency and repeatability of your project's procedures using
        automation to reduce risk and errors.
       </p>
       <p>
-        Simply put, we're going to put this thing called a computer to work 
-        for you doing the mundane (but important) project stuff. That means 
-        you'll have more time and energy to do the really 
+        Simply put, we're going to put this thing called a computer to work
+        for you doing the mundane (but important) project stuff. That means
+        you'll have more time and energy to do the really
         exciting---and difficult---stuff, like writing quality code.
       </p>},
-    :image_url =>   '/images/auto.jpg',    
+    :image_url =>   '/images/auto.jpg',
     :price => 29.95)
 
 
     Product.create(:title => 'Pragmatic Version Control',
       :description =>
       %{<p>
-         This book is a recipe-based approach to using Subversion that will 
-         get you up and 
-         running quickly---and correctly. All projects need version control: 
-         it's a foundational piece of any project's infrastructure. Yet half 
-         of all project teams in the U.S. don't use any version control at all. 
+         This book is a recipe-based approach to using Subversion that will
+         get you up and
+         running quickly---and correctly. All projects need version control:
+         it's a foundational piece of any project's infrastructure. Yet half
+         of all project teams in the U.S. don't use any version control at all.
          Many others don't use it well, and end up experiencing time-consuming problems.
       </p>},
     :image_url => '/images/svn.jpg',
     :price => 28.50)
-    
+
     # . . .
 
 
     Product.create(:title => 'Pragmatic Unit Testing (C#)',
-    :description => 
+    :description =>
     %{<p>
-        Pragmatic programmers use feedback to drive their development and 
-        personal processes. The most valuable feedback you can get while 
+        Pragmatic programmers use feedback to drive their development and
+        personal processes. The most valuable feedback you can get while
         coding comes from unit testing.
       </p>
       <p>
-        Without good tests in place, coding can become a frustrating game of 
-        "whack-a-mole." That's the carnival game where the player strikes at a 
-        mechanical mole; it retreats and another mole pops up on the opposite side 
-        of the field. The moles pop up and down so fast that you end up flailing 
-        your mallet helplessly as the moles continue to pop up where you least 
+        Without good tests in place, coding can become a frustrating game of
+        "whack-a-mole." That's the carnival game where the player strikes at a
+        mechanical mole; it retreats and another mole pops up on the opposite side
+        of the field. The moles pop up and down so fast that you end up flailing
+        your mallet helplessly as the moles continue to pop up where you least
         expect them.
       </p>},
     :image_url => '/images/utc.jpg',
@@ -148,7 +148,7 @@ class LineItem < ActiveRecord::Base
 
 
 
-1.times do 
+1.times do
   $stderr.print '.'
   Author.destroy_all
   Author.create(:name => "Arne Svensson", :age => 30)
@@ -181,11 +181,11 @@ class LineItem < ActiveRecord::Base
   puts "order: #{order.line_items.inspect}, with id: #{order.id} and name: #{order.name}"
 end
 
-ActiveRecord::Schema.define do 
+ActiveRecord::Schema.define do
     drop_table :line_items
     drop_table :orders
     drop_table :products
 
-  
+
   drop_table((/db2|firebird|mimer/=~ARGV[1]? :author : :authors ))
 end

test/models/validates_uniqueness_of_string.rb

@@ -13,7 +13,7 @@ def self.down
 end
 
 class ValidatesUniquenessOfString < ActiveRecord::Base
-  self.set_table_name "validates_uniqueness_of"
+  self.table_name = "validates_uniqueness_of"
   validates_uniqueness_of :cs_string, :case_sensitive => true
   validates_uniqueness_of :ci_string, :case_sensitive => false
 end

test/mysql_simple_test.rb

@@ -94,12 +94,12 @@ def test_find_in_other_schema_with_include
     old_entries_table_name = Entry.table_name
     old_users_table_name   = User.table_name
     begin
-      User.set_table_name "#{MYSQL_CONFIG[:database]}.users"
-      Entry.set_table_name "#{MYSQL_CONFIG[:database]}.entries"
+      User.table_name  = "#{MYSQL_CONFIG[:database]}.users"
+      Entry.table_name = "#{MYSQL_CONFIG[:database]}.entries"
       assert !Entry.all(:include => :user).empty?
     ensure
-      Entry.set_table_name old_entries_table_name
-      User.set_table_name old_users_table_name
+      Entry.table_name = old_entries_table_name
+      User.table_name  = old_users_table_name
     end
   end
 

test/oracle_specific_test.rb

@@ -70,7 +70,7 @@ def test_load_null_date
 
   def test_model_access_by_synonym
     @klass = Class.new(ActiveRecord::Base)
-    @klass.set_table_name "POSTS"
+    @klass.table_name = "POSTS"
     entry_columns = Entry.columns_hash
     @klass.columns.each do |c|
       ec = entry_columns[c.name]

test/postgres_nonseq_pkey_test.rb

@@ -15,7 +15,7 @@ def self.down
 end
 
 class Url < ActiveRecord::Base
-  set_primary_key :uhash
+  self.primary_key = :uhash
   #Shouldn't be needed: set_sequence_name nil
 end