aboutsummaryrefslogtreecommitdiffstats
path: root/spec/schemas
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-02-17 11:40:09 -0300
committerEmilio Tagua <miloops@gmail.com>2010-02-17 11:40:09 -0300
commit0c2930cba355607eebb8ead19161a41ec0cec992 (patch)
tree97edecdb80c6e63c2ae0c1587e807e271bea6449 /spec/schemas
parentf21f289ebf8cd4b89f507d48e62e7c5c986922d8 (diff)
parente74bbd6830f5ca5f0ab1fe9f2f645674f6333a29 (diff)
downloadrails-0c2930cba355607eebb8ead19161a41ec0cec992.tar.gz
rails-0c2930cba355607eebb8ead19161a41ec0cec992.tar.bz2
rails-0c2930cba355607eebb8ead19161a41ec0cec992.zip
Merge branch 'master' of github.com:rails/arel
Diffstat (limited to 'spec/schemas')
-rw-r--r--spec/schemas/mysql_schema.rb3
-rw-r--r--spec/schemas/postgresql_schema.rb3
-rw-r--r--spec/schemas/sqlite3_schema.rb3
3 files changed, 6 insertions, 3 deletions
diff --git a/spec/schemas/mysql_schema.rb b/spec/schemas/mysql_schema.rb
index cb4c746776..a2e913d756 100644
--- a/spec/schemas/mysql_schema.rb
+++ b/spec/schemas/mysql_schema.rb
@@ -16,7 +16,8 @@ sql = <<-SQL
id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(255) NOT NULL,
salary INTEGER NOT NULL,
- department VARCHAR(255) NOT NULL
+ department VARCHAR(255) NOT NULL,
+ created_at TIMESTAMP NOT NULL
);
SQL
diff --git a/spec/schemas/postgresql_schema.rb b/spec/schemas/postgresql_schema.rb
index 8b7dac1c41..23a48f5ad8 100644
--- a/spec/schemas/postgresql_schema.rb
+++ b/spec/schemas/postgresql_schema.rb
@@ -16,7 +16,8 @@ sql = <<-SQL
id SERIAL PRIMARY KEY NOT NULL,
name VARCHAR(255) NOT NULL,
salary INTEGER NOT NULL,
- department VARCHAR(255) NOT NULL
+ department VARCHAR(255) NOT NULL,
+ created_at TIMESTAMP NOT NULL
);
SQL
diff --git a/spec/schemas/sqlite3_schema.rb b/spec/schemas/sqlite3_schema.rb
index 9dbb62428e..c1fed70859 100644
--- a/spec/schemas/sqlite3_schema.rb
+++ b/spec/schemas/sqlite3_schema.rb
@@ -16,7 +16,8 @@ sql = <<-SQL
id INTEGER NOT NULL PRIMARY KEY,
name VARCHAR(255) NOT NULL,
salary INTEGER NOT NULL,
- department VARCHAR(255) NOT NULL
+ department VARCHAR(255) NOT NULL,
+ created_at TIMESTAMP NOT NULL
);
SQL