cleanup README, add note about $logfile

add lots more tests for that code

.gitignore

@@ -0,0 +1 @@
+simpletest/test_setup.php

LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.md

@@ -0,0 +1,167 @@
+MeekroDB -- The Simple PHP MySQL Library
+========
+Learn more: http://www.meekro.com
+
+MeekroDB is: 
+
+* A PHP MySQL library that lets you **get more done with fewer lines of code**, and **makes SQL injection 100% impossible**.
+* Google's #1 search result for "php mysql library" since 2013, with **thousands of deployments worldwide**.
+* A library with a **perfect security track record**. No bugs relating to security or SQL injection have ever been discovered.
+
+Installation
+========
+When you're ready to get started, see the [Quick Start Guide](http://www.meekro.com/quickstart.php) on our website.
+
+### Manual Setup
+Include the `db.class.php` file into your project and set it up like this:
+
+```php
+require_once 'db.class.php';
+DB::$user = 'my_database_user';
+DB::$password = 'my_database_password';
+DB::$dbName = 'my_database_name';
+```
+
+### Composer
+Add this to your `composer.json`
+
+```json
+{
+  "require": {
+    "sergeytsalkov/meekrodb": "*"
+  }
+}
+```
+
+Code Examples
+========
+### Grab some rows from the database and print out a field from each row.
+
+```php
+$accounts = DB::query("SELECT * FROM accounts WHERE type = %s AND age > %i", $type, 15);
+foreach ($accounts as $account) {
+  echo $account['username'] . "\n";
+}
+```
+
+
+
+### Insert a new row.
+
+```php
+DB::insert('mytable', array(
+  'name' => $name,
+  'rank' => $rank,
+  'location' => $location,
+  'age' => $age,
+  'intelligence' => $intelligence
+));
+```
+    
+### Grab one row or field
+
+```php
+$account = DB::queryFirstRow("SELECT * FROM accounts WHERE username=%s", 'Joe');
+$number_accounts = DB::queryFirstField("SELECT COUNT(*) FROM accounts");
+```
+
+### Use a list in a query
+```php
+DB::query("SELECT * FROM tbl WHERE name IN %ls AND age NOT IN %li", array('John', 'Bob'), array(12, 15));
+```
+
+### Log all queries and errors
+```php
+// log all queries and errors to file, or ..
+DB::$logfile = '/home/username/logfile.txt';
+
+// log all queries and errors to screen
+DB::$logfile = fopen('php://output', 'w');
+```
+
+### Nested Transactions
+```php
+DB::$nested_transactions = true;
+DB::startTransaction(); // outer transaction
+// .. some queries..
+$depth = DB::startTransaction(); // inner transaction
+echo $depth . 'transactions are currently active'; // 2
+ 
+// .. some queries..
+DB::commit(); // commit inner transaction
+// .. some queries..
+DB::commit(); // commit outer transaction
+```
+    
+### Lots More - See: http://meekro.com/docs
+
+    
+How is MeekroDB better than PDO?
+========
+### Optional Static Class Mode
+Most web apps will only ever talk to one database. This means that 
+passing $db objects to every function of your code just adds unnecessary clutter. 
+The simplest approach is to use static methods such as DB::query(), and that's how 
+MeekroDB works. Still, if you need database objects, MeekroDB can do that too.
+
+### Do more with fewer lines of code
+The code below escapes your parameters for safety, runs the query, and grabs 
+the first row of results. Try doing that in one line with PDO.
+
+```php
+$account = DB::queryFirstRow("SELECT * FROM accounts WHERE username=%s", 'Joe');
+```
+
+Or how about just one field?
+
+```php
+$created_at = DB::queryFirstField("SELECT created_at FROM accounts WHERE username=%s", 'Joe');
+```
+
+### Work with list parameters easily
+Using MySQL's IN keyword should not be hard. MeekroDB smooths out the syntax for you, 
+PDO does not.
+
+```php
+$accounts = DB::query("SELECT * FROM accounts WHERE username IN %ls", array('Joe', 'Frank'));
+```
+
+
+### Simple inserts
+Using MySQL's INSERT should not be more complicated than passing in an 
+associative array. MeekroDB also simplifies many related commands, including 
+the useful and bizarre INSERT .. ON DUPLICATE UPDATE command. PDO does none of this.
+
+```php
+DB::insert('accounts', array('username' => 'John', 'password' => 'whatever'));
+```
+
+### Nested transactions
+MySQL's SAVEPOINT commands lets you create nested transactions, but only 
+if you keep track of SAVEPOINT ids yourself. MeekroDB does this for you, 
+so you can have nested transactions with no complexity or learning curve.
+
+```php
+DB::$nested_transactions = true;
+DB::startTransaction(); // outer transaction
+// .. some queries..
+$depth = DB::startTransaction(); // inner transaction
+echo $depth . 'transactions are currently active'; // 2
+ 
+// .. some queries..
+DB::commit(); // commit inner transaction
+// .. some queries..
+DB::commit(); // commit outer transaction
+```
+
+### Flexible debug logging and error handling
+You can log all queries (and any errors they produce) to a file for debugging purposes. You can also add hooks that let you run your own functions at any point in the query handling process.
+
+
+My Other Projects
+========
+A little shameless self-promotion!
+
+  * [Ark Server Hosting](https://arkservers.io) -- Ark: Survival Evolved server hosting by ArkServers.io!
+  * [Best Minecraft Server Hosting](https://bestminecraft.org) -- Ranking and recommendations for minecraft server hosting!
+  * [brooce](https://github.com/SergeyTsalkov/brooce) - Language-agnostic job queue written in Go! Write your jobs in any language, schedule them from any language, run them anywhere!

composer.json

@@ -0,0 +1,29 @@
+{
+    "name": "sergeytsalkov/meekrodb",
+    "description": "The Simple PHP/MySQL Library",
+    "homepage": "http://www.meekro.com",
+    "support": {
+        "email": "support@meekro.com"
+    },
+    "keywords": [
+        "mysql",
+        "database",
+        "mysqli",
+        "pdo"
+    ],
+    "license": "LGPL-3.0",
+    "authors": [
+        {
+            "name": "Sergey Tsalkov",
+            "email": "stsalkov@gmail.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "classmap": [
+            "db.class.php"
+        ]
+    }
+}

simpletest/BasicTest.php

@@ -1,29 +1,39 @@
-<?
+<?php
 class BasicTest extends SimpleTest {
   function __construct() {
-    require_once '../db.class.php';
-    DB::$user = 'libdb_user';
-    DB::$password = 'sdf235sklj';
-    DB::$dbName = 'libdb_test';
-    DB::query("DROP DATABASE libdb_test");
-    DB::query("CREATE DATABASE libdb_test");
-    DB::useDB('libdb_test');
+    foreach (DB::tableList() as $table) {
+      DB::query("DROP TABLE %b", $table);
+    }
   }
   
   
   function test_1_create_table() {
     DB::query("CREATE TABLE `accounts` (
     `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+    `profile_id` INT NOT NULL,
     `username` VARCHAR( 255 ) NOT NULL ,
-    `password` VARCHAR( 255 ) NOT NULL ,
+    `password` VARCHAR( 255 ) NULL ,
     `age` INT NOT NULL DEFAULT '10',
-    `height` DOUBLE NOT NULL DEFAULT '10.0'
+    `height` DOUBLE NOT NULL DEFAULT '10.0',
+    `favorite_word` VARCHAR( 255 ) NULL DEFAULT 'hi',
+    `birthday` TIMESTAMP NOT NULL
+    ) ENGINE = InnoDB");
+
+    DB::query("CREATE TABLE `profile` (
+    `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+    `signature` VARCHAR( 255 ) NULL DEFAULT 'donewriting'
+    ) ENGINE = InnoDB");
+
+    DB::query("CREATE TABLE `fake%s_table` (
+    `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+    `name` VARCHAR( 255 ) NULL DEFAULT 'blah'
     ) ENGINE = InnoDB");
   }
   
   function test_1_5_empty_table() {
     $counter = DB::queryFirstField("SELECT COUNT(*) FROM accounts");
     $this->assert($counter === strval(0));
+    $this->assert(DB::lastQuery() === 'SELECT COUNT(*) FROM accounts');
     
     $row = DB::queryFirstRow("SELECT * FROM accounts");
     $this->assert($row === null);
@@ -42,11 +52,12 @@ class BasicTest extends SimpleTest {
   }
   
   function test_2_insert_row() {
-    DB::insert('accounts', array(
+    $true = DB::insert('accounts', array(
       'username' => 'Abe',
       'password' => 'hello'
     ));
     
+    $this->assert($true === true);
     $this->assert(DB::affectedRows() === 1);
     
     $counter = DB::queryFirstField("SELECT COUNT(*) FROM accounts");
@@ -60,34 +71,372 @@ class BasicTest extends SimpleTest {
       'age' => 15,
       'height' => 10.371
     ));
-    
-    DB::insert('`libdb_test`.`accounts`', array(
+    $dbname = DB::$dbName;
+    DB::insert("`$dbname`.`accounts`", array(
       'username' => 'Charlie\'s Friend',
       'password' => 'goodbye',
       'age' => 30,
-      'height' => 155.23
+      'height' => 155.23,
+      'favorite_word' => null,
     ));
     
+    $this->assert(DB::insertId() === 3);
     $counter = DB::queryFirstField("SELECT COUNT(*) FROM accounts");
     $this->assert($counter === strval(3));
     
-    $bart = DB::queryFirstRow("SELECT * FROM accounts WHERE age IN %li AND height IN %ld AND username IN %ls", 
+    DB::insert('`accounts`', array(
+      'username' => 'Deer',
+      'password' => '',
+      'age' => 15,
+      'height' => 10.371
+    ));
+
+    $username = DB::queryFirstField("SELECT username FROM accounts WHERE password=%s0", null);
+    $this->assert($username === 'Deer');
+
+    $password = DB::queryFirstField("SELECT password FROM accounts WHERE favorite_word IS NULL");
+    $this->assert($password === 'goodbye');
+    
+    DB::insertUpdate('accounts', array(
+      'id' => 3,
+      'favorite_word' => null,
+    ));
+    
+    DB::$param_char = '###';
+    $bart = DB::queryFirstRow("SELECT * FROM accounts WHERE age IN ###li AND height IN ###ld AND username IN ###ls", 
       array(15, 25), array(10.371, 150.123), array('Bart', 'Barts'));
     $this->assert($bart['username'] === 'Bart');
+    DB::insert('accounts', array('username' => 'f_u'));
+    DB::query("DELETE FROM accounts WHERE username=###s", 'f_u');
+    DB::$param_char = '%';
     
     $charlie_password = DB::queryFirstField("SELECT password FROM accounts WHERE username IN %ls AND username = %s", 
       array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
     $this->assert($charlie_password === 'goodbye');
+    
+    $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);
+    
+    $mysqli_result = DB::queryRaw("SELECT * FROM accounts WHERE favorite_word IS NULL");
+    $this->assert($mysqli_result instanceof MySQLi_Result);
+    $row = $mysqli_result->fetch_assoc();
+    $this->assert($row['password'] === 'goodbye');
+    $this->assert($mysqli_result->fetch_assoc() === null);
   }
   
   function test_4_query() {
-    $results = DB::query("SELECT * FROM accounts WHERE username=%s", 'Charlie\'s Friend');
+    DB::update('accounts', array(
+      'birthday' => new DateTime('10 September 2000 13:13:13')
+    ), 'username=%s', 'Charlie\'s Friend');
+    
+    $results = DB::query("SELECT * FROM accounts WHERE username=%s AND birthday IN %lt", 'Charlie\'s Friend', array('September 10 2000 13:13:13'));
     $this->assert(count($results) === 1);
-    $this->assert($results[0]['age'] == 30 && $results[0]['password'] == 'goodbye');
+    $this->assert($results[0]['age'] === '30' && $results[0]['password'] === 'goodbye');
+    $this->assert($results[0]['birthday'] == '2000-09-10 13:13:13');
     
     $results = DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
-    $this->assert(count($results) === 2);
+    $this->assert(count($results) === 3);
+    
+    $columnList = DB::columnList('accounts');
+    $columnKeys = array_keys($columnList);
+    $this->assert(count($columnList) === 8);
+    $this->assert($columnList['id']['type'] == 'int(11)');
+    $this->assert($columnList['height']['type'] == 'double');
+    $this->assert($columnKeys[5] == 'height');
+    
+    $tablelist = DB::tableList();
+    $this->assert(count($tablelist) === 3);
+    $this->assert($tablelist[0] === 'accounts');
+    
+    $tablelist = null;
+    $tablelist = DB::tableList(DB::$dbName);
+    $this->assert(count($tablelist) === 3);
+    $this->assert($tablelist[0] === 'accounts');
+
+    $date = DB::queryFirstField("SELECT DATE_FORMAT(birthday, '%%m/%%d/%%Y') FROM accounts WHERE username=%s", "Charlie's Friend");
+    $this->assert($date === '09/10/2000');
+
+    $date = DB::queryFirstField("SELECT DATE_FORMAT('2009-10-04 22:23:00', '%m/%d/%Y')");;
+    $this->assert($date === '10/04/2009');
   }
+  
+  function test_4_1_query() {
+    DB::insert('accounts', array(
+      'username' => 'newguy',
+      'password' => DB::sqleval("REPEAT('blah', %i)", '3'),
+      'age' => DB::sqleval('171+1'),
+      'height' => 111.15
+    ));
+    
+    $row = DB::queryOneRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
+    $this->assert($row['username'] === 'newguy');
+    $this->assert($row['age'] === '172');
+    
+    $true = DB::update('accounts', array(
+      'password' => DB::sqleval("REPEAT('blah', %i)", 4),
+      'favorite_word' => null,
+      ), 'username=%s_name', array('name' => 'newguy'));
+    
+    $row = null;
+    $row = DB::queryOneRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
+    $this->assert($true === true);
+    $this->assert($row['password'] === 'blahblahblahblah');
+    $this->assert($row['favorite_word'] === null);
+    
+    $row = DB::query("SELECT * FROM accounts WHERE password=%s_mypass AND (password=%s_mypass) AND username=%s_myuser", 
+      array('myuser' => 'newguy', 'mypass' => 'blahblahblahblah')
+    );
+    $this->assert(count($row) === 1);
+    $this->assert($row[0]['username'] === 'newguy');
+    $this->assert($row[0]['age'] === '172');
+
+    $row = DB::query("SELECT * FROM accounts WHERE password IN %li AND password IN %li0 AND username=%s", array('blahblahblahblah'), 'newguy');
+    $this->assert(count($row) === 1);
+    $this->assert($row[0]['username'] === 'newguy');
+    $this->assert($row[0]['age'] === '172');
+    
+    $true = DB::query("DELETE FROM accounts WHERE password=%s", 'blahblahblahblah');
+    $this->assert($true === true);
+    $this->assert(DB::affectedRows() === 1);
+  }
+  
+  function test_4_2_delete() {
+    DB::insert('accounts', array(
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ));
+    
+    $ct = DB::queryFirstField("SELECT COUNT(*) FROM accounts WHERE %ha", array('username' => 'gonesoon', 'height' => 199.194));
+    $this->assert(intval($ct) === 1);
+    
+    $ct = DB::queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s1 AND height=%d0 AND height=%d", 199.194, 'gonesoon');
+    $this->assert(intval($ct) === 1);
+    
+    DB::delete('accounts', 'username=%s AND age=%i AND height=%d', 'gonesoon', '61', '199.194');
+    $this->assert(DB::affectedRows() === 1);
+    
+    $ct = DB::queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s AND height=%d", 'gonesoon', '199.194');
+    $this->assert(intval($ct) === 0);
+  }
+  
+  function test_4_3_insertmany() {
+    $ins[] = array(
+      'username' => '1ofmany',
+      'password' => 'something',
+      'age' => 23,
+      'height' => 190.194
+    );
+    $ins[] = array(
+      'password' => 'somethingelse',
+      'username' => '2ofmany',
+      'age' => 25,
+      'height' => 190.194
+    );
+    $ins[] = array(
+      'password' => NULL,
+      'username' => '3ofmany',
+      'age' => 15,
+      'height' => 111.951
+    ); 
+    
+    DB::insert('accounts', $ins);
+    $this->assert(DB::affectedRows() === 3);
+    
+    $rows = DB::query("SELECT * FROM accounts WHERE height=%d ORDER BY age ASC", 190.194);
+    $this->assert(count($rows) === 2);
+    $this->assert($rows[0]['username'] === '1ofmany');
+    $this->assert($rows[0]['age'] === '23');
+    $this->assert($rows[1]['age'] === '25');
+    $this->assert($rows[1]['password'] === 'somethingelse');
+    $this->assert($rows[1]['username'] === '2ofmany');
+    
+    $nullrow = DB::queryOneRow("SELECT * FROM accounts WHERE username LIKE %ss", '3ofman');
+    $this->assert($nullrow['password'] === NULL);
+    $this->assert($nullrow['age'] === '15');
+  }
+  
+  
+  
+  function test_5_insert_blobs() {
+    DB::query("CREATE TABLE `store data` (
+      `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+      `picture` BLOB
+    ) ENGINE = InnoDB");
+
+    $columns = DB::columnList('store data');
+    $this->assert(count($columns) === 2);
+    $this->assert($columns['picture']['type'] === 'blob');
+    
+    
+    $smile = file_get_contents(__DIR__ . '/smile1.jpg');
+    DB::insert('store data', array(
+      'picture' => $smile,
+    ));
+    DB::queryOneRow("INSERT INTO %b (picture) VALUES (%s)", 'store data', $smile);
+    
+    $getsmile = DB::queryFirstField("SELECT picture FROM %b WHERE id=1", 'store data');
+    $getsmile2 = DB::queryFirstField("SELECT picture FROM %b WHERE id=2", 'store data');
+    $this->assert($smile === $getsmile);
+    $this->assert($smile === $getsmile2);
+  }
+  
+  function test_6_insert_ignore() {
+    DB::insertIgnore('accounts', array(
+      'id' => 1, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ));
+  }
+  
+  function test_7_insert_update() {
+    $true = DB::insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ), 'age = age + %i', 1);
+    
+    $this->assert($true === true);
+    $this->assert(DB::affectedRows() === 2); // a quirk of MySQL, even though only 1 row was updated
+    
+    $result = DB::query("SELECT * FROM accounts WHERE age = %i", 16);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '10.371');
+    
+    DB::insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'blahblahdude',
+      'age' => 233,
+      'height' => 199.194
+    ));
+    
+    $result = DB::query("SELECT * FROM accounts WHERE age = %i", 233);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '199.194');
+    $this->assert($result[0]['username'] === 'blahblahdude');
+    
+    DB::insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ), array(
+      'age' => 74,
+    ));
+    
+    $result = DB::query("SELECT * FROM accounts WHERE age = %i", 74);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '199.194');
+    $this->assert($result[0]['username'] === 'blahblahdude');
+    
+    $multiples[] = array(
+      'id' => 3, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    );
+    $multiples[] = array(
+      'id' => 1, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    );
+    
+    DB::insertUpdate('accounts', $multiples, array('age' => 914));
+    $this->assert(DB::affectedRows() === 4);
+    
+    $result = DB::query("SELECT * FROM accounts WHERE age=914 ORDER BY id ASC");
+    $this->assert(count($result) === 2);
+    $this->assert($result[0]['username'] === 'Abe');
+    $this->assert($result[1]['username'] === 'Charlie\'s Friend');
+    
+    $true = DB::query("UPDATE accounts SET age=15, username='Bart' WHERE age=%i", 74);
+    $this->assert($true === true);
+    $this->assert(DB::affectedRows() === 1);
+  }
+  
+  function test_8_lb() {
+    $data = array(
+      'username' => 'vookoo',
+      'password' => 'dookoo',
+    );
+    
+    $true = DB::query("INSERT into accounts %lb VALUES %ls", array_keys($data), array_values($data));
+    $result = DB::query("SELECT * FROM accounts WHERE username=%s", 'vookoo');
+    $this->assert($true === true);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['password'] === 'dookoo');
+  }
+
+  function test_9_fullcolumns() {
+    $true = DB::insert('profile', array(
+      'id' => 1,
+      'signature' => 'u_suck'
+    ));
+    DB::query("UPDATE accounts SET profile_id=1 WHERE id=2");
+
+    $r = DB::queryFullColumns("SELECT accounts.*, profile.*, 1+1 FROM accounts
+      INNER JOIN profile ON accounts.profile_id=profile.id");
+
+    $this->assert($true === true);
+    $this->assert(count($r) === 1);
+    $this->assert($r[0]['accounts.id'] === '2');
+    $this->assert($r[0]['profile.id'] === '1');
+    $this->assert($r[0]['profile.signature'] === 'u_suck');
+    $this->assert($r[0]['1+1'] === '2');
+  }
+
+  function test_901_updatewithspecialchar() {
+    $data = 'www.mysite.com/product?s=t-%s-%%3d%%3d%i&RCAID=24322';
+    DB::update('profile', array('signature' => $data), 'id=%i', 1);
+    $signature = DB::queryFirstField("SELECT signature FROM profile WHERE id=%i", 1);
+    $this->assert($signature === $data);
+
+    DB::update('profile',array('signature'=> "%li "),"id = %d",1);
+    $signature = DB::queryFirstField("SELECT signature FROM profile WHERE id=%i", 1);
+    $this->assert($signature === "%li ");
+  }
+
+  function test_902_faketable() {
+    DB::insert('fake%s_table', array('name' => 'karen'));
+    $count = DB::queryFirstField("SELECT COUNT(*) FROM %b", 'fake%s_table');
+    $this->assert($count === '1');
+    DB::update('fake%s_table', array('name' => 'haren%s'), 'name=%s_name', array('name' => 'karen'));
+    DB::delete('fake%s_table', 'name=%s0', 'haren%s');
+    $count = DB::queryFirstField("SELECT COUNT(*) FROM %b", 'fake%s_table');
+    $this->assert($count === '0');
+  }
+
+  function test_10_parse() {
+    $parsed_query = DB::parse("SELECT * FROM %b WHERE id=%i AND name=%s", 'accounts', 5, 'Joe');
+    $correct_query = "SELECT * FROM `accounts` WHERE id=5 AND name='Joe'";
+    $this->assert($parsed_query === $correct_query);
+
+    $parsed_query = DB::parse("SELECT DATE_FORMAT(birthday, '%%Y-%%M-%%d %%h:%%i:%%s') AS mydate FROM accounts WHERE id=%i", 5);
+    $correct_query = "SELECT DATE_FORMAT(birthday, '%Y-%M-%d %h:%i:%s') AS mydate FROM accounts WHERE id=5";
+    $this->assert($parsed_query === $correct_query);
+  }
+
+
 
 }
 

