Rewrites/fixes for handling config entries in SQLs

[mailer.git] / inc / db / lib-mysql3.php

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index a851367cb6ff00ea9fc7b306cf076c50202b2233..30df3b4f1e953f797bfd46cfd90ffe42b32133ee 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -72,30 +72,27 @@ function SQL_QUERY ($sqlString, $F, $L) {
        // Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
        $sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString)));
 
-       // Replace {PER}
-       $sqlString = str_replace('{PER}', '%', $sqlString);
-
        // Compile config entries out
-       $sqlString = SQL_PREPARE_SQL_STRING($sqlString);
+       $GLOBALS['last_sql'] = SQL_PREPARE_SQL_STRING($sqlString);
 
        // Starting time
        $querytimeBefore = microtime(true);
 
        // Run SQL command
-       //* DEBUG: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($sqlString) . '<br />');
-       $result = mysql_query($sqlString, SQL_GET_LINK())
-               or debug_report_bug(__FUNCTION__, __LINE__, 'file='. $F . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n".
-'Query string:' . $sqlString);
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
+       //* DEBUG: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($GLOBALS['last_sql']) . '<br />');
+       $result = mysql_query($GLOBALS['last_sql'], SQL_GET_LINK())
+               or debug_report_bug($F, $L, 'file='. $F . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n".
+'Query string:' . $GLOBALS['last_sql']);
+       /* DEBUG: */ logDebugMessage($F, $L, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . SQL_AFFECTEDROWS());
 
        // Calculate query time
        $queryTime = microtime(true) - $querytimeBefore;
 
        // Add this query to array including timing
-       addSqlToDebug($result, $sqlString, $queryTime, $F, $L);
+       addSqlToDebug($result, $GLOBALS['last_sql'], $queryTime, $F, $L);
 
        // Save last successfull query
-       setConfigEntry('db_last_query', $sqlString);
+       setConfigEntry('db_last_query', $GLOBALS['last_sql']);
 
        // Count all query times
        incrementConfigEntry('sql_time', $queryTime);
@@ -114,7 +111,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
                        fwrite($fp, 'Module=' . getModule() . "\n");
                        $GLOBALS['sql_first_entry'] = true;
                } // END - if
-               fwrite($fp, $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $sqlString)) . "\n");
+               fwrite($fp, $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $GLOBALS['last_sql'])) . "\n");
                fclose($fp);
        } // END - if
 
@@ -145,7 +142,7 @@ function SQL_NUMROWS ($resource) {
                $lines = mysql_num_rows($resource);
        } else {
                // No resource given, please fix this
-               trigger_error('No resource given! result[]=' . gettype($resource));
+               debug_report_bug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' .  $GLOBALS['last_sql']);
        }
 
        // Return lines
@@ -545,8 +542,11 @@ function SQL_HASZERONUMS ($result) {
 function SQL_PREPARE_SQL_STRING ($sqlString) {
        // Is it already cached?
        if (!isset($GLOBALS['sql_strings'][$sqlString])) {
-               // No, so compile and set it
-               $GLOBALS['sql_strings'][$sqlString] = FILTER_COMPILE_EXPRESSION_CODE(compileSqlConfig($sqlString));
+               // Compile config+expression code
+               $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString));
+
+               // Do final compilation
+               $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false);
        } // END - if
 
        // Return it