From c132838440c3f602283bf92146433800ee1bf9b2 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 11 Dec 2008 14:11:44 +0100 Subject: Enhanced table/field mapping and eDBmkMapping_USERINFO(...) to include possibility for table aliases --- database/sqlite/fieldmapping.h | 14 +++++++------- database/sqlite/sqlite.c | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'database/sqlite') diff --git a/database/sqlite/fieldmapping.h b/database/sqlite/fieldmapping.h index 7f06318..e1b9d3a 100644 --- a/database/sqlite/fieldmapping.h +++ b/database/sqlite/fieldmapping.h @@ -23,13 +23,13 @@ # define FIELDMAPPING_H_ static eDBfieldMap tbl_sqlite_users[] = { - {TABLE_USERS, FIELD_RECID, ft_INT, "uid", NULL, NULL}, - {TABLE_USERS, FIELD_UNAME, ft_STRING, "username", NULL, NULL}, - {TABLE_USERS, FIELD_PASSWD, ft_PASSWD, "password", NULL, NULL}, - {TABLE_USERS, FIELD_ACTIVATED, ft_DATETIME, "activated", NULL, NULL}, - {TABLE_USERS, FIELD_DEACTIVATED, ft_DATETIME, "deactivated", NULL, NULL}, - {TABLE_USERS, FIELD_LASTACCESS, ft_DATETIME, "last_accessed", NULL, NULL}, - {TABLE_USERS, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL} + {TABLE_USERS, NULL, FIELD_RECID, ft_INT, "uid", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_UNAME, ft_STRING, "username", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_PASSWD, ft_PASSWD, "password", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_ACTIVATED, ft_DATETIME, "activated", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_DEACTIVATED, ft_DATETIME, "deactivated", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_LASTACCESS, ft_DATETIME, "last_accessed", NULL, NULL}, + {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL} }; #endif /* !FIELDMAPPING_H_ */ diff --git a/database/sqlite/sqlite.c b/database/sqlite/sqlite.c index beb0b8e..f74b4d7 100644 --- a/database/sqlite/sqlite.c +++ b/database/sqlite/sqlite.c @@ -324,6 +324,10 @@ char *_build_sqlpart(int btyp, eDBfieldMap *map) { // Put the pieces together and append it to the final result val = _build_value_string(ptr); + if( ptr->table_alias != NULL ) { + append_str(buf, ptr->table_alias, 8192); + append_str(buf, ".", 8192); + } append_str(buf, ptr->field_name, 8192); append_str(buf, "=", 8192); append_str(buf, val, 8192); -- cgit