X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=db%2Fschema.rb;h=6d51ff26f4fd0ede9ee3fdb867b1caba12ff4ed9;hb=4a07277d3517672f4fc7a96af8cc2b2da54f3525;hp=818bfafe5379f8093df49a9999228be77d0c0241;hpb=dedb9544e58d29977141c8bdc6f19d0c6ce957ac;p=pettanr%2Fpettanr.git diff --git a/db/schema.rb b/db/schema.rb index 818bfafe..6d51ff26 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120102071851) do +ActiveRecord::Schema.define(:version => 20120306231650) do create_table "admins", :force => true do |t| t.string "email", :default => "", :null => false @@ -28,6 +28,7 @@ ActiveRecord::Schema.define(:version => 20120102071851) do t.datetime "confirmed_at" t.datetime "confirmation_sent_at" t.string "authentication_token" + t.integer "approve", :default => 0, :null => false t.datetime "created_at" t.datetime "updated_at" end @@ -42,7 +43,7 @@ ActiveRecord::Schema.define(:version => 20120102071851) do t.string "name" t.string "homepage_url" t.string "api_url" - t.integer "default_lisence_id" + t.integer "default_license_id", :default => 0, :null => false t.datetime "crowled_at" t.datetime "created_at" t.datetime "updated_at" @@ -51,28 +52,12 @@ ActiveRecord::Schema.define(:version => 20120102071851) do create_table "authors", :force => true do |t| t.string "name" - t.string "email", :default => "", :null => false - t.string "encrypted_password", :limit => 128, :default => "", :null => false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", :default => 0 - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.string "authentication_token" - t.string "confirmation_token" - t.datetime "confirmed_at" - t.datetime "confirmation_sent_at" + t.integer "user_id", :default => 0, :null => false t.datetime "created_at" t.datetime "updated_at" end - add_index "authors", ["authentication_token"], :name => "index_authors_on_authentication_token", :unique => true - add_index "authors", ["confirmation_token"], :name => "index_authors_on_confirmation_token", :unique => true - add_index "authors", ["email"], :name => "index_authors_on_email", :unique => true - add_index "authors", ["reset_password_token"], :name => "index_authors_on_reset_password_token", :unique => true + add_index "authors", ["user_id"], :name => "index_authors_on_user_id", :unique => true create_table "balloon_templates", :force => true do |t| t.integer "speach_balloon_id", :null => false @@ -110,20 +95,20 @@ ActiveRecord::Schema.define(:version => 20120102071851) do add_index "balloons", ["panel_id"], :name => "index_balloons_on_panel_id" create_table "comics", :force => true do |t| - t.string "title" - t.integer "width", :default => 200, :null => false - t.integer "height", :default => 80, :null => false - t.integer "visible", :default => 0, :null => false - t.integer "editable", :default => 0, :null => false - t.integer "author_id" + t.string "title", :limit => 100, :null => false + t.integer "width", :null => false + t.integer "height", :null => false + t.integer "visible", :default => 0, :null => false + t.integer "editable", :default => 0, :null => false + t.integer "author_id", :null => false t.datetime "created_at" t.datetime "updated_at" end add_index "comics", ["author_id"], :name => "index_comics_on_author_id" - create_table "common_lisences", :force => true do |t| - t.integer "lisence_id", :null => false + create_table "common_licenses", :force => true do |t| + t.integer "license_id", :null => false t.string "name", :null => false t.string "url", :null => false t.integer "cc_by", :default => 0, :null => false @@ -138,7 +123,7 @@ ActiveRecord::Schema.define(:version => 20120102071851) do t.datetime "updated_at" end - create_table "lisences", :force => true do |t| + create_table "licenses", :force => true do |t| t.string "name", :null => false t.string "url", :null => false t.integer "cc_by", :default => 0, :null => false @@ -153,11 +138,11 @@ ActiveRecord::Schema.define(:version => 20120102071851) do t.datetime "updated_at" end - add_index "lisences", ["url"], :name => "index_lisences_on_url", :unique => true + add_index "licenses", ["url"], :name => "index_licenses_on_url", :unique => true - create_table "original_lisences", :force => true do |t| + create_table "original_licenses", :force => true do |t| t.integer "artist_id", :null => false - t.integer "lisence_id", :null => false + t.integer "license_id", :null => false t.string "name", :null => false t.string "url", :null => false t.integer "cc_by", :default => 0, :null => false @@ -173,12 +158,12 @@ ActiveRecord::Schema.define(:version => 20120102071851) do end create_table "original_pictures", :force => true do |t| - t.string "ext", :null => false - t.integer "width", :null => false - t.integer "height", :null => false - t.integer "filesize", :null => false - t.integer "artist_id" - t.integer "lisence_id" + t.string "ext", :null => false + t.integer "width", :null => false + t.integer "height", :null => false + t.integer "filesize", :null => false + t.integer "artist_id", :default => 0, :null => false + t.integer "license_id", :default => 0, :null => false t.datetime "created_at" t.datetime "updated_at" end @@ -188,15 +173,13 @@ ActiveRecord::Schema.define(:version => 20120102071851) do create_table "panel_pictures", :force => true do |t| t.integer "panel_id", :null => false t.integer "resource_picture_id", :null => false - t.string "url", :limit => 200 + t.string "link", :limit => 200 t.integer "x", :null => false t.integer "y", :null => false t.integer "z", :null => false t.integer "t", :default => 1, :null => false t.integer "width", :null => false t.integer "height", :null => false - t.integer "flipv", :default => 0, :null => false - t.integer "fliph", :default => 0, :null => false t.datetime "created_at" t.datetime "updated_at" end @@ -222,13 +205,13 @@ ActiveRecord::Schema.define(:version => 20120102071851) do add_index "panels", ["comic_id", "t"], :name => "panels_idt", :unique => true create_table "resource_pictures", :force => true do |t| - t.string "ext", :null => false - t.integer "width", :null => false - t.integer "height", :null => false - t.integer "filesize", :null => false - t.integer "artist_id" - t.integer "lisence_id" - t.integer "original_picture_id", :null => false + t.string "ext", :null => false + t.integer "width", :null => false + t.integer "height", :null => false + t.integer "filesize", :null => false + t.integer "artist_id", :default => 0, :null => false + t.integer "license_id", :default => 0, :null => false + t.integer "original_picture_id", :null => false t.datetime "created_at" t.datetime "updated_at" end @@ -258,13 +241,14 @@ ActiveRecord::Schema.define(:version => 20120102071851) do add_index "speach_templates", ["balloon_template_id", "t"], :name => "speach_templates_idt", :unique => true create_table "speaches", :force => true do |t| - t.integer "balloon_id", :null => false + t.integer "balloon_id", :null => false + t.integer "speach_template_id", :null => false t.string "content" - t.integer "x", :null => false - t.integer "y", :null => false - t.integer "t", :default => 1, :null => false - t.integer "width", :null => false - t.integer "height", :null => false + t.integer "x", :null => false + t.integer "y", :null => false + t.integer "t", :default => 1, :null => false + t.integer "width", :null => false + t.integer "height", :null => false t.datetime "created_at" t.datetime "updated_at" end @@ -281,4 +265,28 @@ ActiveRecord::Schema.define(:version => 20120102071851) do t.datetime "updated_at" end + create_table "users", :force => true do |t| + t.string "email", :default => "", :null => false + t.string "encrypted_password", :limit => 128, :default => "", :null => false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", :default => 0 + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.string "authentication_token" + t.string "confirmation_token" + t.datetime "confirmed_at" + t.datetime "confirmation_sent_at" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true + add_index "users", ["confirmation_token"], :name => "index_users_on_confirmation_token", :unique => true + add_index "users", ["email"], :name => "index_users_on_email", :unique => true + add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true + end