Raw placeholder name, -forced LIMIT, +lastquery

safemysql.class.php

@@ -2,7 +2,9 @@
 
 class SafeMySQL
 {
-  private $conn;
+	public	$lastquery;
+
+	private $conn;
 	private $emode;
 	private $exname;
 
@@ -77,10 +79,6 @@ class SafeMySQL
 	public function getOne()
 	{
 		$query = $this->prepareQuery(func_get_args());
-		if ( !preg_match('~LIMIT\s+\d+\s*(,\s*\d+\s*)?$~', $query) )
-		{
-			$query .= " LIMIT 1";
-		}
 		if ($res = $this->rawQuery($query))
 		{
 			$row = $this->fetch($res);
@@ -95,11 +93,6 @@ class SafeMySQL
 	public function getRow()
 	{
 		$query = $this->prepareQuery(func_get_args());
-		if ( !preg_match('~LIMIT\s+\d+\s*(,\s*\d+\s*)?$~',$query) )
-		{
-			$query.= " LIMIT 1";
-		}
-
 		if ($res = $this->rawQuery($query)) {
 			$ret = $this->fetch($res);
 			$this->free($res);
@@ -204,7 +197,9 @@ class SafeMySQL
 		return $input;
 	}
 
-	private function rawQuery($query) {
+	private function rawQuery($query)
+	{
+		$this->lastquery = $query;
 		$res = mysqli_query($this->conn, $query) or $this->error(mysqli_error($this->conn).". Full query: [$query]");
 		return $res;
 	}
@@ -257,7 +252,7 @@ class SafeMySQL
 					$value = '?';
 					$qmarks++;
 					break;
-				case '?q':
+				case '?p':
 					break;
 				default:
 					$this->error("Unknown placeholder type ($pholder) in [$raw]");
@@ -265,7 +260,6 @@ class SafeMySQL
 			$query = substr_replace($query,$value,$offset,2);
 			$shift+= strlen($value) - strlen($pholder);
 		}
-		$this->lastquery = $query;
 		return $query;
 	}