simpletest/CallTest.php

@@ -0,0 +1,17 @@
+<?php
+class CallTest extends SimpleTest {
+  function test_1_create_procedure() {
+    DB::query("DROP PROCEDURE IF EXISTS myProc");
+    DB::query("CREATE PROCEDURE myProc()
+    BEGIN
+      SELECT * FROM accounts;
+    END");
+  }
+
+  function test_2_run_procedure() {
+    $r = DB::query("CALL myProc()");
+    $this->assert($r[0]['username'] === 'Abe');
+    $this->assert($r[2]['age'] === '914');
+  }
+
+}

simpletest/HookTest.php

@@ -0,0 +1,287 @@
+<?php
+
+function my_error_handler($hash) {
+  global $error_callback_worked;
+  if (substr_count($hash['error'], 'You have an error in your SQL syntax')) $error_callback_worked = 1;
+  return false;
+}
+
+function my_success_handler($hash) {
+  global $debug_callback_worked;
+  if (substr_count($hash['query'], 'SELECT')) $debug_callback_worked = 1;
+  return false;
+}
+
+
+class HookTest extends SimpleTest {
+  static function static_error_callback($hash) {
+    global $static_error_callback_worked;
+    if (substr_count($hash['error'], 'You have an error in your SQL syntax')) $static_error_callback_worked = 1;
+    return false;
+  }
+
+  function nonstatic_error_callback($hash) {
+    global $nonstatic_error_callback_worked;
+    if (substr_count($hash['error'], 'You have an error in your SQL syntax')) $nonstatic_error_callback_worked = 1;
+    return false;
+  }
+
+  function test_1_error_handler() {
+    global $error_callback_worked, $static_error_callback_worked, $nonstatic_error_callback_worked;
+    
+    DB::addHook('run_failed', 'my_error_handler');
+    DB::query("SELET * FROM accounts");
+    $this->assert($error_callback_worked === 1);
+    DB::removeHooks('run_failed');
+
+    DB::addHook('run_failed', array('HookTest', 'static_error_callback'));
+    DB::query("SELET * FROM accounts");
+    $this->assert($static_error_callback_worked === 1);
+    DB::removeHooks('run_failed');
+
+    DB::addHook('run_failed', array($this, 'nonstatic_error_callback'));
+    DB::query("SELET * FROM accounts");
+    $this->assert($nonstatic_error_callback_worked === 1);
+    DB::removeHooks('run_failed');
+  }
+  
+  function test_2_exception_catch() {
+    $dbname = DB::$dbName;
+    try {
+      DB::query("SELET * FROM accounts");
+    } catch(MeekroDBException $e) {
+      $this->assert(substr_count($e->getMessage(), 'You have an error in your SQL syntax'));
+      $this->assert($e->getQuery() === 'SELET * FROM accounts');
+      $exception_was_caught = 1;
+    }
+    $this->assert($exception_was_caught === 1);
+    $this->assert(DB::lastQuery() === 'SELET * FROM accounts');
+    
+    try {
+      DB::insert("`$dbname`.`accounts`", array(
+        'id' => 2,
+        'username' => 'Another Dude\'s \'Mom"',
+        'password' => 'asdfsdse',
+        'age' => 35,
+        'height' => 555.23
+      ));
+    } catch(MeekroDBException $e) {
+      $this->assert(substr_count($e->getMessage(), 'Duplicate entry'));
+      $exception_was_caught = 2;
+    }
+    $this->assert($exception_was_caught === 2);
+  }
+  
+  function test_3_success_handler() {
+    global $debug_callback_worked;
+    
+    DB::addHook('run_success', 'my_success_handler');
+    DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert($debug_callback_worked === 1);
+    DB::removeHooks('run_success');
+  }
+
+  function test_4_error_handler() {
+    global $anonymous_error_callback_worked;
+    
+    $error_handler = function($hash) {
+      global $anonymous_error_callback_worked;
+      if (substr_count($hash['error'], 'You have an error in your SQL syntax')) {
+        $anonymous_error_callback_worked = 1;
+      }
+      return false;
+    };
+    DB::addHook('run_failed', $error_handler);
+    DB::query("SELET * FROM accounts");
+    $this->assert($anonymous_error_callback_worked === 1);
+    DB::removeHooks('run_failed');
+  }
+
+  function test_5_post_run_success() {
+    $callback_worked = false;
+
+    $fn = function($hash) use (&$callback_worked) {
+      if (!isset($hash['error']) && !isset($hash['exception'])) {
+        $callback_worked = true;
+      }
+    };
+
+    DB::addHook('post_run', $fn);
+    DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert($callback_worked);
+    DB::removeHooks('post_run');
+  }
+
+  function test_6_post_run_failed() {
+    $callback_worked = false;
+
+    $fn = function($hash) use (&$callback_worked) {
+      if ($hash['error'] && $hash['exception']) {
+        $expected_query = "SELEC * FROM accounts WHERE username!='Charlie\'s Friend'";
+        $expected_error = "error in your SQL syntax";
+        if ($hash['exception']->getQuery() == $expected_query && substr_count($hash['error'], $expected_error)) {
+          $callback_worked = true;
+        }
+      }
+    };
+
+    DB::addHook('post_run', $fn);
+    DB::addHook('run_failed', function() { return false; }); // disable exception throwing
+    DB::query("SELEC * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert($callback_worked);
+    DB::removeHooks('post_run');
+    DB::removeHooks('run_failed');
+  }
+
+  function test_7_pre_run() {
+    $callback_worked = false;
+
+    $fn = function($args) { return str_replace('SLCT', 'SELET', $args['query']); };
+    $fn2 = function($args) { return str_replace('SELET', 'SELECT', $args['query']); };
+    $fn3 = function($args) use (&$callback_worked) { $callback_worked = true; };
+
+    DB::addHook('pre_run', $fn);
+    DB::addHook('pre_run', $fn2);
+    $last_hook = DB::addHook('pre_run', $fn3);
+    $results = DB::query("SLCT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert(count($results) == 4);
+    $this->assert($callback_worked);
+
+    $callback_worked = false;
+    DB::removeHook('pre_run', $last_hook);
+    $results = DB::query("SLCT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert(count($results) == 4);
+    $this->assert(!$callback_worked);
+    
+    DB::removeHooks('pre_run');
+  }
+
+  function test_8_pre_parse() {
+    $callback_worked = false;
+
+    $fn = function($args) { 
+      $args['query'] = str_replace('SLCT', 'SELECT', $args['query']);
+      return array($args['query'], $args['args']);
+    };
+    $fn2 = function($args) { 
+      $args['args'][0] = '1ofmany';
+      return array($args['query'], $args['args']);
+    };
+    $fn3 = function() use (&$callback_worked) {
+      $callback_worked = true;
+    };
+
+    DB::addHook('pre_parse', $fn);
+    DB::addHook('pre_parse', $fn2);
+    DB::addHook('pre_parse', $fn3);
+    $row = DB::queryFirstRow("SLCT * FROM accounts WHERE username=%s", "asdf");
+    $this->assert($row['password'] == 'something');
+    $this->assert($callback_worked);
+    DB::removeHooks('pre_parse');
+  }
+
+  function test_9_enough_args() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id=%i AND username=%s", 1);
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == 'Expected 2 args, but only got 1!') {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_10_named_keys_present() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id=%i_id AND username=%s_username", array('username' => 'asdf'));
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "Couldn't find named arg id!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_11_expect_array() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id IN %li", 5);
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "Expected an array for arg 0 but didn't get one!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_12_named_keys_without_array() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id=%i_named", 1);
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "If you use named args, you must pass an assoc array of args!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_13_mix_named_numbered_args() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id=%i_named AND username=%s", array('named' => 1));
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "You can't mix named and numbered args!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_14_arrays_not_empty() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id IN %li", array());
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "Arg 0 array can't be empty!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_15_named_array_not_empty() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id IN %li_ids", array('ids' => array()));
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "Arg ids array can't be empty!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+
+
+
+
+}
+
+?>

