X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=db%2Fschema.rb;h=8132da33fdd2fd90d2b9eb01f3e75280d4a4dead;hb=9218748c58d552432e7bd4a34383589eb17ac331;hp=b349a7674150657e04019b30d1f9db0de7c55035;hpb=97d39268c0b348898dca1ec24552eb26a94ae546;p=cs356-p2-videostore.git

diff --git a/db/schema.rb b/db/schema.rb
index b349a76..8132da3 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 => 16) do
+ActiveRecord::Schema.define(:version => 21) do
 
   create_table "bitems", :force => true do |t|
     t.column "customer_id",    :integer, :null => false
@@ -29,16 +29,29 @@ ActiveRecord::Schema.define(:version => 16) do
     t.column "name", :string, :null => false
   end
 
+  create_table "merchandise_purchases", :force => true do |t|
+  end
+
   create_table "merchandises", :force => true do |t|
-    t.column "name",     :string,                                                 :null => false
+    t.column "title",    :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 "purchases", :force => true do |t|
-    t.column "customer_id",       :integer
-    t.column "purchaseable_id",   :integer
-    t.column "purchaseable_type", :string
+    t.column "type",           :string
+    t.column "customer_id",    :integer
+    t.column "date",           :date
+    t.column "price",          :decimal, :default => 0.0
+    t.column "rentable_id",    :integer
+    t.column "merchandise_id", :integer
+    t.column "quantity",       :integer
+  end
+
+  create_table "rentable_policies", :force => true do |t|
+    t.column "name",        :string,  :null => false
+    t.column "value",       :integer
+    t.column "description", :string,  :null => false
   end
 
   create_table "rentables", :force => true do |t|
@@ -52,6 +65,9 @@ ActiveRecord::Schema.define(:version => 16) do
     t.column "platform",    :integer
   end
 
+# Could not dump table "sqlite_sequence" because of following StandardError
+#   Unknown type '' for column 'name'
+
   create_table "videogenres", :force => true do |t|
     t.column "name", :string, :null => false
   end