Download as
Browse Code »

Commit 9cd867163dc935789dcc560d930d7f410098c504

Authored by Braulio Bhavamitra
1 parent cb068077
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Update schema.rb

Showing 1 changed file with 12 additions and 0 deletions   Show diff stats
@@ -104,6 +104,7 @@ ActiveRecord::Schema.define(:version => 20150122165042) do @@ -104,6 +104,7 @@ ActiveRecord::Schema.define(:version => 20150122165042) do
104 add_index "article_versions", ["path", "profile_id"], :name => "index_article_versions_on_path_and_profile_id" 104 add_index "article_versions", ["path", "profile_id"], :name => "index_article_versions_on_path_and_profile_id"
105 add_index "article_versions", ["path"], :name => "index_article_versions_on_path" 105 add_index "article_versions", ["path"], :name => "index_article_versions_on_path"
106 add_index "article_versions", ["published_at", "id"], :name => "index_article_versions_on_published_at_and_id" 106 add_index "article_versions", ["published_at", "id"], :name => "index_article_versions_on_published_at_and_id"
  107 + add_index "article_versions", ["parent_id"], :name => "index_article_versions_on_parent_id"
107 108
108 create_table "articles", :force => true do |t| 109 create_table "articles", :force => true do |t|
109 t.string "name" 110 t.string "name"
@@ -220,6 +221,8 @@ ActiveRecord::Schema.define(:version => 20150122165042) do @@ -220,6 +221,8 @@ ActiveRecord::Schema.define(:version => 20150122165042) do
220 t.text "ancestry" 221 t.text "ancestry"
221 end 222 end
222 223
  224 + add_index "categories", ["parent_id"], :name => "index_categories_on_parent_id"
  225 +
223 create_table "categories_profiles", :id => false, :force => true do |t| 226 create_table "categories_profiles", :id => false, :force => true do |t|
224 t.integer "profile_id" 227 t.integer "profile_id"
225 t.integer "category_id" 228 t.integer "category_id"
@@ -252,6 +255,7 @@ ActiveRecord::Schema.define(:version => 20150122165042) do @@ -252,6 +255,7 @@ ActiveRecord::Schema.define(:version => 20150122165042) do
252 t.string "source_type" 255 t.string "source_type"
253 t.string "user_agent" 256 t.string "user_agent"
254 t.string "referrer" 257 t.string "referrer"
  258 + t.integer "group_id"
255 end 259 end
256 260
257 add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam" 261 add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
@@ -358,6 +362,8 @@ ActiveRecord::Schema.define(:version => 20150122165042) do @@ -358,6 +362,8 @@ ActiveRecord::Schema.define(:version => 20150122165042) do
358 t.boolean "thumbnails_processed", :default => false 362 t.boolean "thumbnails_processed", :default => false
359 end 363 end
360 364
  365 + add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
  366 +
361 create_table "inputs", :force => true do |t| 367 create_table "inputs", :force => true do |t|
362 t.integer "product_id", :null => false 368 t.integer "product_id", :null => false
363 t.integer "product_category_id", :null => false 369 t.integer "product_category_id", :null => false
@@ -601,7 +607,11 @@ ActiveRecord::Schema.define(:version => 20150122165042) do @@ -601,7 +607,11 @@ ActiveRecord::Schema.define(:version => 20150122165042) do
601 t.boolean "pending", :default => false 607 t.boolean "pending", :default => false
602 end 608 end
603 609
  610 +<<<<<<< HEAD
604 add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true 611 add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true
  612 +=======
  613 + add_index "tags", ["parent_id"], :name => "index_tags_on_parent_id"
  614 +>>>>>>> Update schema.rb
605 615
606 create_table "tasks", :force => true do |t| 616 create_table "tasks", :force => true do |t|
607 t.text "data" 617 t.text "data"
@@ -641,6 +651,8 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do @@ -641,6 +651,8 @@ ActiveRecord::Schema.define(:version =&gt; 20150122165042) do
641 t.string "thumbnail" 651 t.string "thumbnail"
642 end 652 end
643 653
  654 + add_index "thumbnails", ["parent_id"], :name => "index_thumbnails_on_parent_id"
  655 +
644 create_table "units", :force => true do |t| 656 create_table "units", :force => true do |t|
645 t.string "singular", :null => false 657 t.string "singular", :null => false
646 t.string "plural", :null => false 658 t.string "plural", :null => false