simpletest/ObjectTest.php

@@ -0,0 +1,314 @@
+<?php
+class ObjectTest extends SimpleTest {
+  public $mdb;
+  
+  function __construct() {
+    $this->mdb = new MeekroDB();
+    
+    foreach ($this->mdb->tableList() as $table) {
+      $this->mdb->query("DROP TABLE %b", $table);
+    }
+  }
+  
+  
+  function test_1_create_table() {
+    $this->mdb->query("CREATE TABLE `accounts` (
+    `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+    `username` VARCHAR( 255 ) NOT NULL ,
+    `password` VARCHAR( 255 ) NULL ,
+    `age` INT NOT NULL DEFAULT '10',
+    `height` DOUBLE NOT NULL DEFAULT '10.0',
+    `favorite_word` VARCHAR( 255 ) NULL DEFAULT 'hi'
+    ) ENGINE = InnoDB");
+  }
+  
+  function test_1_5_empty_table() {
+    $counter = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts");
+    $this->assert($counter === strval(0));
+    
+    $row = $this->mdb->queryFirstRow("SELECT * FROM accounts");
+    $this->assert($row === null);
+    
+    $field = $this->mdb->queryFirstField("SELECT * FROM accounts");
+    $this->assert($field === null);
+    
+    $field = $this->mdb->queryOneField('nothere', "SELECT * FROM accounts");
+    $this->assert($field === null);
+    
+    $column = $this->mdb->queryFirstColumn("SELECT * FROM accounts");
+    $this->assert(is_array($column) && count($column) === 0);
+    
+    $column = $this->mdb->queryOneColumn('nothere', "SELECT * FROM accounts"); //TODO: is this what we want?
+    $this->assert(is_array($column) && count($column) === 0);
+  }
+  
+  function test_2_insert_row() {
+    $this->mdb->insert('accounts', array(
+      'username' => 'Abe',
+      'password' => 'hello'
+    ));
+    
+    $this->assert($this->mdb->affectedRows() === 1);
+    
+    $counter = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts");
+    $this->assert($counter === strval(1));
+  }
+  
+  function test_3_more_inserts() {
+    $this->mdb->insert('`accounts`', array(
+      'username' => 'Bart',
+      'password' => 'hello',
+      'age' => 15,
+      'height' => 10.371
+    ));
+    $dbname = $this->mdb->dbName;
+    $this->mdb->insert("`$dbname`.`accounts`", array(
+      'username' => 'Charlie\'s Friend',
+      'password' => 'goodbye',
+      'age' => 30,
+      'height' => 155.23,
+      'favorite_word' => null,
+    ));
+    
+    $this->assert($this->mdb->insertId() === 3);
+    
+    $counter = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts");
+    $this->assert($counter === strval(3));
+    
+    $password = $this->mdb->queryFirstField("SELECT password FROM accounts WHERE favorite_word IS NULL");
+    $this->assert($password === 'goodbye');
+    
+    $this->mdb->param_char = '###';
+    $bart = $this->mdb->queryFirstRow("SELECT * FROM accounts WHERE age IN ###li AND height IN ###ld AND username IN ###ls", 
+      array(15, 25), array(10.371, 150.123), array('Bart', 'Barts'));
+    $this->assert($bart['username'] === 'Bart');
+    $this->mdb->param_char = '%';
+    
+    $charlie_password = $this->mdb->queryFirstField("SELECT password FROM accounts WHERE username IN %ls AND username = %s", 
+      array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
+    $this->assert($charlie_password === 'goodbye');
+    
+    $charlie_password = $this->mdb->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 = $this->mdb->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) = $this->mdb->queryOneList("SELECT age,username,password FROM accounts WHERE username=%s", 'Bart');
+    $this->assert($username === 'Bart');
+    $this->assert($password === 'hello');
+    $this->assert($age == 15);
+    
+    $mysqli_result = $this->mdb->queryRaw("SELECT * FROM accounts WHERE favorite_word IS NULL");
+    $this->assert($mysqli_result instanceof MySQLi_Result);
+    $row = $mysqli_result->fetch_assoc();
+    $this->assert($row['password'] === 'goodbye');
+    $this->assert($mysqli_result->fetch_assoc() === null);
+  }
+  
+  function test_4_query() {
+    $results = $this->mdb->query("SELECT * FROM accounts WHERE username=%s", 'Charlie\'s Friend');
+    $this->assert(count($results) === 1);
+    $this->assert($results[0]['age'] == 30 && $results[0]['password'] == 'goodbye');
+    
+    $results = $this->mdb->query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert(count($results) === 2);
+    
+    $columnList = $this->mdb->columnList('accounts');
+    $columnKeys = array_keys($columnList);
+    $this->assert(count($columnList) === 6);
+    $this->assert($columnList['id']['type'] == 'int(11)');
+    $this->assert($columnList['height']['type'] == 'double');
+    $this->assert($columnKeys[4] == 'height');
+    
+    $tablelist = $this->mdb->tableList();
+    $this->assert(count($tablelist) === 1);
+    $this->assert($tablelist[0] === 'accounts');
+    
+    $tablelist = null;
+    $tablelist = $this->mdb->tableList($this->mdb->dbName);
+    $this->assert(count($tablelist) === 1);
+    $this->assert($tablelist[0] === 'accounts');
+  }
+  
+  function test_4_1_query() {
+    $this->mdb->insert('accounts', array(
+      'username' => 'newguy',
+      'password' => $this->mdb->sqleval("REPEAT('blah', %i)", '3'),
+      'age' => $this->mdb->sqleval('171+1'),
+      'height' => 111.15
+    ));
+    
+    $row = $this->mdb->queryOneRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
+    $this->assert($row['username'] === 'newguy');
+    $this->assert($row['age'] === '172');
+    
+    $this->mdb->update('accounts', array(
+      'password' => $this->mdb->sqleval("REPEAT('blah', %i)", 4),
+      'favorite_word' => null,
+      ), 'username=%s', 'newguy');
+    
+    $row = null;
+    $row = $this->mdb->queryOneRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
+    $this->assert($row['password'] === 'blahblahblahblah');
+    $this->assert($row['favorite_word'] === null);
+    
+    $this->mdb->query("DELETE FROM accounts WHERE password=%s", 'blahblahblahblah');
+    $this->assert($this->mdb->affectedRows() === 1);
+  }
+  
+  function test_4_2_delete() {
+    $this->mdb->insert('accounts', array(
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ));
+    
+    $ct = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s AND height=%d", 'gonesoon', 199.194);
+    $this->assert(intval($ct) === 1);
+    
+    $ct = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s1 AND height=%d0 AND height=%d", 199.194, 'gonesoon');
+    $this->assert(intval($ct) === 1);
+    
+    $this->mdb->delete('accounts', 'username=%s AND age=%i AND height=%d', 'gonesoon', '61', '199.194');
+    $this->assert($this->mdb->affectedRows() === 1);
+    
+    $ct = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s AND height=%d", 'gonesoon', '199.194');
+    $this->assert(intval($ct) === 0);
+  }
+  
+  function test_4_3_insertmany() {
+    $ins[] = array(
+      'username' => '1ofmany',
+      'password' => 'something',
+      'age' => 23,
+      'height' => 190.194
+    );
+    $ins[] = array(
+      'password' => 'somethingelse',
+      'username' => '2ofmany',
+      'age' => 25,
+      'height' => 190.194
+    );
+    
+    $this->mdb->insert('accounts', $ins);
+    $this->assert($this->mdb->affectedRows() === 2);
+    
+    $rows = $this->mdb->query("SELECT * FROM accounts WHERE height=%d ORDER BY age ASC", 190.194);
+    $this->assert(count($rows) === 2);
+    $this->assert($rows[0]['username'] === '1ofmany');
+    $this->assert($rows[0]['age'] === '23');
+    $this->assert($rows[1]['age'] === '25');
+    $this->assert($rows[1]['password'] === 'somethingelse');
+    $this->assert($rows[1]['username'] === '2ofmany');
+    
+  }
+  
+  
+  
+  function test_5_insert_blobs() {
+    $this->mdb->query("CREATE TABLE `storedata` (
+      `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+      `picture` BLOB
+    ) ENGINE = InnoDB");
+    
+    
+    $smile = file_get_contents(__DIR__ . '/smile1.jpg');
+    $this->mdb->insert('storedata', array(
+      'picture' => $smile,
+    ));
+    $this->mdb->query("INSERT INTO storedata (picture) VALUES (%s)", $smile);
+    
+    $getsmile = $this->mdb->queryFirstField("SELECT picture FROM storedata WHERE id=1");
+    $getsmile2 = $this->mdb->queryFirstField("SELECT picture FROM storedata WHERE id=2");
+    $this->assert($smile === $getsmile);
+    $this->assert($smile === $getsmile2);
+  }
+  
+  function test_6_insert_ignore() {
+    $this->mdb->insertIgnore('accounts', array(
+      'id' => 1, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ));
+  }
+  
+  function test_7_insert_update() {
+    $this->mdb->insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ), 'age = age + %i', 1);
+    
+    $this->assert($this->mdb->affectedRows() === 2); // a quirk of MySQL, even though only 1 row was updated
+    
+    $result = $this->mdb->query("SELECT * FROM accounts WHERE age = %i", 16);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '10.371');
+    
+    $this->mdb->insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'blahblahdude',
+      'age' => 233,
+      'height' => 199.194
+    ));
+    
+    $result = $this->mdb->query("SELECT * FROM accounts WHERE age = %i", 233);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '199.194');
+    $this->assert($result[0]['username'] === 'blahblahdude');
+    
+    $this->mdb->insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ), array(
+      'age' => 74,
+    ));
+    
+    $result = $this->mdb->query("SELECT * FROM accounts WHERE age = %i", 74);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '199.194');
+    $this->assert($result[0]['username'] === 'blahblahdude');
+    
+    $multiples[] = array(
+      'id' => 3, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    );
+    $multiples[] = array(
+      'id' => 1, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    );
+    
+    $this->mdb->insertUpdate('accounts', $multiples, array('age' => 914));
+    $this->assert($this->mdb->affectedRows() === 4);
+    
+    $result = $this->mdb->query("SELECT * FROM accounts WHERE age=914 ORDER BY id ASC");
+    $this->assert(count($result) === 2);
+    $this->assert($result[0]['username'] === 'Abe');
+    $this->assert($result[1]['username'] === 'Charlie\'s Friend');
+    
+    $this->mdb->query("UPDATE accounts SET age=15, username='Bart' WHERE age=%i", 74);
+    $this->assert($this->mdb->affectedRows() === 1);
+  }
+
+}
+
+
+?>

