add DB::sqleval() -- can be used with insert() and update() to inject raw sql stuff like NOW()

db.class.php

@@ -47,7 +47,7 @@ class DB
       if (DB::$dbName != '') $dbName = DB::$dbName;
       DB::$current_db = $dbName;
       $mysql = new mysqli(DB::$host, DB::$user, DB::$password, $dbName, DB::$port);
-      DB::queryNull("SET NAMES %s", DB::$encoding);
+      $mysql->set_charset(DB::$encoding);
     } 
     
     return $mysql;
@@ -133,7 +133,14 @@ class DB
     $buildquery = "UPDATE " . self::formatTableName($table) . " SET ";
     $keyval = array();
     foreach ($params as $key => $value) {
-      $keyval[] = "`" . $key . "`=" . (is_int($value) ? $value : "'" . DB::escape($value) . "'");
+      if (is_object($value) && ($value instanceof MeekroDBEval)) {
+        $value = $value->text;
+      } else {
+        if (is_array($value)) $value = serialize($value);
+        $value = (is_int($value) ? $value : "'" . DB::escape($value) . "'");
+      }
+      
+      $keyval[] = "`" . $key . "`=" . $value;
     }
     
     $buildquery = "UPDATE " . self::formatTableName($table) . " SET " . implode(', ', $keyval) . " WHERE " . $where;
@@ -146,8 +153,12 @@ class DB
     $keys_str = implode(', ', DB::wrapStr(array_keys($data), '`'));
     
     foreach ($data as &$datum) {
-      if (is_array($datum)) $datum = serialize($datum);
-      $datum = "'" . DB::escape($datum) . "'";
+      if (is_object($datum) && ($datum instanceof MeekroDBEval)) { 
+        $datum = $datum->text;
+      } else {
+        if (is_array($datum)) $datum = serialize($datum);
+        $datum = (is_int($datum) ? $datum : "'" . DB::escape($datum) . "'");
+      }
     }
     $values_str = implode(', ', array_values($data));
     
@@ -164,6 +175,10 @@ class DB
     return DB::insertOrReplace('REPLACE', $table, $data);
   }
   
+  public static function sqleval($text) {
+    return new MeekroDBEval($text);
+  }
+  
   public static function columnList($table) {
     return DB::queryOneColumn('Field', "SHOW COLUMNS FROM $table");
   }
@@ -361,6 +376,26 @@ class DB
     return $result;
   }
   
+  public static function queryAllArrays() {
+    $args = func_get_args();
+    
+    $query = call_user_func_array('DB::queryUnbuf', $args);
+    $result = DB::fetchAllArrays($query);
+    DB::freeResult($query);
+    DB::$num_rows = count($result);
+    
+    return $result;
+  }
+  
+  public static function queryOneList() { $args = func_get_args(); return call_user_func_array('DB::queryFirstList', $args); }
+  public static function queryFirstList() {
+    $args = func_get_args();
+    $query = call_user_func_array('DB::queryUnbuf', $args);
+    $result = DB::fetchArray($query);
+    DB::freeResult($query);
+    return $result;
+  }
+  
   public static function queryOneRow() { $args = func_get_args(); return call_user_func_array('DB::queryFirstRow', $args); }
   public static function queryFirstRow() {
     $args = func_get_args();
@@ -371,7 +406,20 @@ class DB
   }
   
   
-  public static function queryFirstColumn() { $args = func_get_args(); return DB::prependCall('DB::queryOneColumn', $args, null); }
+  public static function queryFirstColumn() { 
+    $args = func_get_args();
+    $results = call_user_func_array('DB::queryAllArrays', $args);
+    $ret = array();
+    
+    if (!count($results) || !count($results[0])) return $ret;
+    
+    foreach ($results as $row) {
+      $ret[] = $row[0];
+    }
+    
+    return $ret;
+  }
+  
   public static function queryOneColumn() {
     $args = func_get_args();
     $column = array_shift($args);
@@ -391,7 +439,13 @@ class DB
     return $ret;
   }
   
-  public static function queryFirstField() { $args = func_get_args(); return DB::prependCall('DB::queryOneField', $args, null); }
+  public static function queryFirstField() { 
+    $args = func_get_args();
+    $row = call_user_func_array('DB::queryFirstList', $args);
+    if ($row == null) return null;    
+    return $row[0];
+  }
+  
   public static function queryOneField() {
     $args = func_get_args();
     $column = array_shift($args);
@@ -431,6 +485,22 @@ class DB
     }
     return $A;
   }
+  
+  public static function fetchArray($result = null) {
+    if ($result === null) $result = DB::$queryResult;
+    if (! ($result instanceof MySQLi_Result)) return null;
+    return $result->fetch_row();
+  }
+  
+  public static function fetchAllArrays($result = null) {
+    $A = array();
+    while ($row = DB::fetchArray($result)) {
+      $A[] = $row;
+    }
+    return $A;
+  }
+  
+  
 }
 
 class WhereClause {
@@ -547,4 +617,12 @@ function meekrodb_debugmode_handler($params) {
   }
 }
 
+class MeekroDBEval {
+  public $text = '';
+  
+  function __construct($text) {
+    $this->text = $text;
+  }
+}
+
 ?>

simpletest/BasicTest.php

@@ -97,6 +97,16 @@ class BasicTest extends SimpleTest {
     $charlie_password = DB::queryOneField('password', "SELECT * FROM accounts WHERE username IN %ls AND username = %s", 
       array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
     $this->assert($charlie_password === 'goodbye');
+    
+    $passwords = DB::queryFirstColumn("SELECT password FROM accounts WHERE username=%s", 'Bart');
+    $this->assert(count($passwords) === 1);
+    $this->assert($passwords[0] === 'hello');
+    
+    $username = $password = $age = null;
+    list($age, $username, $password) = DB::queryOneList("SELECT age,username,password FROM accounts WHERE username=%s", 'Bart');
+    $this->assert($username === 'Bart');
+    $this->assert($password === 'hello');
+    $this->assert($age == 15);
   }
   
   function test_4_query() {
@@ -108,6 +118,29 @@ class BasicTest extends SimpleTest {
     $this->assert(count($results) === 2);
   }
   
+  function test_4_1_query() {
+    DB::insert('accounts', array(
+      'username' => 'newguy',
+      'password' => DB::sqleval("REPEAT('blah', 3)"),
+      'age' => 172,
+      'height' => 111.15
+    ));
+    
+    $row = DB::queryOneRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
+    $this->assert($row['username'] === 'newguy');
+    
+    DB::update('accounts', array(
+      'password' => DB::sqleval("REPEAT('blah', 4)"),
+      ), 'username=%s', 'newguy');
+    
+    $row = null;
+    $row = DB::queryOneRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
+    $this->assert($row['password'] === 'blahblahblahblah');
+    
+    DB::query("DELETE FROM accounts WHERE password=%s", 'blahblahblahblah');
+    $this->assert(DB::affectedRows() === 1);
+  }
+  
   function test_5_error_handler() {
     global $error_callback_worked;