Added tree mixin and unit tests for all the mixins

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@156 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

10 files changed, 91 insertions, 1 deletions

diff --git a/activerecord/test/fixtures/db_definitions/mysql.sql b/activerecord/test/fixtures/db_definitions/mysql.sql
index 0b96c49dd3..6af00eb7f0 100755
--- a/activerecord/test/fixtures/db_definitions/mysql.sql
+++ b/activerecord/test/fixtures/db_definitions/mysql.sql
@@ -96,3 +96,15 @@ CREATE TABLE `colnametests` (
   `references` int(11) NOT NULL,
   PRIMARY KEY (`id`)
 );
+
+CREATE TABLE `mixins` (
+  `id` int(11) NOT NULL auto_increment,
+  `parent_id` int(11) default NULL,
+  `pos` int(11) default NULL,
+  `lft` int(11) default NULL,
+  `rgt` int(11) default NULL,
+  `root_id` int(11) default NULL,  
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+);
diff --git a/activerecord/test/fixtures/db_definitions/postgresql.sql b/activerecord/test/fixtures/db_definitions/postgresql.sql
index 87db0b7f3f..9bf1035ea3 100644
--- a/activerecord/test/fixtures/db_definitions/postgresql.sql
+++ b/activerecord/test/fixtures/db_definitions/postgresql.sql
@@ -113,3 +113,15 @@ CREATE TABLE colnametests (
   id serial,
   "references" integer NOT NULL
 );
+
+CREATE TABLE mixins (
+  id serial,
+  parent_id integer,
+  pos integer,
+  lft integer,
+  rgt integer,
+  root_id integer,  
+  created_at timestamp,
+  updated_at timestamp,
+  PRIMARY KEY  (`id`)
+);
diff --git a/activerecord/test/fixtures/db_definitions/sqlite.sql b/activerecord/test/fixtures/db_definitions/sqlite.sql
index 91ca172789..9863fc779f 100644
--- a/activerecord/test/fixtures/db_definitions/sqlite.sql
+++ b/activerecord/test/fixtures/db_definitions/sqlite.sql
@@ -85,3 +85,16 @@ CREATE TABLE 'colnametests' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'references' INTEGER NOT NULL
 );
+
+CREATE TABLE 'mixins' (
+  'id' INTEGER NOT NULL PRIMARY KEY,
+  'parent_id' INTEGER DEFAULT NULL,
+  'pos' INTEGER DEFAULT NULL,
+  'lft' INTEGER DEFAULT NULL,
+  'rgt' INTEGER DEFAULT NULL,
+  'root_id' INTEGER DEFAULT NULL,    
+  'created_at' DATETIME DEFAULT NULL,
+  'updated_at' DATETIME DEFAULT NULL
+);
+
+
diff --git a/activerecord/test/fixtures/db_definitions/sqlserver.sql b/activerecord/test/fixtures/db_definitions/sqlserver.sql
index 0ae9780273..555ff00f90 100644
--- a/activerecord/test/fixtures/db_definitions/sqlserver.sql
+++ b/activerecord/test/fixtures/db_definitions/sqlserver.sql
@@ -93,4 +93,18 @@ CREATE TABLE colnametests (
   id int NOT NULL IDENTITY(1, 1),
   [references] int NOT NULL,
   PRIMARY KEY (id)
-);
\ No newline at end of file
+);
+
+CREATE TABLE mixins (
+  id int NOT NULL IDENTITY(1, 1),
+  parent_id int default NULL,
+  pos int default NULL,
+  lft int default NULL,
+  rgt int default NULL,
+  root_id int default NULL,      
+  created_at datetime default NULL,
+  updated_at datetime default NULL,
+  PRIMARY KEY (id)    
+);
+
+
diff --git a/activerecord/test/fixtures/mixin.rb b/activerecord/test/fixtures/mixin.rb
new file mode 100644
index 0000000000..589c1a8c23
--- /dev/null
+++ b/activerecord/test/fixtures/mixin.rb
@@ -0,0 +1,21 @@
+class Mixin < ActiveRecord::Base
+  include ActiveRecord::Mixins::Touch
+  include ActiveRecord::Mixins::Tree
+end
+
+class ListMixin < ActiveRecord::Base
+  include ActiveRecord::Mixins::List
+   
+  def self.table_name
+    "mixins"
+  end
+    
+  def scope_condition
+     "parent_id = #{self.parent_id}"
+  end      
+  
+  def position_column
+    "pos"
+  end
+
+end
\ No newline at end of file
diff --git a/activerecord/test/fixtures/mixins.yml b/activerecord/test/fixtures/mixins.yml
new file mode 100644
index 0000000000..c74b1da51b
--- /dev/null
+++ b/activerecord/test/fixtures/mixins.yml
@@ -0,0 +1,14 @@
+first:
+  id: 1
+  pos: 1
+  parent_id: 0 
+  
+second:
+  id: 2
+  pos: 1
+  parent_id: 1
+
+third:
+  id: 3
+  pos: 2
+  parent_id: 1
\ No newline at end of file
diff --git a/activerecord/test/fixtures/naked/csv/accounts.csv b/activerecord/test/fixtures/naked/csv/accounts.csv
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/activerecord/test/fixtures/naked/csv/accounts.csv
@@ -0,0 +1 @@
+
diff --git a/activerecord/test/fixtures/naked/yml/accounts.yml b/activerecord/test/fixtures/naked/yml/accounts.yml
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/activerecord/test/fixtures/naked/yml/accounts.yml
@@ -0,0 +1 @@
+
diff --git a/activerecord/test/fixtures/naked/yml/companies.yml b/activerecord/test/fixtures/naked/yml/companies.yml
new file mode 100644
index 0000000000..2c151c203b
--- /dev/null
+++ b/activerecord/test/fixtures/naked/yml/companies.yml
@@ -0,0 +1 @@
+# i wonder what will happen here
diff --git a/activerecord/test/fixtures/naked/yml/courses.yml b/activerecord/test/fixtures/naked/yml/courses.yml
new file mode 100644
index 0000000000..19f0805d8d
--- /dev/null
+++ b/activerecord/test/fixtures/naked/yml/courses.yml
@@ -0,0 +1 @@
+qwerty