Download as
Browse Code »

Commit 0b4f4fe157828430eb7b7a0d88c022d72fa01637

Authored by Andrew8xx8
1 parent 1644117a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Migrations for StateMachine refactoring added

Showing 8 changed files with 69 additions and 19 deletions   Show diff stats
db/migrate/20130214153504_rename_closed_to_state_in_issue.rb 0 → 100644
  Diff comments   View file @0b4f4fe
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +class RenameClosedToStateInIssue < ActiveRecord::Migration
  2 + def change
  3 + rename_column :issues, :closed, :state
  4 + end
  5 +end
db/migrate/20130214153809_change_state_type_in_issue.rb 0 → 100644
  Diff comments   View file @0b4f4fe
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class ChangeStateTypeInIssue < ActiveRecord::Migration
  2 + def up
  3 + change_column :issues, :state, :string
  4 + end
  5 +
  6 + def down
  7 + change_column :issues, :state, :boolean
  8 + end
  9 +end
db/migrate/20130214154847_rename_closed_to_state_in_merge_request.rb 0 → 100644
  Diff comments   View file @0b4f4fe
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +class RenameClosedToStateInMergeRequest < ActiveRecord::Migration
  2 + def change
  3 + rename_column :merge_requests, :closed, :state
  4 + end
  5 +end
db/migrate/20130214155334_change_state_type_in_merge_request.rb 0 → 100644
  Diff comments   View file @0b4f4fe
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class ChangeStateTypeInMergeRequest < ActiveRecord::Migration
  2 + def up
  3 + change_column :merge_requests, :state, :string
  4 + end
  5 +
  6 + def down
  7 + change_column :merge_requests, :state, :boolean
  8 + end
  9 +end
db/migrate/20130214155542_rename_closed_to_state_in_milestone.rb 0 → 100644
  Diff comments   View file @0b4f4fe
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +class RenameClosedToStateInMilestone < ActiveRecord::Migration
  2 + def change
  3 + rename_column :milestones, :closed, :state
  4 + end
  5 +end
db/migrate/20130214155632_change_state_type_in_milestone.rb 0 → 100644
  Diff comments   View file @0b4f4fe
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class ChangeStateTypeInMilestone < ActiveRecord::Migration
  2 + def up
  3 + change_column :milestones, :state, :string
  4 + end
  5 +
  6 + def down
  7 + change_column :milestones, :state, :boolean
  8 + end
  9 +end
db/migrate/20130218091244_remove_merged_from_merge_request.rb 0 → 100644
  Diff comments   View file @0b4f4fe
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class RemoveMergedFromMergeRequest < ActiveRecord::Migration
  2 + def up
  3 + remove_column :merge_requests, :merged
  4 + end
  5 +
  6 + def down
  7 + add_column :merge_requests, :merged, :boolean, default: true, null: false
  8 + end
  9 +end
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 # 11 #
12 # It's strongly recommended to check this file into your version control system. 12 # It's strongly recommended to check this file into your version control system.
13 13
14 -ActiveRecord::Schema.define(:version => 20130131070232) do 14 +ActiveRecord::Schema.define(:version => 20130218091244) do
15 15
16 create_table "events", :force => true do |t| 16 create_table "events", :force => true do |t|
17 t.string "target_type" 17 t.string "target_type"
@@ -37,9 +37,9 @@ ActiveRecord::Schema.define(:version =&gt; 20130131070232) do @@ -37,9 +37,9 @@ ActiveRecord::Schema.define(:version =&gt; 20130131070232) do
37 t.integer "assignee_id" 37 t.integer "assignee_id"
38 t.integer "author_id" 38 t.integer "author_id"
39 t.integer "project_id" 39 t.integer "project_id"
40 - t.datetime "created_at", :null => false  
41 - t.datetime "updated_at", :null => false  
42 - t.boolean "closed", :default => false, :null => false 40 + t.datetime "created_at", :null => false
  41 + t.datetime "updated_at", :null => false
  42 + t.string "state", :default => "0", :null => false
