From 8b2e3262fe30902e771fadc378968ba909ab98d9 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 1 Jan 2011 15:27:24 +0000
Subject: [PATCH] clean up database API for completeness and sensibleness

---
 core/database.class.php | 52 ++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/core/database.class.php b/core/database.class.php
index 373e74a6..a02132d8 100644
--- a/core/database.class.php
+++ b/core/database.class.php
@@ -313,31 +313,61 @@ class Database {
 	 * Execute an SQL query and return an PDO resultset
 	 */
 	public function execute($query, $args=array()) {
-		$result = $this->db->query($query, $args);
-		return $result;
+		try {
+			$stmt = $this->db->prepare($query);
+			foreach($args as $name=>$value) {
+				if(is_numeric($value)) {
+					$stmt->bindValue(":$name", $value, PDO::PARAM_INT);
+				}
+				else {
+					$stmt->bindValue(":$name", $value, PDO::PARAM_STR);
+				}
+			}
+			$stmt->execute();
+			return $stmt;
+		}
+		catch(PDOException $pdoe) {
+			print "Message: ".$pdoe->getMessage();
+			print "<p>Error: $query";
+			exit;
+		}
 	}
 
 	/**
 	 * Execute an SQL query and return a 2D array
 	 */
 	public function get_all($query, $args=array()) {
-		$result = $this->db->query($query, $args)->fetchAll();
-		return $result;
+		return $this->execute($query, $args)->fetchAll();
 	}
 
 	/**
 	 * Execute an SQL query and return a single row
 	 */
 	public function get_row($query, $args=array()) {
-		$result = $this->db->query($query, $args)->fetchAll();
-		if(count($result) == 0) {
-			return null;
-		}
-		else {
-			return $result[0];
-		}
+		return $this->execute($query, $args)->fetch();
 	}
 
+	/**
+	 * Execute an SQL query and return the first column of each row
+	 */
+	public function get_col($query, $args=array()) {
+		$stmt = $this->execute($query, $args);
+		$res = array();
+		foreach($stmt as $row) {
+			$res[] = $row[0];
+		}
+		return $res;
+	}
+
+	/**
+	 * Execute an SQL query and return a single value
+	 */
+	public function get_one($query, $args=array()) {
+		$row = $this->execute($query, $args)->fetch();
+		return $row[0];
+	}
+
+
 	/**
 	 * Create a table from pseudo-SQL
 	 */