activerecord 1.3.0 → 1.4.0

data/test/connections/native_db2/connection.rb

@@ -0,0 +1,24 @@
+print "Using native DB2\n"
+require 'fixtures/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+db1 = 'arunit'
+db2 = 'arunit2'
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "db2",
+  :host     => "localhost",
+  :username => "arunit",
+  :password => "arunit",
+  :database => db1
+)
+
+Course.establish_connection(
+  :adapter  => "db2",
+  :host     => "localhost",
+  :username => "arunit2",
+  :password => "arunit2",
+  :database => db2
+)

data/test/connections/native_sqlserver/connection.rb

@@ -6,10 +6,16 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
 
 ActiveRecord::Base.establish_connection(
   :adapter  => "sqlserver",
-  :dsn => "DBI:ADO:Provider=SQLOLEDB;Data Source=(local);Initial Catalog=test;User Id=sa;Password=password;"
+  :host     => "localhost",
+  :username => "sa",
+  :password => "",
+  :database => db1
 )
 
 Course.establish_connection(
-  :adapter => "sqlserver",
-  :dsn => "DBI:ADO:Provider=SQLOLEDB;Data Source=(local);Initial Catalog=test2;User Id=sa;Password=password;"
+  :adapter  => "sqlserver",
+  :host     => "localhost",
+  :username => "sa",
+  :password => "",
+  :database => db2
 )

data/test/deprecated_associations_test.rb

@@ -286,9 +286,11 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
     natural = Client.create("name" => "Natural Company")
     apple.clients << natural
     assert_equal apple.id, natural.firm_id
-    assert_equal Client.find(natural.id), Firm.find(apple.id).clients.find { |c| c.id == natural.id }
+    assert_equal Client.find(natural.id), Firm.find(apple.id).clients.find(natural.id)
     apple.clients.delete natural
-    assert_nil Firm.find(apple.id).clients.find { |c| c.id == natural.id }
+    assert_raises(ActiveRecord::RecordNotFound) {
+      Firm.find(apple.id).clients.find(natural.id)
+    }
   end
 
   def test_natural_adding_of_has_and_belongs_to_many
@@ -299,17 +301,21 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
     rails.developers << john
     rails.developers << mike
 
-    assert_equal Developer.find(john.id), Project.find(rails.id).developers.find { |d| d.id == john.id }
-    assert_equal Developer.find(mike.id), Project.find(rails.id).developers.find { |d| d.id == mike.id }
-    assert_equal Project.find(rails.id), Developer.find(mike.id).projects.find { |p| p.id == rails.id }
-    assert_equal Project.find(rails.id), Developer.find(john.id).projects.find { |p| p.id == rails.id }
+    assert_equal Developer.find(john.id), Project.find(rails.id).developers.find(john.id)
+    assert_equal Developer.find(mike.id), Project.find(rails.id).developers.find(mike.id)
+    assert_equal Project.find(rails.id), Developer.find(mike.id).projects.find(rails.id)
+    assert_equal Project.find(rails.id), Developer.find(john.id).projects.find(rails.id)
     ap.developers << john
-    assert_equal Developer.find(john.id), Project.find(ap.id).developers.find { |d| d.id == john.id }
-    assert_equal Project.find(ap.id), Developer.find(john.id).projects.find { |p| p.id == ap.id }
+    assert_equal Developer.find(john.id), Project.find(ap.id).developers.find(john.id)
+    assert_equal Project.find(ap.id), Developer.find(john.id).projects.find(ap.id)
 
     ap.developers.delete john
-    assert_nil Project.find(ap.id).developers.find { |d| d.id == john.id }
-    assert_nil Developer.find(john.id).projects.find { |p| p.id == ap.id }
+    assert_raises(ActiveRecord::RecordNotFound) {
+      Project.find(ap.id).developers.find(john.id)
+    }
+    assert_raises(ActiveRecord::RecordNotFound) {
+      Developer.find(john.id).projects.find(ap.id)
+    }
   end
 
   def test_storing_in_pstore

data/test/finder_test.rb

@@ -4,14 +4,10 @@ require 'fixtures/topic'
 require 'fixtures/entrant'
 
 class FinderTest < Test::Unit::TestCase
-  def setup
-    @company_fixtures = create_fixtures("companies")
-    @topic_fixtures   = create_fixtures("topics")
-    @entrant_fixtures = create_fixtures("entrants")
-  end
+  fixtures :companies, :topics, :entrants
   
   def test_find
-    assert_equal(@topic_fixtures["first"]["title"], Topic.find(1).title)
+    assert_equal(@topics["first"]["title"], Topic.find(1).title)
   end
   
   def test_find_by_array_of_one_id
@@ -21,7 +17,7 @@ class FinderTest < Test::Unit::TestCase
   
   def test_find_by_ids
     assert_equal(2, Topic.find(1, 2).length)
-    assert_equal(@topic_fixtures["second"]["title"], Topic.find([ 2 ]).first.title)
+    assert_equal(@topics["second"]["title"], Topic.find([ 2 ]).first.title)
   end
 
   def test_find_by_ids_missing_one