simpletest/TransactionTest.php

@@ -0,0 +1,30 @@
+<?php
+class TransactionTest extends SimpleTest {
+  function test_1_transactions() {
+    DB::$nested_transactions = false;
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 600, 'Abe');
+    
+    $depth = DB::startTransaction();
+    $this->assert($depth === 1);
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 700, 'Abe');
+    $depth = DB::startTransaction();
+    $this->assert($depth === 1);
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 800, 'Abe');
+    $depth = DB::rollback();
+    $this->assert($depth === 0);
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 700);
+    
+    $depth = DB::rollback();
+    $this->assert($depth === 0);
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 700);
+  }
+  
+}
+?>

simpletest/TransactionTest_55.php

@@ -0,0 +1,85 @@
+<?php
+class TransactionTest_55 extends SimpleTest {
+  function test_1_transactions() {
+    DB::$nested_transactions = true;
+    
+    $depth = DB::startTransaction();
+      $this->assert($depth === 1);
+      DB::query("UPDATE accounts SET age=%i WHERE username=%s", 700, 'Abe');
+      
+      $depth = DB::startTransaction();
+        $this->assert($depth === 2);
+        DB::query("UPDATE accounts SET age=%i WHERE username=%s", 800, 'Abe');
+        
+        $depth = DB::startTransaction();
+          $this->assert($depth === 3);
+          $this->assert(DB::transactionDepth() === 3);
+          DB::query("UPDATE accounts SET age=%i WHERE username=%s", 500, 'Abe');
+        $depth = DB::commit();
+        
+        $this->assert($depth === 2);
+        
+        $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+        $this->assert($age == 500);
+        
+      $depth = DB::rollback();
+      $this->assert($depth === 1);
+      
+      $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+      $this->assert($age == 700);
+    
+    $depth = DB::commit();
+    $this->assert($depth === 0);
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 700);
+    
+    
+    DB::$nested_transactions = false;
+  }
+  
+  function test_2_transactions() {
+    DB::$nested_transactions = true;
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 600, 'Abe');
+    
+    DB::startTransaction();
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 700, 'Abe');
+    DB::startTransaction();
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 800, 'Abe');
+    DB::rollback();
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 700);
+    
+    DB::rollback();
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 600);
+    
+    DB::$nested_transactions = false;
+  }
+  
+  function test_3_transaction_rollback_all() {
+    DB::$nested_transactions = true;
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 200, 'Abe');
+    
+    $depth = DB::startTransaction();
+    $this->assert($depth === 1);
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 300, 'Abe');
+    $depth = DB::startTransaction();
+    $this->assert($depth === 2);
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 400, 'Abe');
+    $depth = DB::rollback(true);
+    $this->assert($depth === 0);
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 200);
+    
+    DB::$nested_transactions = false;
+  }
+  
+}
+?>

