fix panel test

[pettanr/pettanr.git] / db / schema.rb

diff --git a/db/schema.rb b/db/schema.rb
index 2d863a7..2c94bfb 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -59,40 +59,20 @@ ActiveRecord::Schema.define(:version => 20120424100555) do
 \r
   add_index "authors", ["user_id"], :name => "index_authors_on_user_id", :unique => true\r
 \r
-  create_table "balloon_templates", :force => true do |t|\r
-    t.integer  "speech_balloon_id",                :null => false\r
-    t.integer  "system_picture_id",                :null => false\r
-    t.integer  "tail",              :default => 1, :null => false\r
-    t.integer  "size",              :default => 1, :null => false\r
-    t.integer  "min_width",         :default => 0, :null => false\r
-    t.integer  "max_width",         :default => 0, :null => false\r
-    t.integer  "min_height",        :default => 0, :null => false\r
-    t.integer  "max_height",        :default => 0, :null => false\r
-    t.datetime "created_at"\r
-    t.datetime "updated_at"\r
-  end\r
-\r
-  add_index "balloon_templates", ["speech_balloon_id", "tail", "size"], :name => "balloon_templates_idts", :unique => true\r
-  add_index "balloon_templates", ["speech_balloon_id"], :name => "index_balloon_templates_on_speech_balloon_id"\r
-\r
   create_table "balloons", :force => true do |t|\r
-    t.integer  "panel_id",                           :null => false\r
-    t.integer  "balloon_template_id",                :null => false\r
-    t.integer  "system_picture_id",                  :null => false\r
-    t.integer  "tail",                :default => 1, :null => false\r
-    t.integer  "size",                :default => 1, :null => false\r
-    t.integer  "x",                                  :null => false\r
-    t.integer  "y",                                  :null => false\r
-    t.integer  "z",                                  :null => false\r
-    t.integer  "t",                   :default => 1, :null => false\r
-    t.integer  "width",                              :null => false\r
-    t.integer  "height",                             :null => false\r
+    t.integer  "speech_balloon_id", :null => false\r
+    t.integer  "system_picture_id", :null => false\r
+    t.integer  "x",                 :null => false\r
+    t.integer  "y",                 :null => false\r
+    t.integer  "width",             :null => false\r
+    t.integer  "height",            :null => false\r
+    t.string   "caption"\r
+    t.string   "settings"\r
     t.datetime "created_at"\r
     t.datetime "updated_at"\r
   end\r
 \r
-  add_index "balloons", ["panel_id", "t"], :name => "balloon_idt", :unique => true\r
-  add_index "balloons", ["panel_id"], :name => "index_balloons_on_panel_id"\r
+  add_index "balloons", ["speech_balloon_id"], :name => "index_balloons_on_speech_balloon_id"\r
 \r
   create_table "comics", :force => true do |t|\r
     t.string   "title",      :limit => 100,                :null => false\r
@@ -186,7 +166,7 @@ ActiveRecord::Schema.define(:version => 20120424100555) do
   add_index "panel_pictures", ["panel_id", "t"], :name => "panel_pictures_idt", :unique => true\r
 \r
   create_table "panels", :force => true do |t|\r
-    t.integer  "comic_id",                             :null => false\r
+    t.integer  "comic_id"\r
     t.integer  "resource_picture_id"\r
     t.integer  "width",               :default => 200, :null => false\r
     t.integer  "height",              :default => 80,  :null => false\r
@@ -201,7 +181,6 @@ ActiveRecord::Schema.define(:version => 20120424100555) do
   end\r
 \r
   add_index "panels", ["author_id"], :name => "index_panels_on_author_id"\r
-  add_index "panels", ["comic_id", "t"], :name => "panels_idt", :unique => true\r
 \r
   create_table "resource_pictures", :force => true do |t|\r
     t.string   "ext",                                :null => false\r
@@ -229,44 +208,31 @@ ActiveRecord::Schema.define(:version => 20120424100555) do
   add_index "speech_balloon_templates", ["t"], :name => "speech_balloon_templates_t", :unique => true\r
 \r
   create_table "speech_balloons", :force => true do |t|\r
-    t.string   "name",                      :null => false\r
-    t.integer  "tail_count", :default => 1, :null => false\r
-    t.integer  "size_count", :default => 1, :null => false\r
-    t.integer  "t",          :default => 1, :null => false\r
-    t.datetime "created_at"\r
-    t.datetime "updated_at"\r
-  end\r
-\r
-  add_index "speech_balloons", ["t"], :name => "speech_balloons_t", :unique => true\r
-\r
-  create_table "speech_templates", :force => true do |t|\r
-    t.integer  "balloon_template_id",                :null => false\r
-    t.integer  "x",                                  :null => false\r
-    t.integer  "y",                                  :null => false\r
-    t.integer  "t",                   :default => 1, :null => false\r
-    t.integer  "width",                              :null => false\r
-    t.integer  "height",                             :null => false\r
+    t.integer  "panel_id",                                 :null => false\r
+    t.integer  "speech_balloon_template_id",               :null => false\r
+    t.string   "classname",                  :limit => 50, :null => false\r
+    t.integer  "z",                                        :null => false\r
+    t.integer  "t",                                        :null => false\r
+    t.string   "settings"\r
     t.datetime "created_at"\r
     t.datetime "updated_at"\r
   end\r
 \r
-  add_index "speech_templates", ["balloon_template_id", "t"], :name => "speech_templates_idt", :unique => true\r
+  add_index "speech_balloons", ["panel_id"], :name => "index_speech_balloons_on_panel_id"\r
 \r
   create_table "speeches", :force => true do |t|\r
-    t.integer  "balloon_id",                        :null => false\r
-    t.integer  "speech_template_id",                :null => false\r
+    t.integer  "speech_balloon_id", :null => false\r
     t.string   "content"\r
-    t.integer  "x",                                 :null => false\r
-    t.integer  "y",                                 :null => false\r
-    t.integer  "t",                  :default => 1, :null => false\r
-    t.integer  "width",                             :null => false\r
-    t.integer  "height",                            :null => false\r
+    t.integer  "x",                 :null => false\r
+    t.integer  "y",                 :null => false\r
+    t.integer  "width",             :null => false\r
+    t.integer  "height",            :null => false\r
+    t.string   "settings"\r
     t.datetime "created_at"\r
     t.datetime "updated_at"\r
   end\r
 \r
-  add_index "speeches", ["balloon_id", "t"], :name => "speeches_bt", :unique => true\r
-  add_index "speeches", ["balloon_id"], :name => "index_speeches_on_balloon_id"\r
+  add_index "speeches", ["speech_balloon_id"], :name => "index_speeches_on_speech_balloon_id"\r
 \r
   create_table "system_pictures", :force => true do |t|\r
     t.string   "ext",                      :null => false\r