Massive Cleanup

[cs356-p2-videostore.git] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index f9d22a0..45c829e 100644 (file)
--- 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 => 27) 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 => 27) 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,14 +60,14 @@ ActiveRecord::Schema.define(:version => 27) 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
@@ -84,6 +80,14 @@ ActiveRecord::Schema.define(:version => 27) do
     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
@@ -91,8 +95,4 @@ ActiveRecord::Schema.define(:version => 27) do
     t.column "description", :string
   end
 
-  create_table "videogenres", :force => true do |t|
-    t.column "name", :string, :null => false
-  end
-
 end