@@ -34,33 +30,33 @@ class FinderTest < Test::Unit::TestCase
     entrants = Entrant.find_all nil, "id ASC", 2
     
     assert_equal(2, entrants.size)
-    assert_equal(@entrant_fixtures["first"]["name"], entrants.first.name)
+    assert_equal(@entrants["first"]["name"], entrants.first.name)
   end
 
   def test_find_all_with_prepared_limit_and_offset
     entrants = Entrant.find_all nil, "id ASC", ["? OFFSET ?", 2, 1]
     
     assert_equal(2, entrants.size)
-    assert_equal(@entrant_fixtures["second"]["name"], entrants.first.name)
+    assert_equal(@entrants["second"]["name"], entrants.first.name)
   end
 
   def test_find_with_entire_select_statement
     topics = Topic.find_by_sql "SELECT * FROM topics WHERE author_name = 'Mary'"
     
     assert_equal(1, topics.size)
-    assert_equal(@topic_fixtures["second"]["title"], topics.first.title)
+    assert_equal(@topics["second"]["title"], topics.first.title)
   end
   
   def test_find_with_prepared_select_statement
     topics = Topic.find_by_sql ["SELECT * FROM topics WHERE author_name = ?", "Mary"]
     
     assert_equal(1, topics.size)
-    assert_equal(@topic_fixtures["second"]["title"], topics.first.title)
+    assert_equal(@topics["second"]["title"], topics.first.title)
   end
   
   def test_find_first
     first = Topic.find_first "title = 'The First Topic'"
-    assert_equal(@topic_fixtures["first"]["title"], first.title)
+    assert_equal(@topics["first"]["title"], first.title)
   end
   
   def test_find_first_failing
@@ -77,6 +73,11 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_find_on_conditions
+    assert Topic.find(1, :conditions => "approved = 0")
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => "approved = 1") }
+  end
+  
+  def test_deprecated_find_on_conditions
     assert Topic.find_on_conditions(1, "approved = 0")
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find_on_conditions(1, "approved = 1") }
   end
@@ -111,7 +112,19 @@ class FinderTest < Test::Unit::TestCase
     assert Company.find_first(["name = :name", {:name => "37signals' go'es agains"}])
   end
 
+  def test_bind_arity
+    assert_nothing_raised                                 { bind '' }
+    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '', 1 }
+  
+    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '?' }
+    assert_nothing_raised                                 { bind '?', 1 }
+    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '?', 1, 1  }
+  end
+  
   def test_named_bind_variables
+    assert_equal '1', bind(':a', :a => 1) # ' ruby-mode
+    assert_equal '1 1', bind(':a :a', :a => 1)  # ' ruby-mode
+  
     assert_kind_of Firm, Company.find_first(["name = :name", { :name => "37signals" }])
     assert_nil Company.find_first(["name = :name", { :name => "37signals!" }])
     assert_nil Company.find_first(["name = :name", { :name => "37signals!' OR 1=1" }])
@@ -124,7 +137,15 @@ class FinderTest < Test::Unit::TestCase
     }
   end
 
-  
+  def test_named_bind_arity
+    assert_nothing_raised { bind '', {} }
+    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '', :a => 1 }
+    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a', {} } # ' ruby-mode
+    assert_nothing_raised { bind ':a', :a => 1 } # ' ruby-mode
+    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a', :a => 1, :b => 2 } # ' ruby-mode
+    assert_nothing_raised { bind ':a :a', :a => 1 } # ' ruby-mode
+    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a :a', :a => 1, :b => 2 } # ' ruby-mode
+  end
 	
   def test_string_sanitation
     assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
@@ -142,4 +163,35 @@ class FinderTest < Test::Unit::TestCase
     assert_equal(1, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 2]))
     assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1]))
   end
+
+  def test_find_by_one_attribute
+    assert_equal @topics["first"].find, Topic.find_by_title("The First Topic")
+    assert_nil Topic.find_by_title("The First Topic!")
+  end
+
+  def test_find_by_one_missing_attribute
+    assert_raises(NoMethodError) { Topic.find_by_undertitle("The First Topic!") }
+  end
+
+  def test_find_by_two_attributes
+    assert_equal @topics["first"].find, Topic.find_by_title_and_author_name("The First Topic", "David")
+    assert_nil Topic.find_by_title_and_author_name("The First Topic", "Mary")
+  end
+
+  def test_find_all_by_one_attribute
+    topics = Topic.find_all_by_content("Have a nice day")
+    assert_equal 2, topics.size
+    assert topics.include?(@topics["first"].find)
+
+    assert_equal [], Topic.find_all_by_title("The First Topic!!")
+  end
+
+  protected
+    def bind(statement, *vars)
+      if vars.first.is_a?(Hash)
+        ActiveRecord::Base.send(:replace_named_bind_variables, statement, vars.first)
+      else
+        ActiveRecord::Base.send(:replace_bind_variables, statement, vars)
+      end
+    end
 end

data/test/fixtures/binary.rb

@@ -0,0 +1,2 @@
+class Binary < ActiveRecord::Base
+end

data/test/fixtures/companies.yml

