Changeset 43004 for branches/eam_branches/ipp-pstamp-20260421/psLib/src/db/psDB.c

Timestamp:

May 2, 2026, 3:48:37 PM (3 months ago)

Author:

eugene

Message:

plug a leak in p_psDBRunQueryPrepared; add function to free prepared queries (for general cleanup); init the MYSQL_TIME structure (or time types break); fractional part in query is in microseconds, not nanoseconds; do not delete all rows if a limit is provided; fix tap test to take database info from args; fix tap tests to work in Ubuntu 22.04 / MySQL 8.0

File:

• branches/eam_branches/ipp-pstamp-20260421/psLib/src/db/psDB.c (modified) (8 diffs)

branches/eam_branches/ipp-pstamp-20260421/psLib/src/db/psDB.c

@@ -713 +713 @@
 
     // Create SQL statement string
-    psString query = psDBGenerateDeleteRowSQL(tableName, where,limit);
+    psString query = psDBGenerateDeleteRowSQL(tableName, where, limit);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Query generation failed.");
@@ -871 +871 @@
 }
 
+bool psDBFreeQueryPrepared (void) {
+
+    // initalize the prepared query cache
+    if (!preparedQuery) {
+      return true;
+    }
+
+    // start lock on query cache
+    if (psMemGetThreadSafety()) {
+        pthread_mutex_lock(&preparedQueryMutex);
+    }
+
+    psFree (preparedQuery);
+    preparedQuery = NULL;
+
+    pthread_mutex_unlock(&preparedQueryMutex);
+
+    return true;
+}
+
 long p_psDBRunQueryPrepared(psDB *dbh,
                             const psArray *rowSet,
@@ -918 +938 @@
         // add this statement to the cache
         psHashAdd(preparedQuery, query, stmt);
+        psFree (stmt);
     } else {
         psTrace("psLib.db", PS_LOG_INFO, "found statment in query cache");
@@ -1608 +1629 @@
                     // have to be free'd
                     MYSQL_TIME *myTime = psAlloc(sizeof(MYSQL_TIME));
+                    memset(myTime, 0, sizeof(MYSQL_TIME));
+                    
                     myTime->year    = (unsigned int)tmTime->tm_year + 1900;
                     myTime->month   = (unsigned int)tmTime->tm_mon + 1;
@@ -1619 +1642 @@
                     // in 5.0 and 5.6, my_bool is char
                     myTime->neg     = (bool)false;
-                    // currently unused by mysql
-                    myTime->second_part  = (unsigned long)time->nsec;
+
+                    // MySQL expects fractional seconds in microseconds, not nanoseconds
+                    myTime->second_part = (unsigned long)(time->nsec / 1000);
+
+                    // XXX remove: currently unused by mysql
+                    // myTime->second_part  = (unsigned long)time->nsec;
+
                     psFree(tmTime);
 
                     bind[i].buffer  = myTime;
                     bind[i].buffer_length = sizeof(MYSQL_TIME);
-                    bind[i].length  = &bind[i].buffer_length;
+                    // XXX bind[i].length  = &bind[i].buffer_length;
+                    bind[i].length  = 0;
                     bind[i].is_null = NULL;
                 } else {
@@ -2129 +2158 @@
     char            *limitString;
 
-    // delete all rows if where is NULL
-    if (!where) {
+    // delete all rows if WHERE is NULL and no limit is given (limit == 0)
+    if (!where && !limit) {
         psStringAppend(&query, "TRUNCATE TABLE %s", tableName);
         return query;
     }
 
-    // Generate where SQL substring
-    whereSQL = psDBGenerateWhereSQL(where, tableName);
-    if (!whereSQL) {
+    psStringAppend(&query, "DELETE FROM %s", tableName);
+
+    if (where) {
+      // Generate where SQL substring
+      whereSQL = psDBGenerateWhereSQL(where, tableName);
+      if (!whereSQL) {
         psError(PS_ERR_UNEXPECTED_NULL, false, _("SQL substring generation failed."));
         return NULL;
-    }
-
-    psStringAppend(&query, "DELETE FROM %s %s", tableName, whereSQL);
+      }
+      psStringAppend(&query, " %s", whereSQL);
+      psFree(whereSQL);
+    }
 
     // Complete delete SQL command string
@@ -2151 +2184 @@
         psFree(limitString);
     }
-    psFree(whereSQL);
 
     return query;
@@ -2945 +2977 @@
 
 #endif // HAVE_PSDB
+