Migrate over from a raw pdo to a db abstraction layer

Author: kormoc

buildDocJs.php

@@ -5,10 +5,7 @@
 	$cnt = 0;
 
 	try {
-		$query = $dbh->prepare('SELECT COUNT(0) FROM mysql.help_topic');
-		$query->execute();
-		list($cnt) = $query->fetch(PDO::FETCH_NUM);
-		unset($query);
+		$cnt = Database::find('review')->query_col('SELECT COUNT(0) FROM mysql.help_topic');
 	}
 	catch (exception $e) {}
 
@@ -23,10 +20,8 @@
 
 	$fp = fopen('js/docData.js', 'w+');
 	fputs($fp, "var help_topic = {\n");
-	
-	$query = $dbh->prepare("SELECT LOWER(name), url FROM mysql.help_topic WHERE name NOT LIKE '% %' AND LENGTH(url) > 0");
-	$query->execute();
-	while ($row = $query->fetch(PDO::FETCH_NUM)) {
+	$res = Database::find('review')->query("SELECT LOWER(name), url FROM mysql.help_topic WHERE name NOT LIKE '% %' AND LENGTH(url) > 0");
+	while ($row = $res->fetch_row()) {
 		list($name, $url) = $row;
 		fputs($fp, "    '{$name}' : '{$url}', \n");
 	}

explain.php

@@ -4,16 +4,15 @@
 	require_once('init.php');
 
 	$return = array();
-
-	$query = $dbh->prepare('SELECT review.sample
-                              FROM '.$reviewhost['review_table'].' AS review
-                             WHERE review.checksum = ?
-                          GROUP BY review.checksum
-                        ');
-    $query->execute(array($_REQUEST['checksum']));
-    $reviewData = $query->fetch(PDO::FETCH_ASSOC);
 
-	$Query = new QueryRewrite($reviewData['sample']);
+	$query = Database::find('review')->query_col('SELECT review.sample
+                              FROM '.Database::escapeField($reviewhost['review_table']).' AS review
+                             WHERE review.checksum = ?
+                          GROUP BY review.checksum',
+						  $_REQUEST['checksum']
+						  );
+
+	$Query = new QueryRewrite($query);
 	$sample = $Query->asExtendedExplain();
 
 	if (is_null($sample)) {
@@ -22,14 +21,14 @@
 	else {
 		list($label, $database) = explode('.', $_REQUEST['explainDb']);
 		$host = $explainhosts[$label];
-		$ebh = new PDO($host['dsn'], $host['user'], $host['password']);
-	
-		$query = $ebh->prepare("USE $database");
-		$query->execute();
+		Database::connect(null, $host['user'], $host['password'], null, null, 'pdo', array('dsn' => $host['dsn']), $label);
+		Database::find($label)->query('USE '.Database::escapeField($database));
 
-		$query = $ebh->prepare($sample);
-		$query->execute();
-		while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
+		Database::find($label)->disable_fatal_errors();
+		$query = Database::find($label)->query($sample);
+		Database::find($label)->enable_fatal_errors();
+		
+		while ($row = $query->fetch_assoc()) {
 			$row['possible_keys'] = str_replace(',', ', ', $row['possible_keys']);
 			$row['ref'] = str_replace(',', ', ', $row['ref']);
 			$row['Extra'] = str_replace(array('Using ', ';'), array('', ', '), $row['Extra']);
@@ -41,16 +40,13 @@
 
 			$return['Explain'][] = $row;
 		}
-		$query->closeCursor();
-		$query = $ebh->prepare('SHOW WARNINGS');
-		$query->execute();
-		while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
+		$query = Database::find($label)->query('SHOW WARNINGS');
+		while ($row = $query->fetch_assoc()) {
 			if ($row['Code'] == 1003)
 				$return['Query'] = str_replace(',', ', ', $row['Message']);
 			else
 				$return['Warnings'][] = $row;
 		}
-		$query->closeCursor();
 
 		if (array_key_exists('Query', $return)) {
 			$return['Query'] = preg_replace("/`([-_a-zA-Z0-9]+)`\.`([-_a-zA-Z0-9]+)`\.`([-_a-zA-Z0-9]+)`/U",

index.php

@@ -1,15 +1,13 @@
 <?php
     require_once('init.php');
 
-
-    $users = $dbh->query('SELECT DISTINCT IFNULL(reviewed_by, "") FROM '.$reviewhost['review_table']);
+	$users = Database::find('review')->query('SELECT DISTINCT IFNULL(reviewed_by, "") FROM '.Database::escapeField($reviewhost['review_table']));
     $Reviewers = "[ 'None' ";
-    while($user = $users->fetchColumn())
+    while($user = $users->fetch_col())
         $Reviewers .= ",'$user' ";
     $Reviewers .= " ]";
     unset($users);
 
-
 	require_once('templates/header.php');
 ?>
 

init.php

@@ -5,7 +5,10 @@
     $settings['sqlColor'] = true;
 
 	require_once('config.php');
+	require_once('libs/Database/Database.php');
+	Database::connect(null, $reviewhost['user'], $reviewhost['password'], null, null, 'pdo', array('dsn' => $reviewhost['dsn']), 'review');
 
+// Needed for SqlParser
 	$dbh = new PDO($reviewhost['dsn'], $reviewhost['user'], $reviewhost['password']);
 
     require_once('libs/sqlquery/SqlParser.php');