@@ -0,0 +1,21 @@
+first_client:
+  id: 2
+  type: Client
+  firm_id: 1
+  client_of: 2
+  name: Summit
+  ruby_type: Client
+
+first_firm:
+  id: 1
+  type: Firm
+  name: 37signals
+  ruby_type: Firm
+
+second_client:
+  id: 3
+  type: Client
+  firm_id: 1
+  client_of: 1
+  name: Microsoft
+  ruby_type: Client

data/test/fixtures/courses.yml

@@ -0,0 +1,7 @@
+java:
+  id: 2
+  name: Java Development
+
+ruby:
+  id: 1
+  name: Ruby Development

data/test/fixtures/customers.yml

@@ -0,0 +1,7 @@
+david:
+  id: 1
+  name: David
+  balance: 50
+  address_street: Funny Street
+  address_city: Scary Town
+  address_country: Loony Land

data/test/fixtures/db_definitions/db2.sql

@@ -0,0 +1,124 @@
+CREATE TABLE accounts (
+  id int generated by default as identity (start with +10000),
+  firm_id int default NULL,
+  credit_limit int default NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE companies (
+  id int generated by default as identity (start with +10000),
+  type varchar(50) default NULL,
+  ruby_type varchar(50) default NULL,
+  firm_id int default NULL,
+  name varchar(50) default NULL,
+  client_of int default NULL,
+  rating int default 1,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE topics (
+  id int generated by default as identity (start with +10000),
+  title varchar(255) default NULL,
+  author_name varchar(255) default NULL,
+  author_email_address varchar(255) default NULL,
+  written_on timestamp default NULL,
+  bonus_time time default NULL,
+  last_read date default NULL,
+  content varchar(3000),
+  approved smallint default 1,
+  replies_count int default 0,
+  parent_id int default NULL,
+  type varchar(50) default NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE developers (
+  id int generated by default as identity (start with +10000),
+  name varchar(100) default NULL,
+  salary int default 70000,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE projects (
+  id int generated by default as identity (start with +10000),
+  name varchar(100) default NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE developers_projects (
+  developer_id int NOT NULL,
+  project_id int NOT NULL,
+  joined_on date default NULL
+);
+
+CREATE TABLE customers (
+  id int generated by default as identity (start with +10000),
+  name varchar(100) default NULL,
+  balance int default 0,
+  address_street varchar(100) default NULL,
+  address_city varchar(100) default NULL,
+  address_country varchar(100) default NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE movies (
+  movieid int generated by default as identity (start with +10000),
+  name varchar(100) default NULL,
+  PRIMARY KEY (movieid)
+);
+
+CREATE TABLE subscribers (
+  nick varchar(100) NOT NULL,
+  name varchar(100) default NULL,
+  PRIMARY KEY (nick)
+);
+
+CREATE TABLE booleantests (
+  id int generated by default as identity (start with +10000),
+  value int default NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE auto_id_tests (
+  auto_id int generated by default as identity (start with +10000),
+  value int default NULL,
+  PRIMARY KEY (auto_id)
+);
+
+CREATE TABLE entrants (
+  id int NOT NULL PRIMARY KEY,
+  name varchar(255) NOT NULL,
+  course_id int NOT NULL
+);
+
+CREATE TABLE colnametests (
+  id int generated by default as identity (start with +10000),
+  references int NOT NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE mixins (
+  id int generated by default as identity (start with +10000),
+  parent_id int default NULL,
+  pos int default NULL,
+  created_at timestamp default NULL,
+  updated_at timestamp default NULL,
+  lft int default NULL,
+  rgt int default NULL,
+  root_id int default NULL,
+  type varchar(40) default NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE people (
+  id int generated by default as identity (start with +10000),
+  first_name varchar(40) NOT NULL,
+  lock_version int default 0,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE binaries (
+  id int generated by default as identity (start with +10000),
+  data blob(50000),
+  PRIMARY KEY  (id)
+);

data/test/fixtures/db_definitions/db22.sql

@@ -0,0 +1,4 @@
+CREATE TABLE courses (
+ id int NOT NULL PRIMARY KEY,
+ name varchar(255) NOT NULL
+);

data/test/fixtures/db_definitions/mysql.sql

@@ -110,3 +110,15 @@ CREATE TABLE `mixins` (
   `type` varchar(40) default NULL,
   PRIMARY KEY  (`id`)
 );
+
+CREATE TABLE `people` (
+  `id` INTEGER NOT NULL PRIMARY KEY,
+  `first_name` VARCHAR(40) NOT NULL,
+  `lock_version` INTEGER NOT NULL DEFAULT 0
+);
+
+CREATE TABLE `binaries` (
+  `id` int(11) NOT NULL auto_increment,
+  `data` mediumblob,
+  PRIMARY KEY  (`id`)
+);

data/test/fixtures/db_definitions/postgresql.sql

@@ -127,3 +127,16 @@ CREATE TABLE mixins (
   updated_at timestamp,
   PRIMARY KEY  (id)
 );
+
+CREATE TABLE people (
+  id serial,
+  first_name text,
+  lock_version integer default 0,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE binaries ( 
+  id serial , 
+  data bytea,
+  PRIMARY KEY (id)
+);