simpletest/WalkTest.php

@@ -0,0 +1,48 @@
+<?php
+
+class WalkTest extends SimpleTest {
+  function test_1_walk() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts");
+
+    $results = array();
+    while ($row = $Walk->next()) {
+      $results[] = $row;
+    }
+
+    $this->assert(count($results) == 8);
+    $this->assert($results[7]['username'] == 'vookoo');
+  }
+  
+  function test_2_walk_empty() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts WHERE id>100");
+
+    $results = array();
+    while ($row = $Walk->next()) {
+      $results[] = $row;
+    }
+
+    $this->assert(count($results) == 0);
+  }
+
+  function test_3_walk_insert() {
+    $Walk = DB::queryWalk("INSERT INTO profile (id) VALUES (100)");
+
+    $results = array();
+    while ($row = $Walk->next()) {
+      $results[] = $row;
+    }
+
+    $this->assert(count($results) == 0);
+
+    DB::query("DELETE FROM profile WHERE id=100");
+  }
+
+  function test_4_walk_incomplete() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts");
+    $Walk->next();
+    unset($Walk);
+
+    // if $Walk hasn't been properly freed, this will produce an out of sync error
+    DB::query("SELECT * FROM accounts");
+  }
+}

simpletest/WhereClauseTest.php

