IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 21, 2005, 4:05:41 PM (21 years ago)
Author:
drobbin
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/db/psDB.c

    r4312 r4342  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-18 00:53:32 $
     14 *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-22 02:05:41 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
    … …  
    4545
    4646// database utility functions
    47 static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount);
     47static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount);
    4848
    4949// SQL generation functions
    50 static char    *psDBGenerateCreateTableSQL(const char *tableName, psMetadata *where);
    51 static char    *psDBGenerateSelectRowSQL(const char *tableName, const char *col, psMetadata *where, psU64 limit);
    52 static char    *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row);
    53 static char    *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values);
    54 static char    *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where);
    55 static char    *psDBGenerateWhereSQL(psMetadata *where);
    56 static char    *psDBGenerateSetSQL(psMetadata *set
     50static char    *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *where);
     51static char    *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit);
     52static char    *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row);
     53static char    *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values);
     54static char    *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where);
     55static char    *psDBGenerateWhereSQL(const psMetadata *where);
     56static char    *psDBGenerateSetSQL(const psMetadata *set
    5757                                  );
    5858
    … …  
    195195}
    196196
    197 bool psDBCreateTable(psDB *dbh, const char *tableName, psMetadata *md)
     197bool psDBCreateTable(psDB *dbh, const char *tableName, const psMetadata *md)
    198198{
    199199    char            *query;
    … …  
    403403}
    404404
    405 psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, unsigned long long limit)
     405psArray *psDBSelectRows(psDB *dbh, const char *tableName, const psMetadata *where, unsigned long long limit)
    406406{
    407407    MYSQL_RES       *result;            // complete db result set
    … …  
    509509}
    510510
    511 bool psDBInsertOneRow(psDB *dbh, const char *tableName, psMetadata *row)
    512 {
    513     psArray         *rowSet;            // psArray of row to insert
     511bool psDBInsertOneRow(psDB *dbh, const char *tableName, const psMetadata *row)
     512{
     513    psArray         *rowSet;           // psArray of row to insert
    514514
    515515    // Check for null row
    … …  
    522522    rowSet = psArrayAlloc(1);
    523523    rowSet->n = 0;
    524     psArrayAdd(rowSet, 0, row);
     524    psArrayAdd(rowSet, 0, (psPtr)row);
    525525
    526526    // Execute function to insert rows
    … …  
    687687}
    688688
    689 psS64 psDBUpdateRows(psDB *dbh, const char *tableName, psMetadata *where, psMetadata *values)
     689psS64 psDBUpdateRows(psDB *dbh, const char *tableName, const psMetadata *where, const psMetadata *values)
    690690{
    691691    char            *query;
    … …  
    769769}
    770770
    771 psS64 psDBDeleteRows(psDB *dbh, const char *tableName, psMetadata *where)
     771psS64 psDBDeleteRows(psDB *dbh, const char *tableName, const psMetadata *where)
    772772{
    773773    char            *query;
    … …  
    806806/*****************************************************************************/
    807807
    808 bool p_psDBRunQuery(psDB *dbh, const char *query)
     808bool p_psDBRunQuery(psDB *dbh, const char *format)
    809809{
    810810    // Verify database object is not NULL
    … …  
    815815
    816816    // Run query
    817     if (mysql_real_query(dbh->mysql, query, (unsigned long)strlen(query)) !=0) {
     817    if (mysql_real_query(dbh->mysql, format, (unsigned long)strlen(format)) !=0) {
    818818        psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysql_error(dbh->mysql));
    819819        return false;
    … …  
    823823}
    824824
    825 static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount)
     825static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount)
    826826{
    827827    psListIterator  *cursor;            // row iterator
    … …  
    912912/*****************************************************************************/
    913913
    914 static char *psDBGenerateCreateTableSQL(const char *tableName, psMetadata *table)
     914static char *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *table)
    915915{
    916916    char            *query = NULL;      // complete query
    … …  
    988988}
    989989
    990 static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, psMetadata *where, const psU64 limit)
     990static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit)
    991991{
    992992    char            *query = NULL;
    … …  
    10251025}
    10261026
    1027 static char *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row)
     1027static char *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row)
    10281028{
    10291029    char            *query = NULL;
    … …  
    10811081}
    10821082
    1083 static char *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values)
     1083static char *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values)
    10841084{
    10851085    char            *query = NULL;
    … …  
    11141114}
    11151115
    1116 static char *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where)
     1116static char *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where)
    11171117{
    11181118    char            *query = NULL;
    … …  
    11391139}
    11401140
    1141 static char *psDBGenerateWhereSQL(psMetadata *where)
     1141static char *psDBGenerateWhereSQL(const psMetadata *where)
    11421142{
    11431143    char            *query = NULL;
    … …  
    11981198}
    11991199
    1200 static char *psDBGenerateSetSQL(psMetadata *set
     1200static char *psDBGenerateSetSQL(const psMetadata *set
    12011201                               )
    12021202{
Note: See TracChangeset for help on using the changeset viewer.