From 8ffb22056c2896a67917b813064b2247233d3a08 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 1 Dec 2006 21:24:47 +0000
Subject: Subclasses of an abstract class work with single-table inheritance.
 Closes #5704.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/test/fixtures/db_definitions/mysql.sql  | 6 +++---
 activerecord/test/fixtures/db_definitions/sqlite.sql | 4 ++--
 activerecord/test/fixtures/post.rb                   | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'activerecord/test/fixtures')

diff --git a/activerecord/test/fixtures/db_definitions/mysql.sql b/activerecord/test/fixtures/db_definitions/mysql.sql
index c6a78962c6..9e5cf72aba 100755
--- a/activerecord/test/fixtures/db_definitions/mysql.sql
+++ b/activerecord/test/fixtures/db_definitions/mysql.sql
@@ -159,14 +159,14 @@ CREATE TABLE `posts` (
   `author_id` INTEGER,
   `title` VARCHAR(255) NOT NULL,
   `body` TEXT NOT NULL,
-  `type` VARCHAR(255) NOT NULL
+  `type` VARCHAR(255) default NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `comments` (
   `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `post_id` INTEGER NOT NULL,
   `body` TEXT NOT NULL,
-  `type` VARCHAR(255) NOT NULL
+  `type` VARCHAR(255) default NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `authors` (
@@ -184,7 +184,7 @@ CREATE TABLE `tasks` (
 CREATE TABLE `categories` (
   `id` int(11) NOT NULL auto_increment,
   `name` VARCHAR(255) NOT NULL,
-  `type` VARCHAR(255) NOT NULL,
+  `type` VARCHAR(255) default NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
diff --git a/activerecord/test/fixtures/db_definitions/sqlite.sql b/activerecord/test/fixtures/db_definitions/sqlite.sql
index 8f89c419a1..edf1e815da 100644
--- a/activerecord/test/fixtures/db_definitions/sqlite.sql
+++ b/activerecord/test/fixtures/db_definitions/sqlite.sql
@@ -144,14 +144,14 @@ CREATE TABLE 'posts' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'author_id' INTEGER,
   'title' VARCHAR(255) NOT NULL,
-  'type' VARCHAR(255) NOT NULL,
+  'type' VARCHAR(255) DEFAULT NULL,
   'body' TEXT NOT NULL
 );
 
 CREATE TABLE 'comments' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'post_id' INTEGER NOT NULL,
-  'type' VARCHAR(255) NOT NULL,
+  'type' VARCHAR(255) DEFAULT NULL,
   'body' TEXT NOT NULL
 );
 
diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/fixtures/post.rb
index 9dc18441d0..44ac3c1053 100644
--- a/activerecord/test/fixtures/post.rb
+++ b/activerecord/test/fixtures/post.rb
@@ -46,7 +46,7 @@ class Post < ActiveRecord::Base
   end
 end
 
-class SpecialPost < Post; end;
+class SpecialPost < Post; end
 
 class StiPost < Post
   self.abstract_class = true
@@ -54,4 +54,5 @@ class StiPost < Post
 end
 
 class SubStiPost < StiPost
+  self.table_name = Post.table_name
 end
-- 
cgit v1.2.3