diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2008-12-06 16:50:50 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2008-12-06 16:50:50 +0100 |
| commit | 7572b6a34495d6288d07d16781c8f72fd5218cfe (patch) | |
| tree | 048f6e83eef6a2da4d95db5b1d0c038e553c1939 /database/sqlite | |
| parent | f9a997f3fcca5d81986168df1b9072bbf611ed9f (diff) | |
| download | eurephia-7572b6a34495d6288d07d16781c8f72fd5218cfe.tar.gz eurephia-7572b6a34495d6288d07d16781c8f72fd5218cfe.tar.xz eurephia-7572b6a34495d6288d07d16781c8f72fd5218cfe.zip | |
Moved over from earlier commit to use unified db translation
In other words, rewrote commit 6d4373e026b3f12c5685e45e35f9f060379ed0f3.
Moved over all functions from that commit which could take advantage of
the new API for unified table/field translation.
Diffstat (limited to 'database/sqlite')
| -rw-r--r-- | database/sqlite/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | database/sqlite/administration.c | 3 | ||||
| -rw-r--r-- | database/sqlite/fieldmapping.h | 15 |
3 files changed, 11 insertions, 9 deletions
diff --git a/database/sqlite/CMakeLists.txt b/database/sqlite/CMakeLists.txt index f1d5fef..2a4771b 100644 --- a/database/sqlite/CMakeLists.txt +++ b/database/sqlite/CMakeLists.txt @@ -8,10 +8,10 @@ SET(edb_sqlite_SRC administration.c ) SET(COMMON + ../eurephiadb_mapping.c ../../common/eurephia_log.c ../../common/eurephiadb_session_common.c ../../common/eurephia_values.c - ../../common/eurephia_admin_common.c ../../common/passwd.c ../../common/sha512.c ) diff --git a/database/sqlite/administration.c b/database/sqlite/administration.c index 037f52d..8e2c513 100644 --- a/database/sqlite/administration.c +++ b/database/sqlite/administration.c @@ -16,6 +16,7 @@ #include <eurephia_log.h> #include <eurephia_values.h> #include <eurephiadb_session_struct.h> +#include <eurephiadb_mapping.h> #include <passwd.h> #include "sqlite.h" @@ -339,7 +340,7 @@ eurephiaUSERLIST *eDBadminGetUserList(eurephiaCTX *ctx, const char *sortkeys) { assert((ctx != NULL) && (ctx->dbc != 0)); // Convert the input sort keys to the proper database field names - dbsort = eAdminConvertSortKeys(tbl_sqlite_user, sortkeys); + dbsort = eDBmkSortKeyString(tbl_sqlite_users, sortkeys); // Query database for all users res = sqlite_query(ctx, diff --git a/database/sqlite/fieldmapping.h b/database/sqlite/fieldmapping.h index 227b50b..3037f3d 100644 --- a/database/sqlite/fieldmapping.h +++ b/database/sqlite/fieldmapping.h @@ -22,13 +22,14 @@ #ifndef FIELDMAPPING_H_ # define FIELDMAPPING_H_ -eFieldMap tbl_sqlite_user[] = { - {TABLE_USERS, SORTKEY_RECID, "uid"}, - {TABLE_USERS, SORTKEY_UNAME, "username"}, - {TABLE_USERS, SORTKEY_ACTIVATED, "activated"}, - {TABLE_USERS, SORTKEY_DEACTIVATED, "deactivated"}, - {TABLE_USERS, SORTKEY_LASTACCESS, "last_accessed"}, - {TABLE_USERS, SORTKEY_NONE, NULL} +static eDBfieldMap tbl_sqlite_users[] = { + {TABLE_USERS, FIELD_RECID, "uid", NULL, NULL}, + {TABLE_USERS, FIELD_UNAME, "username", NULL, NULL}, + {TABLE_USERS, FIELD_PASSWD, "password", NULL, NULL}, + {TABLE_USERS, FIELD_ACTIVATED, "activated", NULL, NULL}, + {TABLE_USERS, FIELD_DEACTIVATED, "deactivated", NULL, NULL}, + {TABLE_USERS, FIELD_LASTACCESS, "last_accessed", NULL, NULL}, + {TABLE_USERS, FIELD_NONE, NULL, NULL, NULL} }; #endif /* !FIELDMAPPING_H_ */ |