X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=db%2Fschema.rb;h=73ad8b39452d1c55381a315d0f2a2c3116a808de;hb=f4a463b2d77fccc4919aea19a54736db6e485688;hp=77281f819ccde69dc17bc0b9b23cf81a8acf4f57;hpb=97369db0c55dbf9d52059116497995481d9d163d;p=cs356-p2-videostore.git

diff --git a/db/schema.rb b/db/schema.rb
index 77281f8..73ad8b3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 13) do
+ActiveRecord::Schema.define(:version => 14) do
 
   create_table "coitems", :force => true do |t|
     t.column "customer_id", :integer
@@ -23,6 +23,12 @@ ActiveRecord::Schema.define(:version => 13) do
     t.column "name", :string, :null => false
   end
 
+  create_table "merchandises", :force => true do |t|
+    t.column "name",     :string,                                                 :null => false
+    t.column "quantity", :integer,                               :default => 0,   :null => false
+    t.column "price",    :decimal, :precision => 8, :scale => 2, :default => 0.0
+  end
+
   create_table "rentables", :force => true do |t|
     t.column "type",        :string
     t.column "title",       :string