Added better defaults for composed_of, so statements like composed_of :time_zone, :mapping => %w( time_zone time_zone ) can be written without the mapping part (it's now assumed)

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

6 files changed, 7 insertions, 1 deletions

diff --git a/activerecord/test/fixtures/db_definitions/db2.sql b/activerecord/test/fixtures/db_definitions/db2.sql
index 46e326d504..07569c27ed 100644
--- a/activerecord/test/fixtures/db_definitions/db2.sql
+++ b/activerecord/test/fixtures/db_definitions/db2.sql
@@ -58,6 +58,7 @@ CREATE TABLE customers (
   address_street varchar(100) default NULL,
   address_city varchar(100) default NULL,
   address_country varchar(100) default NULL,
+  gps_location varchar(100) default NULL,
   PRIMARY KEY (id)
 );
 
diff --git a/activerecord/test/fixtures/db_definitions/mysql.sql b/activerecord/test/fixtures/db_definitions/mysql.sql
index 1064373f7f..c864074dbd 100755
--- a/activerecord/test/fixtures/db_definitions/mysql.sql
+++ b/activerecord/test/fixtures/db_definitions/mysql.sql
@@ -59,6 +59,7 @@ CREATE TABLE `customers` (
   `address_street` varchar(100) default NULL,
   `address_city` varchar(100) default NULL,
   `address_country` varchar(100) default NULL,
+  `gps_location` varchar(100) default NULL,
   PRIMARY KEY  (`id`)
 );
 
diff --git a/activerecord/test/fixtures/db_definitions/oci.sql b/activerecord/test/fixtures/db_definitions/oci.sql
index 86d7a03165..16d6e660a2 100644
--- a/activerecord/test/fixtures/db_definitions/oci.sql
+++ b/activerecord/test/fixtures/db_definitions/oci.sql
@@ -83,6 +83,7 @@ create table customers (
     address_street varchar(100) default null,
     address_city varchar(100) default null,
     address_country varchar(100) default null,
+    gps_location varchar(100) default null,
     primary key (id)
 );
 
diff --git a/activerecord/test/fixtures/db_definitions/postgresql.sql b/activerecord/test/fixtures/db_definitions/postgresql.sql
index f779027286..ab392c5688 100644
--- a/activerecord/test/fixtures/db_definitions/postgresql.sql
+++ b/activerecord/test/fixtures/db_definitions/postgresql.sql
@@ -65,6 +65,7 @@ CREATE TABLE customers (
     address_street character varying,
     address_city character varying,
     address_country character varying,
+    gps_location character varying,
     PRIMARY KEY (id)
 );
 SELECT setval('customers_id_seq', 100);
diff --git a/activerecord/test/fixtures/db_definitions/sqlite.sql b/activerecord/test/fixtures/db_definitions/sqlite.sql
index 988973b0ff..d57c3889e0 100644
--- a/activerecord/test/fixtures/db_definitions/sqlite.sql
+++ b/activerecord/test/fixtures/db_definitions/sqlite.sql
@@ -53,7 +53,8 @@ CREATE TABLE 'customers' (
   'balance' INTEGER DEFAULT 0,
   'address_street' TEXT DEFAULT NULL,
   'address_city' TEXT DEFAULT NULL,
-  'address_country' TEXT DEFAULT NULL
+  'address_country' TEXT DEFAULT NULL,
+  'gps_location' TEXT DEFAULT NULL
 );
 
 CREATE TABLE 'movies' (
diff --git a/activerecord/test/fixtures/db_definitions/sqlserver.sql b/activerecord/test/fixtures/db_definitions/sqlserver.sql
index 743a5383fe..d658b6266d 100644
--- a/activerecord/test/fixtures/db_definitions/sqlserver.sql
+++ b/activerecord/test/fixtures/db_definitions/sqlserver.sql
@@ -57,6 +57,7 @@ CREATE TABLE customers (
   address_street varchar(100) default NULL,
   address_city varchar(100) default NULL,
   address_country varchar(100) default NULL,
+  gps_location varchar(100) default NULL,
   PRIMARY KEY  (id)
 );