com web/bugs: Rename table, a bit more consistent: include/clas ses/bug_ghpulltracker.php include/query.php sql/bugs .sql

Commit: 6710f40dbe3b9f13eb1bfde2397876b62888f988 Author: Johannes Schlüter <johannes@schlueters.de> Wed, 13 Feb 2013 02:55:06 +0100 Parents: 70d085f1e7c5bf5c1a41863c8227097a18b57ba6 Branches: master Link: http://git.php.net/?p=web/bugs.git;a=commitdiff;h=6710f40dbe3b9f13eb1bfde2397876b62888f988 Log: Rename table, a bit more consistent Changed paths: M include/classes/bug_ghpulltracker.php M include/query.php M sql/bugs.sql Diff: diff --git a/include/classes/bug_ghpulltracker.php b/include/classes/bug_ghpulltracker.php index 6461654..bf4c80d 100644 --- a/include/classes/bug_ghpulltracker.php +++ b/include/classes/bug_ghpulltracker.php @@ -28,7 +28,7 @@ class Bug_Pulltracker return PEAR::raiseError('Failed to retrieve pull request from GitHub'); } PEAR::pushErrorHandling(PEAR_ERROR_RETURN); - $e = $this->_dbh->prepare('INSERT INTO bugdb_github + $e = $this->_dbh->prepare('INSERT INTO bugdb_pulls (bugdb_id, github_repo, github_pull_id, github_title, github_html_url, developer) VALUES (?, ?, ?, ?, ?, ?)')->execute( array($bugid, $repo, $pull_id, $data->title, $data->html_url, $developer)); PEAR::popErrorHandling(); @@ -44,7 +44,7 @@ class Bug_Pulltracker */ function detach($bugid, $repo, $pull_id) { - $this->_dbh->prepare('DELETE FROM bugdb_github + $this->_dbh->prepare('DELETE FROM bugdb_pulls WHERE bugdb_id = ? and github_repo = ? and github_pull_id = ?')->execute( array($bugid, $repo, $pull_id)); } @@ -59,7 +59,7 @@ class Bug_Pulltracker { $query = ' SELECT github_repo, github_pull_id, github_title, github_html_url, developer - FROM bugdb_github + FROM bugdb_pulls WHERE bugdb_id = ? ORDER BY github_repo, github_pull_id DESC '; diff --git a/include/query.php b/include/query.php index cacf0ac..ec3c369 100644 --- a/include/query.php +++ b/include/query.php @@ -182,7 +182,7 @@ if (isset($_GET['cmd']) && $_GET['cmd'] == 'display') $where_clause .= " OR EXISTS (SELECT 1 FROM bugdb_patchtracker WHERE bugdb_id = bugdb.id LIMIT 1)"; } if ($pull != '') { - $where_clause .= " OR EXISTS (SELECT 1 FROM bugdb_github WHERE bugdb_id = bugdb.id LIMIT 1)"; + $where_clause .= " OR EXISTS (SELECT 1 FROM bugdb_pulls WHERE bugdb_id = bugdb.id LIMIT 1)"; } $where_clause .= ")"; diff --git a/sql/bugs.sql b/sql/bugs.sql index ce0cab1..e527af4 100644 --- a/sql/bugs.sql +++ b/sql/bugs.sql @@ -106,7 +106,7 @@ CREATE TABLE bugdb_votes ( samever int(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE bugdb_github ( +CREATE TABLE bugdb_pulls ( bugdb_id int(8) NOT NULL default '0', github_repo varchar(255) NOT NULL, github_pull_id int NOT NULL,