merged the modularization branch (credentials) back to trunk
This commit is contained in:
Martin Willi
@@ -0,0 +1,103 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup database database
|
||||
* @{ @ingroup database
|
||||
*/
|
||||
|
||||
#ifndef DATABASE_H_
|
||||
#define DATABASE_H_
|
||||
|
||||
typedef enum db_type_t db_type_t;
|
||||
typedef struct database_t database_t;
|
||||
|
||||
#include <utils/enumerator.h>
|
||||
|
||||
/**
|
||||
* Database column types
|
||||
*/
|
||||
enum db_type_t {
|
||||
/** integer type, argument is an "int" */
|
||||
DB_INT,
|
||||
/** unsigned integer, argument is an "u_int" */
|
||||
DB_UINT,
|
||||
/** string type, argument is a "char*" */
|
||||
DB_TEXT,
|
||||
/** binary large object type, argument is a "chunk_t" */
|
||||
DB_BLOB,
|
||||
/** floating point, argument is a "double" */
|
||||
DB_DOUBLE,
|
||||
/** NULL, takes no argument */
|
||||
DB_NULL,
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Interface for a database implementation.
|
||||
*
|
||||
* @code
|
||||
int affected, rowid, aint;
|
||||
char *atext;
|
||||
database_t *db;
|
||||
enumerator_t *enumerator;
|
||||
|
||||
db = lib->database->create("mysql://user:pass@host/database");
|
||||
affected = db->execute(db, &rowid, "INSERT INTO table VALUES (?, ?)",
|
||||
DB_INT, 77, DB_TEXT, "a text");
|
||||
printf("inserted %d row, new row ID: %d\n", affected, rowid);
|
||||
|
||||
enumerator = db->query(db, "SELECT aint, atext FROM table WHERE aint > ?",
|
||||
DB_INT, 10, // 1 argument to SQL string
|
||||
DB_INT, DB_TEXT); // 2 enumerated types in query
|
||||
if (enumerator)
|
||||
{
|
||||
while (enumerator->enumerate(enumerator, &aint, &atext))
|
||||
{
|
||||
printf("%d: %s\n", aint, atext);
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
}
|
||||
@endcode
|
||||
*/
|
||||
struct database_t {
|
||||
|
||||
/**
|
||||
* Run a query which returns rows, such as a SELECT.
|
||||
*
|
||||
* @param sql sql query string, containing '?' placeholders
|
||||
* @param ... list of sql placeholder db_type_t followed by its value,
|
||||
* followed by enumerators arguments as db_type_t's
|
||||
* @return enumerator as defined with arguments, NULL on failure
|
||||
*/
|
||||
enumerator_t* (*query)(database_t *this, char *sql, ...);
|
||||
|
||||
/**
|
||||
* Execute a query which dows not return rows, such as INSERT.
|
||||
*
|
||||
* @param rowid pointer to write inserted AUTO_INCREMENT row ID, or NULL
|
||||
* @param sql sql string, containing '?' placeholders
|
||||
* @param ... list of sql placeholder db_type_t followed by its value
|
||||
* @return number of affected rows, < 0 on failure
|
||||
*/
|
||||
int (*execute)(database_t *this, int *rowid, char *sql, ...);
|
||||
|
||||
/**
|
||||
* Destroy a database connection.
|
||||
*/
|
||||
void (*destroy)(database_t *this);
|
||||
};
|
||||
|
||||
#endif /* DATABASE_H_ @}*/
|
||||
@@ -0,0 +1,119 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#include "database_factory.h"
|
||||
|
||||
#include <utils/linked_list.h>
|
||||
#include <utils/mutex.h>
|
||||
|
||||
typedef struct private_database_factory_t private_database_factory_t;
|
||||
|
||||
/**
|
||||
* private data of database_factory
|
||||
*/
|
||||
struct private_database_factory_t {
|
||||
|
||||
/**
|
||||
* public functions
|
||||
*/
|
||||
database_factory_t public;
|
||||
|
||||
/**
|
||||
* list of registered database_t implementations
|
||||
*/
|
||||
linked_list_t *databases;
|
||||
|
||||
/**
|
||||
* mutex to lock access to databases
|
||||
*/
|
||||
mutex_t *mutex;
|
||||
};
|
||||
|
||||
/**
|
||||
* Implementation of database_factory_t.create.
|
||||
*/
|
||||
static database_t* create(private_database_factory_t *this, char *uri)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
database_t *database = NULL;
|
||||
database_constructor_t create;
|
||||
|
||||
this->mutex->lock(this->mutex);
|
||||
enumerator = this->databases->create_enumerator(this->databases);
|
||||
while (enumerator->enumerate(enumerator, &create))
|
||||
{
|
||||
database = create(uri);
|
||||
if (database)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
this->mutex->unlock(this->mutex);
|
||||
return database;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of database_factory_t.add_database.
|
||||
*/
|
||||
static void add_database(private_database_factory_t *this,
|
||||
database_constructor_t create)
|
||||
{
|
||||
this->mutex->lock(this->mutex);
|
||||
this->databases->insert_last(this->databases, create);
|
||||
this->mutex->unlock(this->mutex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of database_factory_t.remove_database.
|
||||
*/
|
||||
static void remove_database(private_database_factory_t *this,
|
||||
database_constructor_t create)
|
||||
{
|
||||
this->mutex->lock(this->mutex);
|
||||
this->databases->remove(this->databases, create, NULL);
|
||||
this->mutex->unlock(this->mutex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of database_factory_t.destroy
|
||||
*/
|
||||
static void destroy(private_database_factory_t *this)
|
||||
{
|
||||
this->databases->destroy(this->databases);
|
||||
this->mutex->destroy(this->mutex);
|
||||
free(this);
|
||||
}
|
||||
|
||||
/*
|
||||
* see header file
|
||||
*/
|
||||
database_factory_t *database_factory_create()
|
||||
{
|
||||
private_database_factory_t *this = malloc_thing(private_database_factory_t);
|
||||
|
||||
this->public.create = (database_t*(*)(database_factory_t*, char *url))create;
|
||||
this->public.add_database = (void(*)(database_factory_t*, database_constructor_t))add_database;
|
||||
this->public.remove_database = (void(*)(database_factory_t*, database_constructor_t))remove_database;
|
||||
this->public.destroy = (void(*)(database_factory_t*))destroy;
|
||||
|
||||
this->databases = linked_list_create();
|
||||
this->mutex = mutex_create(MUTEX_DEFAULT);
|
||||
|
||||
return &this->public;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup database_factory database_factory
|
||||
* @{ @ingroup database
|
||||
*/
|
||||
|
||||
#ifndef DATABASE_FACTORY_H_
|
||||
#define DATABASE_FACTORY_H_
|
||||
|
||||
typedef struct database_factory_t database_factory_t;
|
||||
|
||||
#include <database/database.h>
|
||||
|
||||
/**
|
||||
* Generic database construction function.
|
||||
*
|
||||
* @param uri implementation specific connection URI
|
||||
*/
|
||||
typedef database_t*(*database_constructor_t)(char *uri);
|
||||
|
||||
/**
|
||||
* Create instances of database connections using registered constructors.
|
||||
*/
|
||||
struct database_factory_t {
|
||||
|
||||
/**
|
||||
* Create a database connection instance.
|
||||
*
|
||||
* @param uri implementation specific connection URI
|
||||
* @return database_t instance, NULL if not supported/failed
|
||||
*/
|
||||
database_t* (*create)(database_factory_t *this, char *uri);
|
||||
|
||||
/**
|
||||
* Register a database constructor.
|
||||
*
|
||||
* @param create database constructor to register
|
||||
*/
|
||||
void (*add_database)(database_factory_t *this, database_constructor_t create);
|
||||
|
||||
/**
|
||||
* Unregister a previously registered database constructor.
|
||||
*
|
||||
* @param create database constructor to unregister
|
||||
*/
|
||||
void (*remove_database)(database_factory_t *this, database_constructor_t create);
|
||||
|
||||
/**
|
||||
* Destroy a database_factory instance.
|
||||
*/
|
||||
void (*destroy)(database_factory_t *this);
|
||||
};
|
||||
|
||||
/**
|
||||
* Create a database_factory instance.
|
||||
*/
|
||||
database_factory_t *database_factory_create();
|
||||
|
||||
#endif /* DATABASE_FACTORY_H_ @}*/
|
||||
Reference in New Issue
Block a user