activerecord 1.6.0 → 1.7.0

data/test/connections/native_sqlite/connection.rb

@@ -3,6 +3,9 @@ require 'fixtures/course'
 require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
+class SqliteError < StandardError
+end
+
 BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
 sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite"
 sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite"
@@ -12,7 +15,7 @@ def make_connection(clazz, db_file, db_definitions_file)
     puts "SQLite database not found at #{db_file}. Rebuilding it."
     sqlite_command = "sqlite #{db_file} 'create table a (a integer); drop table a;'"
     puts "Executing '#{sqlite_command}'"
-    `#{sqlite_command}`
+    raise SqliteError.new("Seems that there is no sqlite executable available") unless system(sqlite_command)
     clazz.establish_connection(
         :adapter => "sqlite",
         :dbfile  => db_file)

data/test/connections/native_sqlite3/connection.rb

@@ -2,7 +2,9 @@ print "Using native SQLite3\n"
 require 'fixtures/course'
 require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
-ActiveRecord::Base.logger.level = Logger::DEBUG
+
+class SqliteError < StandardError
+end
 
 BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
 sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite3"
@@ -13,7 +15,7 @@ def make_connection(clazz, db_file, db_definitions_file)
     puts "SQLite3 database not found at #{db_file}. Rebuilding it."
     sqlite_command = "sqlite3 #{db_file} 'create table a (a integer); drop table a;'"
     puts "Executing '#{sqlite_command}'"
-    `#{sqlite_command}`
+    raise SqliteError.new("Seems that there is no sqlite3 executable available") unless system(sqlite_command)
     clazz.establish_connection(
         :adapter => "sqlite3",
         :dbfile  => db_file)

data/test/deprecated_associations_test.rb

@@ -3,7 +3,6 @@ require 'fixtures/developer'
 require 'fixtures/project'
 require 'fixtures/company'
 require 'fixtures/topic'
-# require File.dirname(__FILE__) + '/../dev-utils/eval_debugger'
 require 'fixtures/reply'
 
 # Can't declare new classes in test case methods, so tests before that
@@ -249,11 +248,11 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
   end
 
   def test_has_and_belongs_to_many_adding_a_collection
-    aridridel = Developer.new("name" => "Aridridel")
-    aridridel.save
+    aredridel = Developer.new("name" => "Aredridel")
+    aredridel.save
 
-    aridridel.add_projects([ Project.find(1), Project.find(2) ])
-    assert_equal 2, aridridel.projects_count
+    aredridel.add_projects([ Project.find(1), Project.find(2) ])
+    assert_equal 2, aredridel.projects_count
   end
 
   def test_belongs_to_counter

data/test/finder_test.rb

@@ -34,10 +34,16 @@ class FinderTest < Test::Unit::TestCase
   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(@entrants["second"]["name"], entrants.first.name)
+    if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
+      if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
+        assert_raises(ArgumentError) { Entrant.find_all nil, "id ASC", ["? OFFSET ?", 2, 1] }
+      end
+    else
+      entrants = Entrant.find_all nil, "id ASC", ["? OFFSET ?", 2, 1]
+
+      assert_equal(2, entrants.size)
+      assert_equal(@entrants["second"]["name"], entrants.first.name)
+    end
   end
 
   def test_find_with_entire_select_statement
@@ -193,6 +199,16 @@ class FinderTest < Test::Unit::TestCase
 
     assert_equal [], Topic.find_all_by_title("The First Topic!!")
   end
+
+  def test_find_all_by_boolean_attribute
+    topics = Topic.find_all_by_approved(false)
+    assert_equal 1, topics.size
+    assert topics.include?(@topics["first"].find)
+
+    topics = Topic.find_all_by_approved(true)
+    assert_equal 1, topics.size
+    assert topics.include?(@topics["second"].find)
+  end
   
   def test_find_by_nil_attribute
     topic = Topic.find_by_last_read nil

data/test/fixtures/db_definitions/create_oracle_db.bat

@@ -0,0 +1,5 @@
+sqlplus arunit/arunit @ drop_oracle_tables
+sqlplus arunit/arunit @ oracle
+sqlplus arunit2/arunit2 @ drop_oracle_tables2
+sqlplus arunit2/arunit2 @ oracle2
+

data/test/fixtures/db_definitions/create_oracle_db.sh

@@ -0,0 +1,5 @@
+sqlplus arunit/arunit @ drop_oracle_tables
+sqlplus arunit/arunit @ oracle
+sqlplus arunit2/arunit2 @ drop_oracle_tables2
+sqlplus arunit2/arunit2 @ oracle2
+

