diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
| commit | b04230e3bbf912d60601e9e7b797c4cd43581d51 (patch) | |
| tree | 97a2f784a2ec2bfae4f960af56a9280dad6f7774 /activerecord/test/schema/schema.rb | |
| parent | 867829b187969607aa12f2b0457f25da9c204db0 (diff) | |
| parent | 6e3bee6cf1f0d2684152292db0a8b757249824fd (diff) | |
| download | rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.gz rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.bz2 rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
Diffstat (limited to 'activerecord/test/schema/schema.rb')
| -rw-r--r-- | activerecord/test/schema/schema.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 1ec36e7832..bec4291457 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -191,6 +191,11 @@ ActiveRecord::Schema.define do t.string :info end + create_table :invoices, :force => true do |t| + t.integer :balance + t.datetime :updated_at + end + create_table :items, :force => true do |t| t.column :name, :integer end @@ -216,6 +221,11 @@ ActiveRecord::Schema.define do t.integer :version, :null => false, :default => 0 end + create_table :line_items, :force => true do |t| + t.integer :invoice_id + t.integer :amount + end + create_table :lock_without_defaults, :force => true do |t| t.column :lock_version, :integer end |