@@ -0,0 +1,83 @@
+<?php
+class WhereClauseTest extends SimpleTest {
+  function test_1_basic_where() {
+    $where = new WhereClause('and');
+    $where->add('username=%s', 'Bart');
+    $where->add('password=%s', 'hello');
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+  
+  function test_2_simple_grouping() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $subclause = $where->addClause('or');
+    $subclause->add('age=%i', 15);
+    $subclause->add('age=%i', 14);
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+  
+  function test_3_negate_last() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $subclause = $where->addClause('or');
+    $subclause->add('username!=%s', 'Bart');
+    $subclause->negateLast();
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+  
+  function test_4_negate_last_query() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $subclause = $where->addClause('or');
+    $subclause->add('username!=%s', 'Bart');
+    $where->negateLast();
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+  
+  function test_5_negate() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $subclause = $where->addClause('or');
+    $subclause->add('username!=%s', 'Bart');
+    $subclause->negate();
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+
+  function test_6_negate_two() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $where->add('username=%s', 'Bart');
+    $where->negate();
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 7);
+  }
+
+  function test_7_or() {
+    $where = new WhereClause('or');
+    $where->add('username=%s', 'Bart');
+    $where->add('username=%s', 'Abe');
+
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 2);
+  }
+  
+
+}
+
+?>

