X-Git-Url: https://www.irasnyder.com/gitweb/?a=blobdiff_plain;f=db%2Fschema.rb;h=45c829e3f603c2a1ef68e7f035d8f730fb622276;hb=506205df80b0318a1d58f59cbf68d5be4329489a;hp=192232a8dc2cbb4b8b582869cdcd0e95248048fa;hpb=9145563a8d27360910c3de21b088f68283f33ba3;p=cs356-p2-videostore.git

diff --git a/db/schema.rb b/db/schema.rb
index 192232a..45c829e 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 => 26) do
+ActiveRecord::Schema.define(:version => 32) do
 
   create_table "coitems", :force => true do |t|
     t.column "customer_id", :integer
@@ -19,23 +19,19 @@ ActiveRecord::Schema.define(:version => 26) do
     t.column "debt",    :decimal,                :default => 0.0
   end
 
-  create_table "game_policies", :force => true do |t|
-    t.column "day",         :integer,                               :null => false
-    t.column "fee",         :decimal, :precision => 8, :scale => 2, :null => false
-    t.column "period",      :integer
-    t.column "description", :string
-  end
-
-  create_table "gamegenres", :force => true do |t|
+  create_table "game_genres", :force => true do |t|
     t.column "name", :string, :null => false
   end
 
-  create_table "gameplatforms", :force => true do |t|
+  create_table "game_platforms", :force => true do |t|
     t.column "name", :string, :null => false
   end
 
-  create_table "medias", :force => true do |t|
-    t.column "name", :string, :null => false
+  create_table "game_policies", :force => true do |t|
+    t.column "day",         :integer,                               :null => false
+    t.column "fee",         :decimal, :precision => 8, :scale => 2, :null => false
+    t.column "period",      :integer
+    t.column "description", :string
   end
 
   create_table "merchandise_purchases", :force => true do |t|
@@ -64,19 +60,34 @@ ActiveRecord::Schema.define(:version => 26) do
   end
 
   create_table "rentables", :force => true do |t|
-    t.column "type",        :string
-    t.column "title",       :string
-    t.column "newrelease",  :boolean, :default => false
-    t.column "video_genre", :integer
-    t.column "director",    :string
-    t.column "media",       :integer
-    t.column "game_genre",  :integer
-    t.column "platform",    :integer
+    t.column "type",             :string
+    t.column "title",            :string
+    t.column "newrelease",       :boolean
+    t.column "video_genre_id",   :integer
+    t.column "director",         :string
+    t.column "video_media_id",   :integer
+    t.column "game_genre_id",    :integer
+    t.column "game_platform_id", :integer
   end
 
 # Could not dump table "sqlite_sequence" because of following StandardError
 #   Unknown type '' for column 'name'
 
+  create_table "users", :force => true do |t|
+    t.column "name",            :string,                     :null => false
+    t.column "hashed_password", :string
+    t.column "salt",            :string
+    t.column "manager",         :boolean, :default => false
+  end
+
+  create_table "video_genres", :force => true do |t|
+    t.column "name", :string, :null => false
+  end
+
+  create_table "video_medias", :force => true do |t|
+    t.column "name", :string, :null => false
+  end
+
   create_table "video_policies", :force => true do |t|
     t.column "day",         :integer,                               :null => false
     t.column "fee",         :decimal, :precision => 8, :scale => 2, :null => false
@@ -84,8 +95,4 @@ ActiveRecord::Schema.define(:version => 26) do
     t.column "description", :string
   end
 
-  create_table "videogenres", :force => true do |t|
-    t.column "name", :string, :null => false
-  end
-
 end