data/test/fixtures/db_definitions/db2.drop.sql

@@ -0,0 +1,18 @@
+DROP TABLE accounts;
+DROP TABLE companies;
+DROP TABLE topics;
+DROP TABLE developers;
+DROP TABLE projects;
+DROP TABLE developers_projects;
+DROP TABLE customers;
+DROP TABLE movies;
+DROP TABLE subscribers;
+DROP TABLE booleantests;
+DROP TABLE auto_id_tests;
+DROP TABLE entrants;
+DROP TABLE colnametests;
+DROP TABLE mixins;
+DROP TABLE people;
+DROP TABLE binaries;
+DROP TABLE computers;
+

data/test/fixtures/db_definitions/db2.sql

@@ -127,3 +127,4 @@ CREATE TABLE computers (
   id int generated by default as identity (start with +10000),
   developer int NOT NULL
 );
+

data/test/fixtures/db_definitions/db22.drop.sql

@@ -0,0 +1,2 @@
+DROP TABLE courses;
+

data/test/fixtures/db_definitions/db22.sql

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

data/test/fixtures/db_definitions/drop_oracle_tables.sql

@@ -0,0 +1,35 @@
+DROP TABLE accounts;
+DROP SEQUENCE accounts_id;
+DROP TABLE companies;
+DROP SEQUENCE companies_id;
+DROP TABLE topics;
+DROP SEQUENCE topics_id;
+DROP TABLE developers;
+DROP SEQUENCE developers_id;
+DROP TABLE projects;
+DROP SEQUENCE projects_id;
+DROP TABLE developers_projects;
+DROP SEQUENCE developers_projects_id;
+DROP TABLE customers;
+DROP SEQUENCE customers_id;
+DROP TABLE movies;
+DROP SEQUENCE movies_id;
+DROP TABLE subscribers;
+DROP SEQUENCE subscribers_id;
+DROP TABLE booleantests;
+DROP SEQUENCE booleantests_id;
+DROP TABLE auto_id_tests;
+DROP SEQUENCE auto_id_tests_id;
+DROP TABLE entrants;
+DROP SEQUENCE entrants_id;
+DROP TABLE colnametests;
+DROP SEQUENCE colnametests_id;
+DROP TABLE mixins;
+DROP SEQUENCE mixins_id;
+DROP TABLE people;
+DROP SEQUENCE people_id;
+DROP TABLE binaries;
+DROP SEQUENCE binaries_id;
+DROP TABLE computers;
+DROP SEQUENCE computers_id;
+EXIT;

data/test/fixtures/db_definitions/drop_oracle_tables2.sql

@@ -0,0 +1,3 @@
+DROP TABLE courses;
+DROP SEQUENCE courses_id;
+EXIT;

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

@@ -0,0 +1,18 @@
+DROP TABLE accounts;
+DROP TABLE companies;
+DROP TABLE topics;
+DROP TABLE developers;
+DROP TABLE projects;
+DROP TABLE developers_projects;
+DROP TABLE customers;
+DROP TABLE movies;
+DROP TABLE subscribers;
+DROP TABLE booleantests;
+DROP TABLE auto_id_tests;
+DROP TABLE entrants;
+DROP TABLE colnametests;
+DROP TABLE mixins;
+DROP TABLE people;
+DROP TABLE binaries;
+DROP TABLE computers;
+

data/test/fixtures/db_definitions/mysql.sql

@@ -126,4 +126,5 @@ CREATE TABLE `binaries` (
 CREATE TABLE `computers` (
   `id` INTEGER NOT NULL PRIMARY KEY,
   `developer` INTEGER NOT NULL
-);
+);
+

data/test/fixtures/db_definitions/mysql2.drop.sql

@@ -0,0 +1,2 @@
+DROP TABLE courses;
+

data/test/fixtures/db_definitions/mysql2.sql

@@ -2,3 +2,4 @@ CREATE TABLE `courses` (
  `id` INTEGER NOT NULL PRIMARY KEY,
  `name` VARCHAR(255) NOT NULL
 );
+

data/test/fixtures/db_definitions/oci.drop.sql

@@ -0,0 +1,18 @@
+drop table accounts;
+drop table companies;
+drop table topics;
+drop table developers;
+drop table projects;
+drop table developers_projects;
+drop table customers;
+drop table movies;
+drop table subscribers;
+drop table booleantests;
+drop table auto_id_tests;
+drop table entrants;
+drop table colnametests;
+drop table mixins;
+drop table people;
+drop table binaries;
+drop table computers;
+drop sequence rails_sequence;

data/test/fixtures/db_definitions/oci.sql