43 t.integer "position", :default => 0 43 t.integer "position", :default => 0
44 t.string "branch_name" 44 t.string "branch_name"
45 t.text "description" 45 t.text "description"
@@ -48,10 +48,10 @@ ActiveRecord::Schema.define(:version =&gt; 20130131070232) do @@ -48,10 +48,10 @@ ActiveRecord::Schema.define(:version =&gt; 20130131070232) do
48 48
49 add_index "issues", ["assignee_id"], :name => "index_issues_on_assignee_id" 49 add_index "issues", ["assignee_id"], :name => "index_issues_on_assignee_id"
50 add_index "issues", ["author_id"], :name => "index_issues_on_author_id" 50 add_index "issues", ["author_id"], :name => "index_issues_on_author_id"
51 - add_index "issues", ["closed"], :name => "index_issues_on_closed"  
52 add_index "issues", ["created_at"], :name => "index_issues_on_created_at" 51 add_index "issues", ["created_at"], :name => "index_issues_on_created_at"
53 add_index "issues", ["milestone_id"], :name => "index_issues_on_milestone_id" 52 add_index "issues", ["milestone_id"], :name => "index_issues_on_milestone_id"
54 add_index "issues", ["project_id"], :name => "index_issues_on_project_id" 53 add_index "issues", ["project_id"], :name => "index_issues_on_project_id"
  54 + add_index "issues", ["state"], :name => "index_issues_on_closed"
55 add_index "issues", ["title"], :name => "index_issues_on_title" 55 add_index "issues", ["title"], :name => "index_issues_on_title"
56 56
57 create_table "keys", :force => true do |t| 57 create_table "keys", :force => true do |t|
@@ -69,40 +69,39 @@ ActiveRecord::Schema.define(:version =&gt; 20130131070232) do @@ -69,40 +69,39 @@ ActiveRecord::Schema.define(:version =&gt; 20130131070232) do
69 add_index "keys", ["user_id"], :name => "index_keys_on_user_id" 69 add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
70 70
71 create_table "merge_requests", :force => true do |t| 71 create_table "merge_requests", :force => true do |t|
72 - t.string "target_branch", :null => false  
73 - t.string "source_branch", :null => false  
74 - t.integer "project_id", :null => false 72 + t.string "target_branch", :null => false
  73 + t.string "source_branch", :null => false
  74 + t.integer "project_id", :null => false
75 t.integer "author_id" 75 t.integer "author_id"
76 t.integer "assignee_id" 76 t.integer "assignee_id"
77 t.string "title" 77 t.string "title"
78 - t.boolean "closed", :default => false, :null => false  
79 - t.datetime "created_at", :null => false  
80 - t.datetime "updated_at", :null => false 78 + t.string "state", :default => "0", :null => false
  79 + t.datetime "created_at", :null => false
  80 + t.datetime "updated_at", :null => false
81 t.text "st_commits", :limit => 2147483647 81 t.text "st_commits", :limit => 2147483647
82 t.text "st_diffs", :limit => 2147483647 82 t.text "st_diffs", :limit => 2147483647
83 - t.boolean "merged", :default => false, :null => false  
84 - t.integer "state", :default => 1, :null => false 83 + t.integer "merge_status", :default => 1, :null => false
85 t.integer "milestone_id" 84 t.integer "milestone_id"
86 end 85 end
87 86
88 add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id" 87 add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
89 add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id" 88 add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
90 - add_index "merge_requests", ["closed"], :name => "index_merge_requests_on_closed"  
91 add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at" 89 add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
92 add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id" 90 add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
93 add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id" 91 add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"
94 add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch" 92 add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
  93 + add_index "merge_requests", ["state"], :name => "index_merge_requests_on_closed"
95 add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch" 94 add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
96 add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title" 95 add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
97 96
98 create_table "milestones", :force => true do |t| 97 create_table "milestones", :force => true do |t|
99 - t.string "title", :null => false  
100 - t.integer "project_id", :null => false 98 + t.string "title", :null => false
  99 + t.integer "project_id", :null => false
101 t.text "description" 100 t.text "description"
102 t.date "due_date" 101 t.date "due_date"
103 - t.boolean "closed", :default => false, :null => false  
104 - t.datetime "created_at", :null => false  
105 - t.datetime "updated_at", :null => false 102 + t.string "state", :default => "0", :null => false
  103 + t.datetime "created_at", :null => false
  104 + t.datetime "updated_at", :null => false
106 end 105 end
107 106
108 add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date" 107 add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"