Rename include/db.php to include/query.php, all of the functions in db.php were named query_*(). Rename test_db.php to

test_query.php to match the rename of include/db.php.  Modify include/incl.php to include query.php instead of db.php

include/incl.php

@@ -11,7 +11,7 @@ require(BASE."include/user.php");
 require(BASE."include/session.php");
 require(BASE."include/menu.php");
 require(BASE."include/html.php");
-require(BASE."include/db.php");
+require(BASE."include/query.php");
 
 /* if magic quotes are enabled make sure the user disables them */
 /* otherwise they will see all kinds of odd effects that are difficult */

unit_test/run_tests.php

@@ -9,7 +9,7 @@ error_reporting(E_ALL ^  E_NOTICE);
 
 include_once("test_user.php");
 echo "\n";
-include_once("test_db.php");
+include_once("test_query.php");
 echo "\n";
 include_once("test_image.php");
 

unit_test/test_query.php

@@ -1,6 +1,6 @@
 <?php
 
-/* unit tests for functions in include/db.php */
+/* unit tests for functions in include/query.php */
 
 require_once("path.php");
 require_once("test_common.php");
@@ -62,7 +62,7 @@ function test_query_parameters()
      * test that '&' in a query is properly replaced by the contents from a file
      */
     /* write to a file that we will use for the test of '&' */
-    $sFilename = "/tmp/test_db.txt";
+    $sFilename = "/tmp/test_query.txt";
     $hFile = fopen($sFilename, "wb");
     if($hFile)
     {