@@ -0,0 +1,167 @@
+create sequence rails_sequence minvalue 10000;
+
+create table companies (
+    id integer not null,
+    type varchar(50) default null,
+    ruby_type varchar(50) default null,
+    firm_id integer default null references companies initially deferred disable,
+    name varchar(50) default null,
+    client_of integer default null references companies initially deferred disable,
+    companies_count integer default 0,
+    rating integer default 1,
+    primary key (id)
+);
+
+create table accounts (
+    id integer not null,
+    firm_id integer default null references companies initially deferred disable,
+    credit_limit integer default null,
+    primary key (id)
+);
+
+create table topics (
+    id integer not null,
+    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 timestamp default null,
+    last_read timestamp default null,
+    content varchar(4000),
+    approved integer default 1,
+    replies_count integer default 0,
+    parent_id integer references topics initially deferred disable,
+    type varchar(50) default null,
+    primary key (id)
+);
+-- try again for 8i
+create table topics (
+    id integer not null,
+    title varchar(255) default null,
+    author_name varchar(255) default null,
+    author_email_address varchar(255) default null,
+    written_on date default null,
+    bonus_time date default null,
+    last_read date default null,
+    content varchar(4000),
+    approved integer default 1,
+    replies_count integer default 0,
+    parent_id integer references topics initially deferred disable,
+    type varchar(50) default null,
+    primary key (id)
+);
+
+create table developers (
+    id integer not null,
+    name varchar(100) default null,
+    salary integer default 70000,
+    primary key (id)
+);
+
+create table projects (
+    id integer not null,
+    name varchar(100) default null,
+    primary key (id)
+);
+
+create table developers_projects (
+    developer_id integer not null references developers initially deferred disable,
+    project_id integer not null references projects initially deferred disable,
+    joined_on timestamp default null
+);
+-- Try again for 8i
+create table developers_projects (
+    developer_id integer not null references developers initially deferred disable,
+    project_id integer not null references projects initially deferred disable,
+    joined_on date default null
+);
+
+create table customers (
+    id integer not null,
+    name varchar(100) default null,
+    balance integer 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 integer not null,
+    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 integer not null,
+    value integer default null,
+    primary key (id)
+);
+
+create table auto_id_tests (
+    auto_id integer not null,
+    value integer default null,
+    primary key (auto_id)
+);
+
+create table entrants (
+    id integer not null primary key,
+    name varchar(255) not null,
+    course_id integer not null
+);
+
+create table colnametests (
+    id integer not null,
+    references integer not null,
+    primary key (id)
+);
+
+create table mixins (
+    id integer not null,
+    parent_id integer default null references mixins initially deferred disable,
+    type varchar(40) default null,
+    pos integer default null,
+    lft integer default null,
+    rgt integer default null,
+    root_id integer default null,
+    created_at timestamp default null,
+    updated_at timestamp default null,
+    primary key (id)
+);
+-- try again for 8i
+create table mixins (
+    id integer not null,
+    parent_id integer default null references mixins initially deferred disable,
+    type varchar(40) default null,
+    pos integer default null,
+    lft integer default null,
+    rgt integer default null,
+    root_id integer default null,
+    created_at date default null,
+    updated_at date default null,
+    primary key (id)
+);
+
+create table people (
+    id integer not null,
+    first_name varchar(40) null,
+    lock_version integer default 0,
+    primary key (id)
+);
+
+create table binaries (
+    id integer not null,
+    data blob null,
+    primary key (id)
+);
+
+create table computers (
+  id integer not null primary key,
+  developer integer not null references developers initially deferred disable
+);

data/test/fixtures/db_definitions/oci2.drop.sql

@@ -0,0 +1,2 @@
+drop table courses;
+drop sequence rails_sequence;

data/test/fixtures/db_definitions/oci2.sql

@@ -0,0 +1,6 @@
+create sequence rails_sequence minvalue 10000;
+
+create table courses (
+  id int not null primary key,
+  name varchar(255) not null
+);

data/test/fixtures/db_definitions/postgresql.drop.sql

@@ -0,0 +1,18 @@
+DROP TABLE accounts;
+DROP TABLE companies;
+DROP TABLE topics;
+DROP TABLE developers;
+DROP TABLE projects;
+DROP TABLE developers_projects;
+DROP TABLE customers;
+DROP TABLE movies;
+DROP TABLE subscribers;
+DROP TABLE booleantests;
+DROP TABLE auto_id_tests;
+DROP TABLE entrants;
+DROP TABLE colnametests;
+DROP TABLE mixins;
+DROP TABLE people;
+DROP TABLE binaries;
+DROP TABLE computers;
+