activerecord 1.11.1 → 1.12.1

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

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

data/test/fixtures/db_definitions/oci2.sql

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

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

@@ -1,10 +1,12 @@
 DROP TABLE accounts;
 DROP TABLE companies;
+DROP SEQUENCE companies_nonstd_seq;
 DROP TABLE topics;
 DROP TABLE developers;
 DROP TABLE projects;
 DROP TABLE developers_projects;
 DROP TABLE customers;
+DROP TABLE orders;
 DROP TABLE movies;
 DROP TABLE subscribers;
 DROP TABLE booleantests;
@@ -24,3 +26,5 @@ DROP TABLE categories_posts;
 DROP TABLE defaults;
 DROP TABLE fk_test_has_fk;
 DROP TABLE fk_test_has_pk;
+DROP TABLE geometrics;
+DROP TABLE keyboards;

data/test/fixtures/db_definitions/postgresql.sql

@@ -6,8 +6,10 @@ CREATE TABLE accounts (
 );
 SELECT setval('accounts_id_seq', 100);
 
+CREATE SEQUENCE companies_nonstd_seq START 101;
+
 CREATE TABLE companies (
-    id serial,
+    id integer DEFAULT nextval('companies_nonstd_seq'),
     "type" character varying(50),
     "ruby_type" character varying(50),
     firm_id integer,
@@ -16,12 +18,12 @@ CREATE TABLE companies (
     rating integer default 1,
     PRIMARY KEY (id)
 );
-SELECT setval('companies_id_seq', 100);
 
 CREATE TABLE developers_projects (
     developer_id integer NOT NULL,
     project_id integer NOT NULL,
-    joined_on date
+    joined_on date,
+    access_level integer default 1
 );
 
 CREATE TABLE developers (
@@ -51,7 +53,7 @@ CREATE TABLE topics (
     bonus_time time,
     last_read date,
     content text,
-    approved smallint DEFAULT 1,
+    approved boolean default true,
     replies_count integer default 0,
     parent_id integer,
     "type" character varying(50),
@@ -71,6 +73,15 @@ CREATE TABLE customers (
 );
 SELECT setval('customers_id_seq', 100);
 
+CREATE TABLE orders (
+    id serial,
+    name character varying,
+    billing_customer_id integer,
+    shipping_customer_id integer,
+    PRIMARY KEY (id)
+);
+SELECT setval('orders_id_seq', 100);
+
 CREATE TABLE movies (
     movieid serial,
     name text,
@@ -92,8 +103,10 @@ CREATE TABLE booleantests (
 CREATE TABLE defaults (
     id serial,
     modified_date date default CURRENT_DATE,
+    modified_date_function date default now(),
     fixed_date date default '2004-01-01',
     modified_time timestamp default CURRENT_TIMESTAMP,
+    modified_time_function timestamp default now(),
     fixed_time timestamp default '2004-01-01 00:00:00.000000-00',
     char1 char(1) default 'Y',
     char2 character varying(50) default 'a varchar field',
@@ -195,3 +208,19 @@ CREATE TABLE fk_test_has_fk (
   id    INTEGER NOT NULL PRIMARY KEY,
   fk_id INTEGER NOT NULL REFERENCES fk_test_has_fk(id)
 );
+
+CREATE TABLE geometrics (
+  id serial primary key,
+  a_point point,
+  -- a_line line, (the line type is currently not implemented in postgresql)
+  a_line_segment lseg,
+  a_box box,
+  a_path path,
+  a_polygon polygon,
+  a_circle circle
+);
+
+CREATE TABLE keyboards (
+  key_number serial primary key,
+  "name" character varying(50)
+);

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

@@ -5,6 +5,7 @@ DROP TABLE developers;
 DROP TABLE projects;
 DROP TABLE developers_projects;
 DROP TABLE customers;
+DROP TABLE orders;
 DROP TABLE movies;
 DROP TABLE subscribers;
 DROP TABLE booleantests;
@@ -23,3 +24,4 @@ DROP TABLE categories;
 DROP TABLE categories_posts;
 DROP TABLE fk_test_has_fk;
 DROP TABLE fk_test_has_pk;
+DROP TABLE keyboards;

data/test/fixtures/db_definitions/sqlite.sql

@@ -24,7 +24,7 @@ CREATE TABLE 'topics' (
   'bonus_time' TIME DEFAULT NULL,
   'last_read' DATE DEFAULT NULL,
   'content' TEXT,
-  'approved' INTEGER DEFAULT 1,
+  'approved' boolean DEFAULT 't',
   'replies_count' INTEGER DEFAULT 0,
   'parent_id' INTEGER DEFAULT NULL,
   'type' VARCHAR(255) DEFAULT NULL
@@ -47,7 +47,16 @@ CREATE TABLE 'projects' (
 CREATE TABLE 'developers_projects' (
   'developer_id' INTEGER NOT NULL,
   'project_id' INTEGER NOT NULL,
-  'joined_on' DATE DEFAULT NULL
+  'joined_on' DATE DEFAULT NULL,
+  'access_level' INTEGER DEFAULT 1
+);
+
+
+CREATE TABLE 'orders' (
+  'id' INTEGER PRIMARY KEY NOT NULL,
+  'name' VARCHAR(255) DEFAULT NULL,
+  'billing_customer_id' INTEGER DEFAULT NULL,
+  'shipping_customer_id' INTEGER DEFAULT NULL
 );
 
 CREATE TABLE 'customers' (
@@ -167,3 +176,8 @@ CREATE TABLE 'fk_test_has_fk' (
 
   FOREIGN KEY ('fk_id') REFERENCES 'fk_test_has_pk'('id')
 );
+
+CREATE TABLE 'keyboards' (
+  'key_number' INTEGER PRIMARY KEY NOT NULL,
+  'name' VARCHAR(255) DEFAULT NULL
+);

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

@@ -5,6 +5,7 @@ DROP TABLE developers;
 DROP TABLE projects;
 DROP TABLE developers_projects;
 DROP TABLE customers;
+DROP TABLE orders;
 DROP TABLE movies;
 DROP TABLE subscribers;
 DROP TABLE booleantests;
@@ -23,3 +24,4 @@ DROP TABLE categories;
 DROP TABLE categories_posts;
 DROP TABLE fk_test_has_pd;
 DROP TABLE fk_test_has_fk;
+DROP TABLE keyboards;

data/test/fixtures/db_definitions/sqlserver.sql

@@ -22,7 +22,7 @@ CREATE TABLE topics (
   written_on datetime default NULL,
   bonus_time datetime default NULL,
   last_read datetime default NULL,
-  content text,
+  content varchar(255) default NULL,
   approved tinyint default 1,
   replies_count int default 0,
   parent_id int default NULL,
@@ -46,9 +46,18 @@ CREATE TABLE projects (
 CREATE TABLE developers_projects (
   developer_id int NOT NULL,
   project_id int NOT NULL,
-  joined_on datetime default NULL
+  joined_on datetime default NULL,
+  access_level int default 1
 );
 
+CREATE TABLE orders (
+  id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
+  name varchar(100) default NULL,
+  billing_customer_id int default NULL,
+  shipping_customer_id int default NULL
+);
+
+
 CREATE TABLE customers (
   id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
   name varchar(100) default NULL,
@@ -167,3 +176,8 @@ CREATE TABLE fk_test_has_fk (
 
   FOREIGN KEY (fk_id) REFERENCES fk_test_has_pk(id)
 );
+
+CREATE TABLE keyboards (
+  key_number int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
+  name varchar(50) default NULL
+);

data/test/fixtures/developer.rb

@@ -1,7 +1,7 @@
 class Developer < ActiveRecord::Base
   has_and_belongs_to_many :projects
   has_and_belongs_to_many :special_projects, :join_table => 'developers_projects', :association_foreign_key => 'project_id'
-	
+
   validates_inclusion_of :salary, :in => 50000..200000
   validates_length_of    :name, :within => 3..20
 end

data/test/fixtures/keyboard.rb

@@ -0,0 +1,3 @@
+class Keyboard < ActiveRecord::Base
+  set_primary_key 'key_number'
+end

data/test/fixtures/mixins.yml

@@ -2,7 +2,7 @@
 tree_1:
   id: 1001
   type: TreeMixin
-  parent_id: 0 
+  parent_id:
   
 tree_2:
   id: 1002
@@ -18,6 +18,16 @@ tree_4:
   id: 1004
   type: TreeMixin  
   parent_id: 1001
+
+tree2_1:
+  id: 1005
+  type: TreeMixin
+  parent_id:
+
+tree3_1:
+  id: 1006
+  type: TreeMixin
+  parent_id:
   
 # List mixins
 

data/test/fixtures/order.rb

@@ -0,0 +1,4 @@
+class Order < ActiveRecord::Base
+  belongs_to :billing, :class_name => 'Customer', :foreign_key => 'billing_customer_id' 
+  belongs_to :shipping, :class_name => 'Customer', :foreign_key => 'shipping_customer_id' 
+end

data/test/fixtures/post.rb

@@ -5,6 +5,10 @@ class Post < ActiveRecord::Base
   has_many   :special_comments, :class_name => "SpecialComment"
   has_and_belongs_to_many :categories
   has_and_belongs_to_many :special_categories, :join_table => "categories_posts"
+  
+  def self.what_are_you
+    'a post...'
+  end
 end
 
 class SpecialPost < Post; end;

data/test/fixtures/posts.yml

@@ -39,3 +39,10 @@ sti_habtm:
   title: habtm sti test
   body: hello
   type: Post
+
+eager_other:
+  id: 7
+  author_id: 2
+  title: eager loading with OR'd conditions
+  body: hello
+  type: Post

data/test/fixtures/project.rb

@@ -2,6 +2,7 @@ class Project < ActiveRecord::Base
   has_and_belongs_to_many :developers, :uniq => true
   has_and_belongs_to_many :developers_named_david, :class_name => "Developer", :conditions => "name = 'David'", :uniq => true
   has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
+  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id}'
   has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => "DELETE FROM developers_projects WHERE project_id = \#{id} AND developer_id = \#{record.id}"
   has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id}"},
                             :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id}"}, 

data/test/fixtures/subject.rb

@@ -0,0 +1,4 @@
+# used for OracleSynonymTest, see test/synonym_test_oci.rb
+#
+class Subject < ActiveRecord::Base
+end

data/test/fixtures/subscriber.rb

@@ -1,8 +1,6 @@
 class Subscriber < ActiveRecord::Base
-  def self.primary_key
-    "nick"
-  end
+  set_primary_key 'nick'
 end
 
 class SpecialSubscriber < Subscriber
-end
+end

data/test/fixtures/topics.yml

@@ -7,7 +7,7 @@ first:
   last_read: 2004-04-15
   bonus_time: 2005-01-30t15:28:00.00+01:00
   content: Have a nice day
-  approved: 0
+  approved: false
   replies_count: 0
 
 second:
@@ -16,6 +16,6 @@ second:
   author_name: Mary
   written_on: 2003-07-15t15:28:00.00+01:00
   content: Have a nice day
-  approved: 1
+  approved: true
   replies_count: 2
   parent_id: 1

data/test/fixtures_test.rb

@@ -51,6 +51,44 @@ class FixturesTest < Test::Unit::TestCase
     assert_nil(secondRow["author_email_address"])
   end
 
+  def test_inserts_with_pre_and_suffix
+    ActiveRecord::Base.connection.create_table :prefix_topics_suffix do |t|
+      t.column :title, :string
+      t.column :author_name, :string
+      t.column :author_email_address, :string
+      t.column :written_on, :datetime
+      t.column :bonus_time, :time
+      t.column :last_read, :date
+      t.column :content, :text
+      t.column :approved, :boolean, :default => true
+      t.column :replies_count, :integer, :default => 0
+      t.column :parent_id, :integer
+      t.column :type, :string, :limit => 50
+    end
+
+    # Store existing prefix/suffix
+    old_prefix = ActiveRecord::Base.table_name_prefix
+    old_suffix = ActiveRecord::Base.table_name_suffix
+
+    # Set a prefix/suffix we can test against
+    ActiveRecord::Base.table_name_prefix = 'prefix_'
+    ActiveRecord::Base.table_name_suffix = '_suffix'
+
+    topics = create_fixtures("topics")
+
+    # Restore prefix/suffix to its previous values
+    ActiveRecord::Base.table_name_prefix = old_prefix 
+    ActiveRecord::Base.table_name_suffix = old_suffix 
+
+    firstRow = ActiveRecord::Base.connection.select_one("SELECT * FROM prefix_topics_suffix WHERE author_name = 'David'")
+    assert_equal("The First Topic", firstRow["title"])
+
+    secondRow = ActiveRecord::Base.connection.select_one("SELECT * FROM prefix_topics_suffix WHERE author_name = 'Mary'")
+    assert_nil(secondRow["author_email_address"])        
+  ensure
+    ActiveRecord::Base.connection.drop_table :prefix_topics_suffix rescue nil
+  end
+
   def test_insert_with_datetime
     topics = create_fixtures("tasks")
     first = Task.find(1)
@@ -117,6 +155,47 @@ class FixturesTest < Test::Unit::TestCase
   def test_empty_csv_fixtures
     assert_not_nil Fixtures.new( Account.connection, "accounts", File.dirname(__FILE__) + "/fixtures/naked/csv/accounts")
   end
+
+  def test_omap_fixtures
+    assert_nothing_raised do
+      fixtures = Fixtures.new(Account.connection, 'categories', File.dirname(__FILE__) + '/fixtures/categories_ordered')
+
+      i = 0
+      fixtures.each do |name, fixture|
+        assert_equal "fixture_no_#{i}", name
+        assert_equal "Category #{i}", fixture['name']
+        i += 1
+      end
+    end
+  end
+end
+
+if Account.connection.respond_to?(:reset_pk_sequence!)
+  class FixturesResetPkSequenceTest < Test::Unit::TestCase
+    fixtures :accounts
+
+    def test_resets_to_min_pk
+      Account.delete_all
+      Account.connection.reset_pk_sequence!(Account.table_name)
+
+      one = Account.new(:credit_limit => 50)
+      one.save!
+      assert_equal 1, one.id
+    end
+
+    def test_create_fixtures_resets_sequences
+      # create_fixtures performs reset_pk_sequence!
+      max_id = create_fixtures('accounts').inject(0) do |max_id, (name, fixture)|
+        fixture_id = fixture['id'].to_i
+        fixture_id > max_id ? fixture_id : max_id
+      end
+
+      # Clone the last fixture to check that it gets the next greatest id.
+      another = Account.new(:credit_limit => 1200)
+      another.save!
+      assert_equal max_id + 1, another.id
+    end
+  end
 end
 
 
@@ -209,11 +288,4 @@ class ForeignKeyFixturesTest < Test::Unit::TestCase
   def test_number2
     assert true
   end
-
 end
-
-
-
-
-
-

data/test/inheritance_test.rb

@@ -57,7 +57,7 @@ class InheritanceTest < Test::Unit::TestCase
   end
 
   def test_inheritance_condition
-    assert_equal 5, Company.count
+    assert_equal 8, Company.count
     assert_equal 2, Firm.count
     assert_equal 3, Client.count
   end
@@ -127,7 +127,7 @@ class InheritanceTest < Test::Unit::TestCase
 
   def test_inheritance_without_mapping
     assert_kind_of SpecialSubscriber, SpecialSubscriber.find("webster132")
-    assert_nothing_raised { SpecialSubscriber.create("name" => "And breaaaaathe!", "id" => "smartass") }
+    assert_nothing_raised { s = SpecialSubscriber.new("name" => "And breaaaaathe!"); s.id = 'roger'; s.save }
   end
 
   private