Showing 1 changed files with 33 additions and 33 deletions
+33 -33
setup_database
... ...
@@ -152,39 +152,6 @@ EOS
152 152
     die $error;
153 153
   }
154 154
 
155
-  # Create pull_request table
156
-  eval {
157
-    my $sql = <<"EOS";
158
-create table pull_request (
159
-  row_id integer primary key autoincrement,
160
-  base_project integer not null default 0,
161
-  base_branch not null default '',
162
-  target_project integer not null default 0,
163
-  target_branch not null default '',
164
-  unique(base_project, base_branch, target_project, target_branch)
165
-);
166
-EOS
167
-    $dbi->execute($sql);
168
-  };
169
-  
170
-  # Create pull_request columns
171
-  my @pull_request_columns = (
172
-    "title not null default ''",
173
-    "open integer default 0",
174
-    "open_time integer default 0",
175
-    "open_user integer default 0"
176
-  );
177
-  for my $column (@pull_request_columns) {
178
-    eval { $dbi->execute("alter table pull_request add column $column") };
179
-  }
180
-
181
-  # Check pull_request table
182
-  eval { $dbi->select([qw/row_id base_project base_branch target_project target_branch title open open_time open_user/], table => 'pull_request') };
183
-  if ($@) {
184
-    my $error = "Can't create pull_request table properly: $@";
185
-    die $error;
186
-  }
187
-
188 155
   # Rename pull_request_message to issue_message
189 156
   eval {
190 157
     my $sql = <<"EOS";
... ...
@@ -223,4 +190,37 @@ EOS
223 190
     my $error = "Can't create issue_message table properly: $@";
224 191
     die $error;
225 192
   }
193
+
194
+  # Create pull_request table
195
+  eval {
196
+    my $sql = <<"EOS";
197
+create table pull_request (
198
+  row_id integer primary key autoincrement,
199
+  base_project integer not null default 0,
200
+  base_branch not null default '',
201
+  target_project integer not null default 0,
202
+  target_branch not null default '',
203
+  unique(base_project, base_branch, target_project, target_branch)
204
+);
205
+EOS
206
+    $dbi->execute($sql);
207
+  };
208
+  
209
+  # Create pull_request columns
210
+  my @pull_request_columns = (
211
+    "title not null default ''",
212
+    "open integer default 0",
213
+    "open_time integer default 0",
214
+    "open_user integer default 0"
215
+  );
216
+  for my $column (@pull_request_columns) {
217
+    eval { $dbi->execute("alter table pull_request add column $column") };
218
+  }
219
+
220
+  # Check pull_request table
221
+  eval { $dbi->select([qw/row_id base_project base_branch target_project target_branch title open open_time open_user/], table => 'pull_request') };
222
+  if ($@) {
223
+    my $error = "Can't create pull_request table properly: $@";
224
+    die $error;
225
+  }
226 226
 }