update speech and balloon

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

diff --git a/db/schema.rb b/db/schema.rb
index 5e69dc6..8682613 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -60,23 +60,19 @@ ActiveRecord::Schema.define(:version => 20120424100555) do
   add_index "authors", ["user_id"], :name => "index_authors_on_user_id", :unique => true\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
@@ -213,31 +209,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.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_balloons", ["t"], :name => "speech_balloons_t", :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