simpletest/test.php

@@ -1,7 +1,7 @@
 #!/usr/bin/php
-<?
+<?php
 class SimpleTest {
-  protected function assert($boolean) {
+  public function assert($boolean) {
     if (! $boolean) $this->fail();
   }
 
@@ -10,51 +10,66 @@ class SimpleTest {
     debug_print_backtrace();
     die;
   }
-  
-  public static function __listfiles($dir, $regex, $type='files', $rec = false) {
-    $A = array();
-    
-    if (! $dir_handler = @opendir($dir)) return $A;
-    
-    while (false !== ($filename = @readdir($dir_handler))) {
-      if ($filename == '.' || $filename == '..') continue;
-      if ($rec && is_dir("$dir/$filename")) $A = array_merge($A, File::listfiles("$dir/$filename", $regex, $type, true));
-      
-      if (! preg_match($regex, $filename)) continue;
-      if ($type == 'files' && ! is_file("$dir/$filename")) continue;
-      if ($type == 'dirs' && ! is_dir("$dir/$filename")) continue;
-      if ($type == 'symlinks' && ! is_link("$dir/$filename")) continue;
-      
-      $A[] = "$dir/$filename";
-    }
-    return $A;
-  }
-
-  
-
 }
 
-$files = SimpleTest::__listfiles(__DIR__, '/^.*php$/i');
-
-$classes_to_test = array();
-foreach ($files as $fullpath) {
-  $filename = basename($fullpath);
-  if ($fullpath == __FILE__) continue;
-  
-  require_once($fullpath);
-  $classes_to_test[] = str_replace('.php', '', $filename);
+function microtime_float()
+{
+    list($usec, $sec) = explode(" ", microtime());
+    return ((float)$usec + (float)$sec);
 }
 
+ini_set('date.timezone', 'America/Los_Angeles');
+
+error_reporting(E_ALL | E_STRICT);
+require_once __DIR__ . '/../db.class.php';
+require_once __DIR__ . '/test_setup.php'; //test config values go here
+// WARNING: ALL tables in the database will be dropped before the tests, including non-test related tables. 
+DB::$user = $set_db_user;
+DB::$password = $set_password;
+DB::$dbName = $set_db;
+DB::$host = $set_host;
+DB::get(); //connect to mysql
+
+require_once __DIR__ . '/BasicTest.php';
+require_once __DIR__ . '/WalkTest.php';
+require_once __DIR__ . '/CallTest.php';
+require_once __DIR__ . '/ObjectTest.php';
+require_once __DIR__ . '/WhereClauseTest.php';
+require_once __DIR__ . '/HookTest.php';
+require_once __DIR__ . '/TransactionTest.php';
+
+$classes_to_test = array(
+  'BasicTest',
+  'WalkTest',
+  'CallTest',
+  'WhereClauseTest',
+  'ObjectTest',
+  'HookTest',
+  'TransactionTest',
+);
+
+$mysql_version = DB::serverVersion();
+if ($mysql_version >= '5.5') {
+  require_once __DIR__ . '/TransactionTest_55.php';
+  $classes_to_test[] = 'TransactionTest_55';
+} else {
+  echo "MySQL 5.5 not available (version is $mysql_version) -- skipping MySQL 5.5 tests\n";
+}
+
+$time_start = microtime_float();
 foreach ($classes_to_test as $class) {
   $object = new $class();
   
   foreach (get_class_methods($object) as $method) {
-    if (substr($method, 0, 2) == '__') continue;
+    if (substr($method, 0, 4) != 'test') continue;
     echo "Running $class::$method..\n";
     $object->$method();
   }
 }
+$time_end = microtime_float();
+$time = round($time_end - $time_start, 2);
 
+echo "Completed in $time seconds\n";
 
 
 ?>