fix setup_database, add issue, issue_message table ・ 6a91037 ・ Gitprep

+51 -27

setup_database

@@ -152,67 +152,91 @@ EOS
     die $error;
   }
 
-  # Create pull_request table
+  # Create issue table
   eval {
     my $sql = <<"EOS";
-create table pull_request (
+create table issue (
   row_id integer primary key autoincrement,
-  base_project integer not null default 0,
-  base_branch not null default '',
-  target_project integer not null default 0,
-  target_branch not null default '',
-  unique(base_project, base_branch, target_project, target_branch)
 );
 EOS
     $dbi->execute($sql);
   };
   
-  # Create pull_request columns
-  my @pull_request_columns = (
+  # Create issue columns
+  my @issue_columns = (
     "title not null default ''",
     "open integer default 0",
     "open_time integer default 0",
-    "open_user integer default 0"
+    "open_user integer default 0",
+    "pull_request integer default 0"
   );
-  for my $column (@pull_request_columns) {
-    eval { $dbi->execute("alter table pull_request add column $column") };
+  for my $column (@issue_columns) {
+    eval { $dbi->execute("alter table issue add column $column") };
   }
 
-  # Check pull_request table
-  eval { $dbi->select([qw/row_id base_project base_branch target_project target_branch title open open_time open_user/], table => 'pull_request') };
+  # Check issue table
+  eval { $dbi->select([qw/row_id title open open_time open_user pull_request/], table => 'issue') };
   if ($@) {
-    my $error = "Can't create pull_request table properly: $@";
+    my $error = "Can't create issue table properly: $@";
     die $error;
   }
-
-  # Create pull_request_message table
+  
+  # Create issue_message table
   eval {
     my $sql = <<"EOS";
-create table pull_request_message (
+create table issue_message (
   row_id integer primary key autoincrement,
-  pull_request integer not null default 0,
+  issue integer not null default 0,
   number integer not null default 0,
-  unique(pull_request, number)
+  unique(issue, number)
 );
 EOS
     $dbi->execute($sql);
   };
   
-  # Create pull_request_message columns
-  my @pull_request_message_columns = (
+  # Create issue_message columns
+  my @issue_message_columns = (
     "message not null default ''",
     "create_time integer default 0",
     "update_time integer default 0",
     "user integer not null default 0"
   );
-  for my $column (@pull_request_message_columns) {
-    eval { $dbi->execute("alter table pull_request_message add column $column") };
+  for my $column (@issue_message_columns) {
+    eval { $dbi->execute("alter table issue_message add column $column") };
+  }
+
+  # Check issue_message table
+  eval { $dbi->select([qw/row_id issue number message create_time update_time user/], table => 'issue_message') };
+  if ($@) {
+    my $error = "Can't create issue_message table properly: $@";
+    die $error;
+  }
+
+  # Create pull_request table
+  eval {
+    my $sql = <<"EOS";
+create table pull_request (
+  row_id integer primary key autoincrement,
+  base_project integer not null default 0,
+  base_branch not null default '',
+  target_project integer not null default 0,
+  target_branch not null default '',
+  unique(base_project, base_branch, target_project, target_branch)
+);
+EOS
+    $dbi->execute($sql);
+  };
+  
+  # Create pull_request columns
+  my @pull_request_columns = ();
+  for my $column (@pull_request_columns) {
+    eval { $dbi->execute("alter table pull_request add column $column") };
   }
 
-  # Check pull_request_message table
-  eval { $dbi->select([qw/row_id pull_request number message create_time update_time user/], table => 'pull_request_message') };
+  # Check pull_request table
+  eval { $dbi->select([qw/row_id base_project base_branch target_project target_branch/], table => 'pull_request') };
   if ($@) {
-    my $error = "Can't create pull_request_message table properly: $@";
+    my $error = "Can't create pull_request table properly: $@";
     die $error;
   }
 }

...	...	@@ -152,67 +152,91 @@ EOS
152	152	die $error;
153	153	}
154	154
155		- # Create pull_request table
	155	+ # Create issue table
156	156	eval {
157	157	my $sql = <<"EOS";
158		-create table pull_request (
	158	+create table issue (
159	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	160	);
166	161	EOS
167	162	$dbi->execute($sql);
168	163	};
169	164
170		- # Create pull_request columns
171		- my @pull_request_columns = (
	165	+ # Create issue columns
	166	+ my @issue_columns = (
172	167	"title not null default ''",
173	168	"open integer default 0",
174	169	"open_time integer default 0",
175		- "open_user integer default 0"
	170	+ "open_user integer default 0",
	171	+ "pull_request integer default 0"
176	172	);
177		- for my $column (@pull_request_columns) {
178		- eval { $dbi->execute("alter table pull_request add column $column") };
	173	+ for my $column (@issue_columns) {
	174	+ eval { $dbi->execute("alter table issue add column $column") };
179	175	}
180	176
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') };
	177	+ # Check issue table
	178	+ eval { $dbi->select([qw/row_id title open open_time open_user pull_request/], table => 'issue') };
183	179	if ($@) {
184		- my $error = "Can't create pull_request table properly: $@";
	180	+ my $error = "Can't create issue table properly: $@";
185	181	die $error;
186	182	}
187		-
188		- # Create pull_request_message table
	183	+
	184	+ # Create issue_message table
189	185	eval {
190	186	my $sql = <<"EOS";
191		-create table pull_request_message (
	187	+create table issue_message (
192	188	row_id integer primary key autoincrement,
193		- pull_request integer not null default 0,
	189	+ issue integer not null default 0,
194	190	number integer not null default 0,
195		- unique(pull_request, number)
	191	+ unique(issue, number)
196	192	);
197	193	EOS
198	194	$dbi->execute($sql);
199	195	};
200	196
201		- # Create pull_request_message columns
202		- my @pull_request_message_columns = (
	197	+ # Create issue_message columns
	198	+ my @issue_message_columns = (
203	199	"message not null default ''",
204	200	"create_time integer default 0",
205	201	"update_time integer default 0",
206	202	"user integer not null default 0"
207	203	);
208		- for my $column (@pull_request_message_columns) {
209		- eval { $dbi->execute("alter table pull_request_message add column $column") };
	204	+ for my $column (@issue_message_columns) {
	205	+ eval { $dbi->execute("alter table issue_message add column $column") };
	206	+ }
	207	+
	208	+ # Check issue_message table
	209	+ eval { $dbi->select([qw/row_id issue number message create_time update_time user/], table => 'issue_message') };
	210	+ if ($@) {
	211	+ my $error = "Can't create issue_message table properly: $@";
	212	+ die $error;
	213	+ }
	214	+
	215	+ # Create pull_request table
	216	+ eval {
	217	+ my $sql = <<"EOS";
	218	+create table pull_request (
	219	+ row_id integer primary key autoincrement,
	220	+ base_project integer not null default 0,
	221	+ base_branch not null default '',
	222	+ target_project integer not null default 0,
	223	+ target_branch not null default '',
	224	+ unique(base_project, base_branch, target_project, target_branch)
	225	+);
	226	+EOS
	227	+ $dbi->execute($sql);
	228	+ };
	229	+
	230	+ # Create pull_request columns
	231	+ my @pull_request_columns = ();
	232	+ for my $column (@pull_request_columns) {
	233	+ eval { $dbi->execute("alter table pull_request add column $column") };
210	234	}
211	235
212		- # Check pull_request_message table
213		- eval { $dbi->select([qw/row_id pull_request number message create_time update_time user/], table => 'pull_request_message') };
	236	+ # Check pull_request table
	237	+ eval { $dbi->select([qw/row_id base_project base_branch target_project target_branch/], table => 'pull_request') };
214	238	if ($@) {
215		- my $error = "Can't create pull_request_message table properly: $@";
	239	+ my $error = "Can't create pull_request table properly: $@";
216	240	die $error;
217	241	}
218	242	}