r17235 - gnucash/branches/gda-dev2/src - Work on doxygen documentation. In the process, a few types were renamed to
Phil Longstaff
plongstaff at cvs.gnucash.org
Mon Jun 16 08:36:45 EDT 2008
Author: plongstaff
Date: 2008-06-16 08:36:44 -0400 (Mon, 16 Jun 2008)
New Revision: 17235
Trac: http://svn.gnucash.org/trac/changeset/17235
Modified:
gnucash/branches/gda-dev2/src/backend/sql/gnc-account-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.h
gnucash/branches/gda-dev2/src/backend/sql/gnc-book-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-budget-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-commodity-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-lots-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-price-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-recurrence-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-schedxaction-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-slots-sql.c
gnucash/branches/gda-dev2/src/backend/sql/gnc-transaction-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-address-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-bill-term-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-customer-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-employee-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-entry-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-invoice-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-job-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-order-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-owner-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-tax-table-sql.c
gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-vendor-sql.c
Log:
Work on doxygen documentation. In the process, a few types were renamed to
be more regular and more descriptive.
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-account-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-account-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-account-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -56,7 +56,7 @@
#define ACCOUNT_MAX_CODE_LEN 2048
#define ACCOUNT_MAX_DESCRIPTION_LEN 2048
-static const col_cvt_t col_table[] =
+static const GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "name", CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, "name" },
@@ -67,7 +67,7 @@
{ "description", CT_STRING, ACCOUNT_MAX_DESCRIPTION_LEN, 0, "description" },
{ NULL }
};
-static col_cvt_t parent_col_table[] =
+static GncSqlColumnTableEntry parent_col_table[] =
{
{ "parent_guid", CT_GUID, 0, 0, NULL, NULL, NULL, set_parent_guid },
{ NULL }
@@ -301,7 +301,7 @@
static void
load_account_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -339,7 +339,7 @@
void
gnc_sql_init_account_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_ACCOUNT,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -67,15 +67,15 @@
static GncSqlStatement* build_insert_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table );
+ const GncSqlColumnTableEntry* table );
static GncSqlStatement* build_update_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table );
+ const GncSqlColumnTableEntry* table );
static GncSqlStatement* build_delete_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table );
+ const GncSqlColumnTableEntry* table );
#define TRANSACTION_NAME "trans"
@@ -113,7 +113,7 @@
static void
create_tables_cb( const gchar* type, gpointer data_p, gpointer be_p )
{
- GncSqlDataType_t* pData = data_p;
+ GncSqlObjectBackend* pData = data_p;
GncSqlBackend* be = be_p;
g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
@@ -132,7 +132,7 @@
static void
initial_load_cb( const gchar* type, gpointer data_p, gpointer be_p )
{
- GncSqlDataType_t* pData = data_p;
+ GncSqlObjectBackend* pData = data_p;
GncSqlBackend* be = be_p;
int i;
@@ -152,7 +152,7 @@
void
gnc_sql_load( GncSqlBackend* be, QofBook *book )
{
- GncSqlDataType_t* pData;
+ GncSqlObjectBackend* pData;
int i;
Account* root;
GError* error = NULL;
@@ -322,7 +322,7 @@
static void
write_cb( const gchar* type, gpointer data_p, gpointer be_p )
{
- GncSqlDataType_t* pData = data_p;
+ GncSqlObjectBackend* pData = data_p;
GncSqlBackend* be = (GncSqlBackend*)be_p;
g_return_if_fail( type != NULL && data_p != NULL && be_p != NULL );
@@ -449,7 +449,7 @@
static void
commit_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
{
- GncSqlDataType_t* pData = data_p;
+ GncSqlObjectBackend* pData = data_p;
sql_backend* be_data = be_data_p;
g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
@@ -631,7 +631,7 @@
static void
compile_query_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
{
- GncSqlDataType_t* pData = data_p;
+ GncSqlObjectBackend* pData = data_p;
sql_backend* be_data = be_data_p;
g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
@@ -718,7 +718,7 @@
static void
free_query_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
{
- GncSqlDataType_t* pData = data_p;
+ GncSqlObjectBackend* pData = data_p;
sql_backend* be_data = be_data_p;
g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
@@ -766,7 +766,7 @@
static void
run_query_cb( const gchar* type, gpointer data_p, gpointer be_data_p )
{
- GncSqlDataType_t* pData = data_p;
+ GncSqlObjectBackend* pData = data_p;
sql_backend* be_data = be_data_p;
g_return_if_fail( type != NULL && pData != NULL && be_data != NULL );
@@ -884,7 +884,7 @@
}
QofAccessFunc
-gnc_sql_get_getter( QofIdTypeConst obj_name, const col_cvt_t* table_row )
+gnc_sql_get_getter( QofIdTypeConst obj_name, const GncSqlColumnTableEntry* table_row )
{
QofAccessFunc getter;
@@ -893,9 +893,9 @@
if( (table_row->flags & COL_AUTOINC) != 0 ) {
getter = get_autoinc_id;
- } else if( table_row->param_name != NULL ) {
+ } else if( table_row->qof_param_name != NULL ) {
getter = qof_class_get_parameter_getter( obj_name,
- table_row->param_name );
+ table_row->qof_param_name );
} else {
getter = table_row->getter;
}
@@ -905,17 +905,17 @@
/* ----------------------------------------------------------------- */
void
-gnc_sql_add_colname_to_list( const col_cvt_t* table_row, GList** pList )
+gnc_sql_add_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
{
(*pList) = g_list_append( (*pList), g_strdup( table_row->col_name ) );
}
/* ----------------------------------------------------------------- */
void
-gnc_sql_add_subtable_colnames_to_list( const col_cvt_t* table_row, const col_cvt_t* subtable,
+gnc_sql_add_subtable_colnames_to_list( const GncSqlColumnTableEntry* table_row, const GncSqlColumnTableEntry* subtable,
GList** pList )
{
- const col_cvt_t* subtable_row;
+ const GncSqlColumnTableEntry* subtable_row;
gchar* buf;
for( subtable_row = subtable; subtable_row->col_name != NULL; subtable_row++ ) {
@@ -925,7 +925,7 @@
}
static GncSqlColumnInfo*
-create_column_info( const col_cvt_t* table_row, const gchar* type,
+create_column_info( const GncSqlColumnTableEntry* table_row, const gchar* type,
gint size )
{
GncSqlColumnInfo* info;
@@ -944,7 +944,7 @@
static void
load_string( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
const gchar* s;
@@ -968,7 +968,7 @@
}
static void
-add_string_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_string_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
@@ -987,7 +987,7 @@
static void
add_gvalue_string_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
gchar* s;
@@ -1029,7 +1029,7 @@
static void
load_int( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gint int_value;
@@ -1055,7 +1055,7 @@
}
static void
-add_int_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_int_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
@@ -1074,7 +1074,7 @@
static void
add_gvalue_int_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
gint int_value;
IntAccessFunc i_getter;
@@ -1108,7 +1108,7 @@
static void
load_boolean( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gint int_value;
@@ -1134,7 +1134,7 @@
}
static void
-add_boolean_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_boolean_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
@@ -1153,7 +1153,7 @@
static void
add_gvalue_boolean_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
gint int_value;
BooleanAccessFunc b_getter;
@@ -1187,7 +1187,7 @@
static void
load_int64( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gint64 i64_value = 0;
@@ -1207,7 +1207,7 @@
}
static void
-add_int64_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_int64_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
@@ -1226,7 +1226,7 @@
static void
add_gvalue_int64_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
gint64 i64_value;
Int64AccessFunc getter;
@@ -1257,7 +1257,7 @@
static void
load_double( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gdouble d_value;
@@ -1281,7 +1281,7 @@
}
static void
-add_double_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_double_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
@@ -1300,7 +1300,7 @@
static void
add_gvalue_double_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
gdouble* pDouble;
@@ -1337,7 +1337,7 @@
static void
load_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -1363,7 +1363,7 @@
}
static void
-add_guid_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_guid_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
@@ -1379,7 +1379,7 @@
static void
add_gvalue_guid_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
const GUID* guid;
@@ -1419,7 +1419,7 @@
void
gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
const GUID* guid = NULL;
@@ -1456,7 +1456,7 @@
void
gnc_sql_add_objectref_guid_col_info_to_list( const GncSqlBackend* be,
- const col_cvt_t* table_row,
+ const GncSqlColumnTableEntry* table_row,
GList** pList )
{
add_guid_col_info_to_list( be, table_row, pList );
@@ -1472,7 +1472,7 @@
static void
load_timespec( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GDate* date;
@@ -1510,7 +1510,7 @@
}
static void
-add_timespec_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_timespec_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
@@ -1526,7 +1526,7 @@
static void
add_gvalue_timespec_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
TimespecAccessFunc ts_getter;
Timespec ts;
@@ -1571,7 +1571,7 @@
static void
load_date( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GDate* date;
@@ -1613,7 +1613,7 @@
}
static void
-add_date_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_date_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
@@ -1630,7 +1630,7 @@
static void
add_gvalue_date_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
const gpointer pObject,
- const col_cvt_t* table_row, GSList** pList )
+ const GncSqlColumnTableEntry* table_row, GSList** pList )
{
GDate* date;
QofAccessFunc getter;
@@ -1662,7 +1662,7 @@
typedef gnc_numeric (*NumericGetterFunc)( const gpointer );
typedef void (*NumericSetterFunc)( gpointer, gnc_numeric );
-static const col_cvt_t numeric_col_table[] =
+static const GncSqlColumnTableEntry numeric_col_table[] =
{
{ "num", CT_INT64, 0, COL_NNUL, "guid" },
{ "denom", CT_INT64, 0, COL_NNUL, "guid" },
@@ -1672,7 +1672,7 @@
static void
load_numeric( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gchar* buf;
@@ -1711,12 +1711,12 @@
}
static void
-add_numeric_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_numeric_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
gchar* buf;
- const col_cvt_t* subtable_row;
+ const GncSqlColumnTableEntry* subtable_row;
const gchar* type;
g_return_if_fail( be != NULL );
@@ -1736,14 +1736,14 @@
}
static void
-add_numeric_colname_to_list( const col_cvt_t* table_row, GList** pList )
+add_numeric_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
{
gnc_sql_add_subtable_colnames_to_list( table_row, numeric_col_table, pList );
}
static void
add_gvalue_numeric_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
NumericGetterFunc getter;
gnc_numeric n;
@@ -1793,7 +1793,7 @@
}
static col_type_handler_t*
-get_handler( const col_cvt_t* table_row )
+get_handler( const GncSqlColumnTableEntry* table_row )
{
col_type_handler_t* pHandler;
@@ -1836,7 +1836,7 @@
// Table to retrieve just the guid
-static col_cvt_t guid_table[] =
+static GncSqlColumnTableEntry guid_table[] =
{
{ "guid", CT_GUID, 0, 0, NULL, NULL, NULL, _retrieve_guid_ },
{ NULL }
@@ -1856,7 +1856,7 @@
}
// Table to retrieve just the guid
-static col_cvt_t tx_guid_table[] =
+static GncSqlColumnTableEntry tx_guid_table[] =
{
{ "tx_guid", CT_GUID, 0, 0, NULL, NULL, NULL, _retrieve_guid_ },
{ NULL }
@@ -1878,7 +1878,7 @@
void
gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
int col;
QofSetterFunc setter;
@@ -1892,9 +1892,9 @@
for( col = 0; table_row[col].col_name != NULL; col++ ) {
if( (table_row[col].flags & COL_AUTOINC) != 0 ) {
setter = set_autoinc_id;
- } else if( table_row[col].param_name != NULL ) {
+ } else if( table_row[col].qof_param_name != NULL ) {
setter = qof_class_get_parameter_setter( obj_name,
- table_row[col].param_name );
+ table_row[col].qof_param_name );
} else {
setter = table_row[col].setter;
}
@@ -1919,7 +1919,7 @@
static GncSqlStatement*
create_single_col_select_statement( const GncSqlBackend* be,
const gchar* table_name,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
gchar* sql;
@@ -2057,7 +2057,7 @@
gboolean
gnc_sql_object_is_it_in_db( GncSqlBackend* be, const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+ const GncSqlColumnTableEntry* table )
{
GncSqlStatement* sqlStmt;
int count;
@@ -2092,7 +2092,7 @@
E_DB_OPERATION op,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+ const GncSqlColumnTableEntry* table )
{
GncSqlStatement* stmt;
@@ -2128,11 +2128,11 @@
static GSList*
create_gslist_from_values( GncSqlBackend* be,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+ const GncSqlColumnTableEntry* table )
{
GSList* list = NULL;
col_type_handler_t* pHandler;
- const col_cvt_t* table_row;
+ const GncSqlColumnTableEntry* table_row;
for( table_row = table; table_row->col_name != NULL; table_row++ ) {
if(( table_row->flags & COL_AUTOINC ) == 0 ) {
@@ -2179,7 +2179,7 @@
build_insert_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+ const GncSqlColumnTableEntry* table )
{
GncSqlStatement* stmt;
GString* sql;
@@ -2220,7 +2220,7 @@
build_update_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+ const GncSqlColumnTableEntry* table )
{
GncSqlStatement* stmt;
GString* sql;
@@ -2229,7 +2229,7 @@
GSList* value;
GList* colname;
gboolean firstCol;
- const col_cvt_t* table_row = table;
+ const GncSqlColumnTableEntry* table_row = table;
gchar* sqlbuf;
g_return_val_if_fail( be != NULL, NULL );
@@ -2284,7 +2284,7 @@
build_delete_statement( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table )
+ const GncSqlColumnTableEntry* table )
{
GncSqlStatement* stmt;
GString* sql;
@@ -2315,7 +2315,7 @@
static gboolean
create_table( const GncSqlBackend* be, const gchar* table_name,
- const col_cvt_t* col_table )
+ const GncSqlColumnTableEntry* col_table )
{
GList* col_info_list = NULL;
@@ -2335,7 +2335,7 @@
gboolean
gnc_sql_create_table( const GncSqlBackend* be, const gchar* table_name,
- gint table_version, const col_cvt_t* col_table )
+ gint table_version, const GncSqlColumnTableEntry* col_table )
{
gboolean ok;
@@ -2349,7 +2349,7 @@
void
gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
const gchar* table_name,
- const col_cvt_t* col_table )
+ const GncSqlColumnTableEntry* col_table )
{
g_return_if_fail( be != NULL );
g_return_if_fail( index_name != NULL );
@@ -2384,7 +2384,7 @@
#define TABLE_COL_NAME "table_name"
#define VERSION_COL_NAME "table_version"
-static col_cvt_t version_table[] =
+static GncSqlColumnTableEntry version_table[] =
{
{ TABLE_COL_NAME, CT_STRING, MAX_TABLE_NAME_LEN },
{ VERSION_COL_NAME, CT_INT },
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.h
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.h 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-backend-sql.h 2008-06-16 12:36:44 UTC (rev 17235)
@@ -63,23 +63,19 @@
*
* Main SQL backend structure.
*/
-struct GncSqlBackend_struct
+struct GncSqlBackend
{
- QofBackend be;
-
- GncSqlConnection* conn;
-
- QofBook *primary_book; /* The primary, main open book */
- gboolean loading; /* We are performing an initial load */
- gboolean in_query;
- gboolean supports_transactions;
- gboolean is_pristine_db; // Are we saving to a new pristine db?
-
- gint obj_total; // Total # of objects (for percentage calculation)
- gint operations_done; // Number of operations (save/load) done
- GHashTable* versions; // Version number for each table
+ QofBackend be; /**< QOF backend */
+ GncSqlConnection* conn; /**< SQL connection */
+ QofBook *primary_book; /**< The primary, main open book */
+ gboolean loading; /**< We are performing an initial load */
+ gboolean in_query; /**< We are processing a query */
+ gboolean is_pristine_db; /**< Are we saving to a new pristine db? */
+ gint obj_total; /**< Total # of objects (for percentage calculation) */
+ gint operations_done; /**< Number of operations (save/load) done */
+ GHashTable* versions; /**< Version number for each table */
};
-typedef struct GncSqlBackend_struct GncSqlBackend;
+typedef struct GncSqlBackend GncSqlBackend;
/**
* Initialize the SQL backend.
@@ -130,7 +126,7 @@
/**
*/
-typedef struct col_cvt col_cvt_t;
+typedef struct GncSqlColumnTableEntry GncSqlColumnTableEntry;
typedef struct GncSqlStatement GncSqlStatement;
typedef struct GncSqlResult GncSqlResult;
typedef struct GncSqlRow GncSqlRow;
@@ -145,7 +141,7 @@
{
void (*dispose)( GncSqlStatement* );
gchar* (*toSql)( GncSqlStatement* );
- void (*addWhereCond)( GncSqlStatement*, QofIdTypeConst, gpointer, const col_cvt_t*, GValue* );
+ void (*addWhereCond)( GncSqlStatement*, QofIdTypeConst, gpointer, const GncSqlColumnTableEntry*, GValue* );
};
#define gnc_sql_statement_dispose(STMT) \
(STMT)->dispose(STMT)
@@ -172,7 +168,7 @@
void (*commitTransaction)( GncSqlConnection* );
const gchar* (*getColumnTypeName)( GncSqlConnection*, GType, gint size );
void (*createTable)( GncSqlConnection*, const gchar*, const GList* );
- void (*createIndex)( GncSqlConnection*, const gchar*, const gchar*, const col_cvt_t* );
+ void (*createIndex)( GncSqlConnection*, const gchar*, const gchar*, const GncSqlColumnTableEntry* );
gchar* (*quoteString)( const GncSqlConnection*, gchar* );
};
#define gnc_sql_connection_dispose(CONN) (CONN)->dispose(CONN)
@@ -238,11 +234,10 @@
(RESULT)->dispose(RESULT)
/**
- * @struct GncSqlDataType_t
+ * @struct GncSqlObjectBackend
*
- * Struct used to pass in a new data type for GDA storage. This contains
- * the set of callbacks to read and write GDA for new data objects.. New
- * types should register an instance of this object with the engine.
+ * Struct used to handle a specific engine object type for an SQL backend.
+ * This * handler should be registered with qof_object_register_backend().
*
* commit() - commit an object to the db
* initial_load() - load stuff when new db opened
@@ -252,29 +247,35 @@
* free_query() - free a compiled query
* write() - write all objects
*/
-#define GNC_SQL_BACKEND "gnc:sql:1"
-#define GNC_SQL_BACKEND_VERSION 1
typedef struct
{
- int version; /* backend version number */
- const gchar * type_name; /* The XML tag for this type */
-
+ int version; /**< Backend version number */
+ const gchar * type_name; /**< Engine object type name */
+ /** Commit an instance of this object to the database */
void (*commit)( QofInstance* inst, GncSqlBackend* be );
+ /** Load all objects of this type from the database */
void (*initial_load)( GncSqlBackend* be );
+ /** Create database tables for this object */
void (*create_tables)( GncSqlBackend* be );
+ /** Compile a query on these objects */
gpointer (*compile_query)( GncSqlBackend* be, QofQuery* pQuery );
+ /** Run a query on these objects */
void (*run_query)( GncSqlBackend* be, gpointer pQuery );
+ /** Free a query on these objects */
void (*free_query)( GncSqlBackend* be, gpointer pQuery );
+ /** Write all objects of this type to the database */
void (*write)( GncSqlBackend* be );
-} GncSqlDataType_t;
+} GncSqlObjectBackend;
+#define GNC_SQL_BACKEND "gnc:sql:1"
+#define GNC_SQL_BACKEND_VERSION 1
/**
* @struct GncSqlColumnInfo
*/
typedef struct {
- const gchar* name;
- const gchar* type_name;
- gint size;
+ const gchar* name; /**< Column name */
+ const gchar* type_name; /**< Column SQL type name */
+ gint size; /**< Column size (string types) */
gboolean is_primary_key;
gboolean null_allowed;
} GncSqlColumnInfo;
@@ -294,19 +295,27 @@
#define CT_TXREF "ct_txref"
#define CT_LOTREF "ct_lotref"
-struct col_cvt {
- const gchar* col_name;
- const gchar* col_type;
- gint size;
+/**
+ * @struct GncSqlColumnTableEntry
+ *
+ * The GncSqlColumnTableEntry struct contains all of the information
+ * required to copy information between an object and the database.
+ * The database description for an object consists of an array of
+ * GncSqlColumnTableEntry objects, with a final member having col_name == NULL.
+ */
+struct GncSqlColumnTableEntry {
+ const gchar* col_name; /**< Column name */
+ const gchar* col_type; /**< Column type */
+ gint size; /**< Column size in bytes, for string columns */
#define COL_PKEY 0x01
#define COL_NNUL 0x02
#define COL_UNIQUE 0x04
#define COL_AUTOINC 0x08
- gint flags;
- const gchar* gobj_param_name; // If non-null, use g_object_get/g_object_set
- const gchar* param_name; // If non null, use qof getter/setter
- QofAccessFunc getter;
- QofSetterFunc setter;
+ gint flags; /**< Column flags */
+ const gchar* gobj_param_name; /**< If non-null, g_object param name */
+ const gchar* qof_param_name; /**< If non-null, qof parameter name */
+ QofAccessFunc getter; /**< General access function */
+ QofSetterFunc setter; /**< General setter function */
};
typedef enum {
@@ -318,14 +327,14 @@
typedef void (*GNC_SQL_LOAD_FN)( const GncSqlBackend* be,
GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table );
+ const GncSqlColumnTableEntry* table );
typedef void (*GNC_SQL_ADD_COL_INFO_TO_LIST_FN)( const GncSqlBackend* be,
- const col_cvt_t* table_row,
+ const GncSqlColumnTableEntry* table_row,
GList** pList );
-typedef void (*GNC_SQL_ADD_COLNAME_TO_LIST_FN)( const col_cvt_t* table_row, GList** pList );
+typedef void (*GNC_SQL_ADD_COLNAME_TO_LIST_FN)( const GncSqlColumnTableEntry* table_row, GList** pList );
typedef void (*GNC_SQL_ADD_GVALUE_TO_SLIST_FN)( const GncSqlBackend* be,
QofIdTypeConst obj_name, const gpointer pObject,
- const col_cvt_t* table_row, GSList** pList );
+ const GncSqlColumnTableEntry* table_row, GSList** pList );
typedef struct {
GNC_SQL_LOAD_FN load_fn;
@@ -341,7 +350,7 @@
* @param table_row DB table column
* @return Access function
*/
-QofAccessFunc gnc_sql_get_getter( QofIdTypeConst obj_name, const col_cvt_t* table_row );
+QofAccessFunc gnc_sql_get_getter( QofIdTypeConst obj_name, const GncSqlColumnTableEntry* table_row );
/**
* Adds a column name to a list. If the column type spans multiple columns,
@@ -350,7 +359,7 @@
* @param table_row DB table column
* @pList List
*/
-void gnc_sql_add_colname_to_list( const col_cvt_t* table_row, GList** pList );
+void gnc_sql_add_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList );
/**
* Performs an operation on the database.
@@ -368,7 +377,7 @@
const gchar* table_name,
QofIdTypeConst obj_name,
gpointer pObject,
- const col_cvt_t* table );
+ const GncSqlColumnTableEntry* table );
/**
* Execute an SQL SELECT statement.
@@ -408,7 +417,7 @@
*/
void gnc_sql_load_object( const GncSqlBackend* be, GncSqlRow* row,
QofIdTypeConst obj_name, gpointer pObject,
- const col_cvt_t* table );
+ const GncSqlColumnTableEntry* table );
/**
* Checks whether an object is in the database or not.
@@ -423,7 +432,7 @@
gboolean gnc_sql_object_is_it_in_db( GncSqlBackend* be,
const gchar* table_name,
QofIdTypeConst obj_name, const gpointer pObject,
- const col_cvt_t* table );
+ const GncSqlColumnTableEntry* table );
/**
* Returns the version number for a DB table.
@@ -444,7 +453,7 @@
* @return TRUE if successful, FALSE if unsuccessful
*/
gboolean gnc_sql_create_table( const GncSqlBackend* be, const gchar* table_name,
- gint table_version, const col_cvt_t* col_table );
+ gint table_version, const GncSqlColumnTableEntry* col_table );
/**
* Creates an index in the database
@@ -455,7 +464,7 @@
* @param col_table Columns that the index should index
*/
void gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
- const gchar* table_name, const col_cvt_t* col_table );
+ const gchar* table_name, const GncSqlColumnTableEntry* col_table );
/**
* Loads the object guid from a database row. The table must have a column
@@ -506,7 +515,7 @@
*/
void gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be,
QofIdTypeConst obj_name, const gpointer pObject,
- const col_cvt_t* table_row, GSList** pList );
+ const GncSqlColumnTableEntry* table_row, GSList** pList );
/**
* Adds a column info structure for an object reference GUID to the end of a
@@ -517,7 +526,7 @@
* @param pList List
*/
void gnc_sql_add_objectref_guid_col_info_to_list( const GncSqlBackend* be,
- const col_cvt_t* table_row, GList** pList );
+ const GncSqlColumnTableEntry* table_row, GList** pList );
/**
* Appends the ascii strings for a list of GUIDs to the end of an SQL string.
@@ -536,8 +545,8 @@
* @param subtable Sub-column description table
* @param pList List
*/
-void gnc_sql_add_subtable_colnames_to_list( const col_cvt_t* table_row,
- const col_cvt_t* subtable,
+void gnc_sql_add_subtable_colnames_to_list( const GncSqlColumnTableEntry* table_row,
+ const GncSqlColumnTableEntry* subtable,
GList** pList );
/**
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-book-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-book-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-book-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -52,7 +52,7 @@
static gpointer get_root_template_guid( gpointer pObject, const QofParam* );
static void set_root_template_guid( gpointer pObject, gpointer pValue );
-static const col_cvt_t col_table[] =
+static const GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "root_account_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_root_account_guid, set_root_account_guid },
@@ -224,7 +224,7 @@
void
gnc_sql_init_book_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_BOOK,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-budget-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-budget-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-budget-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -50,7 +50,7 @@
#define BUDGET_MAX_NAME_LEN 2048
#define BUDGET_MAX_DESCRIPTION_LEN 2048
-static const col_cvt_t col_table[] =
+static const GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "name", CT_STRING, BUDGET_MAX_NAME_LEN, COL_NNUL, NULL, "name" },
@@ -174,7 +174,7 @@
void
gnc_sql_init_budget_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_BUDGET,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-commodity-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-commodity-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-commodity-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -53,7 +53,7 @@
#define COMMODITY_MAX_QUOTESOURCE_LEN 2048
#define COMMODITY_MAX_QUOTE_TZ_LEN 2048
-static const col_cvt_t col_table[] = {
+static const GncSqlColumnTableEntry col_table[] = {
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "namespace", CT_STRING, COMMODITY_MAX_NAMESPACE_LEN, COL_NNUL, NULL, NULL,
(QofAccessFunc)gnc_commodity_get_namespace,
@@ -238,7 +238,7 @@
static void
load_commodity_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -276,7 +276,7 @@
void
gnc_sql_init_commodity_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_COMMODITY,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-lots-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-lots-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-lots-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -47,7 +47,7 @@
static void set_lot_account( gpointer pObject, gpointer pValue );
static void set_lot_is_closed( gpointer pObject, gboolean value );
-static const col_cvt_t col_table[] =
+static const GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "account_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_lot_account, set_lot_account },
@@ -185,7 +185,7 @@
static void
load_lot_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -223,7 +223,7 @@
void
gnc_sql_init_lot_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_LOT,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-price-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-price-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-price-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -47,7 +47,7 @@
#define PRICE_MAX_SOURCE_LEN 2048
#define PRICE_MAX_TYPE_LEN 2048
-static const col_cvt_t col_table[] =
+static const GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, PRICE_COMMODITY },
@@ -185,7 +185,7 @@
void
gnc_sql_init_price_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_PRICE,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-recurrence-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-recurrence-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-recurrence-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -60,7 +60,7 @@
static gpointer get_recurrence_period_start( gpointer pObject, const QofParam* );
static void set_recurrence_period_start( gpointer pObject, gpointer pValue );
-static const col_cvt_t col_table[] =
+static const GncSqlColumnTableEntry col_table[] =
{
{ "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
get_obj_guid, set_obj_guid },
@@ -75,7 +75,7 @@
/* Special column table because we need to be able to access the table by
a column other than the primary key */
-static const col_cvt_t guid_col_table[] =
+static const GncSqlColumnTableEntry guid_col_table[] =
{
{ "obj_guid", CT_GUID, 0, 0, NULL, NULL, get_obj_guid, set_obj_guid },
{ NULL }
@@ -328,7 +328,7 @@
void
gnc_sql_init_recurrence_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_ACCOUNT,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-schedxaction-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-schedxaction-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-schedxaction-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -58,7 +58,7 @@
static gpointer get_template_act_guid( gpointer pObject, const QofParam* param );
static void set_template_act_guid( gpointer pObject, gpointer pValue );
-static const col_cvt_t col_table[] =
+static const GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "name", CT_STRING, SX_MAX_NAME_LEN, 0, NULL, GNC_SX_NAME },
@@ -294,7 +294,7 @@
void
gnc_sql_init_schedxaction_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_SCHEDXACTION,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-slots-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-slots-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-slots-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -73,7 +73,7 @@
#define SLOT_MAX_PATHNAME_LEN 4096
#define SLOT_MAX_STRINGVAL_LEN 4096
-static const col_cvt_t col_table[] =
+static const GncSqlColumnTableEntry col_table[] =
{
{ "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
get_obj_guid, set_obj_guid },
@@ -98,7 +98,7 @@
/* Special column table because we need to be able to access the table by
a column other than the primary key */
-static const col_cvt_t obj_guid_col_table[] =
+static const GncSqlColumnTableEntry obj_guid_col_table[] =
{
{ "obj_guid", CT_GUID, 0, 0, NULL, NULL, get_obj_guid, _retrieve_guid_ },
{ NULL }
@@ -553,7 +553,7 @@
void
gnc_sql_init_slots_handler( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_ACCOUNT,
Modified: gnucash/branches/gda-dev2/src/backend/sql/gnc-transaction-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/sql/gnc-transaction-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/backend/sql/gnc-transaction-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -61,7 +61,7 @@
#define TX_MAX_NUM_LEN 2048
#define TX_MAX_DESCRIPTION_LEN 2048
-static const col_cvt_t tx_col_table[] =
+static const GncSqlColumnTableEntry tx_col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
@@ -84,7 +84,7 @@
#define SPLIT_MAX_MEMO_LEN 2048
#define SPLIT_MAX_ACTION_LEN 2048
-static const col_cvt_t split_col_table[] =
+static const GncSqlColumnTableEntry split_col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "tx_guid", CT_TXREF, 0, COL_NNUL, NULL, SPLIT_TRANS },
@@ -100,7 +100,7 @@
{ NULL }
};
-static const col_cvt_t guid_col_table[] =
+static const GncSqlColumnTableEntry guid_col_table[] =
{
{ "tx_guid", CT_GUID, 0, 0, "guid" },
{ NULL }
@@ -158,7 +158,7 @@
// Table to retrieve just the quantity
-static col_cvt_t quantity_table[] =
+static GncSqlColumnTableEntry quantity_table[] =
{
{ "quantity", CT_NUMERIC, 0, COL_NNUL, NULL, NULL, NULL, (QofSetterFunc)retrieve_numeric_value },
{ NULL }
@@ -655,7 +655,7 @@
static void
load_tx_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -693,7 +693,7 @@
void
gnc_sql_init_transaction_handler( void )
{
- static GncSqlDataType_t be_data_tx =
+ static GncSqlObjectBackend be_data_tx =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_TRANS,
@@ -701,7 +701,7 @@
load_all_tx, /* initial_load */
create_transaction_tables /* create tables */
};
- static GncSqlDataType_t be_data_split =
+ static GncSqlObjectBackend be_data_split =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_SPLIT,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-address-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-address-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-address-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -47,7 +47,7 @@
#define ADDRESS_MAX_FAX_LEN 128
#define ADDRESS_MAX_EMAIL_LEN 256
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "name", CT_STRING, ADDRESS_MAX_NAME_LEN, COL_NNUL, NULL, ADDRESS_NAME },
{ "addr1", CT_STRING, ADDRESS_MAX_ADDRESS_LINE_LEN, COL_NNUL, NULL, ADDRESS_ONE },
@@ -66,13 +66,13 @@
static void
load_address( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gchar* buf;
GncAddress* addr;
AddressSetterFunc a_setter = (AddressSetterFunc)setter;
- const col_cvt_t* subtable;
+ const GncSqlColumnTableEntry* subtable;
const gchar* s;
g_return_if_fail( be != NULL );
@@ -93,8 +93,8 @@
if( subtable->gobj_param_name != NULL ) {
g_object_set( addr, subtable->gobj_param_name, s, NULL );
} else {
- if( subtable->param_name != NULL ) {
- setter = qof_class_get_parameter_setter( GNC_ID_ADDRESS, subtable->param_name );
+ if( subtable->qof_param_name != NULL ) {
+ setter = qof_class_get_parameter_setter( GNC_ID_ADDRESS, subtable->qof_param_name );
} else {
setter = subtable->setter;
}
@@ -105,12 +105,12 @@
}
static void
-add_address_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_address_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
gchar* buf;
- const col_cvt_t* subtable_row;
+ const GncSqlColumnTableEntry* subtable_row;
const gchar* type;
g_return_if_fail( be != NULL );
@@ -130,14 +130,14 @@
}
static void
-add_address_colname_to_list( const col_cvt_t* table_row, GList** pList )
+add_address_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
{
gnc_sql_add_subtable_colnames_to_list( table_row, col_table, pList );
}
static void
get_gvalue_address( const GncSqlBackend* be, QofIdTypeConst obj_name, const gpointer pObject,
- const col_cvt_t* table_row, GValue* value )
+ const GncSqlColumnTableEntry* table_row, GValue* value )
{
AddressGetterFunc getter;
GncAddress* addr;
@@ -158,14 +158,14 @@
static void
add_gvalue_address_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
GValue value;
GValue* subfield_value;
GncAddress* addr;
gchar* s;
QofAccessFunc getter;
- const col_cvt_t* subtable_row;
+ const GncSqlColumnTableEntry* subtable_row;
gchar* buf;
g_return_if_fail( be != NULL );
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-bill-term-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-bill-term-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-bill-term-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -55,7 +55,7 @@
#define TABLE_NAME "billterms"
#define TABLE_VERSION 1
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, GNC_BILLTERM_NAME },
@@ -186,7 +186,7 @@
static void
load_billterm_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -224,7 +224,7 @@
void
gnc_billterm_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_BILLTERM,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-customer-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-customer-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-customer-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -56,7 +56,7 @@
#define MAX_ID_LEN 2048
#define MAX_NOTES_LEN 2048
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, CUSTOMER_NAME },
@@ -206,7 +206,7 @@
void
gnc_customer_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_CUSTOMER,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-employee-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-employee-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-employee-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -56,7 +56,7 @@
#define TABLE_NAME "employees"
#define TABLE_VERSION 1
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "username", CT_STRING, MAX_USERNAME_LEN, COL_NNUL, NULL, EMPLOYEE_USERNAME },
@@ -205,7 +205,7 @@
void
gnc_employee_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_EMPLOYEE,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-entry-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-entry-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-entry-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -59,7 +59,7 @@
#define MAX_DISCTYPE_LEN 2048
#define MAX_DISCHOW_LEN 2048
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "date", CT_TIMESPEC, 0, COL_NNUL, NULL, ENTRY_DATE },
@@ -212,7 +212,7 @@
void
gnc_entry_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_ENTRY,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-invoice-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-invoice-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-invoice-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -57,7 +57,7 @@
#define MAX_NOTES_LEN 2048
#define MAX_BILLING_ID_LEN 2048
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, INVOICE_ID },
@@ -214,7 +214,7 @@
static void
load_invoice_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -252,7 +252,7 @@
void
gnc_invoice_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_INVOICE,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-job-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-job-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-job-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -52,7 +52,7 @@
#define MAX_NAME_LEN 2048
#define MAX_REFERENCE_LEN 2048
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, JOB_ID },
@@ -193,7 +193,7 @@
void
gnc_job_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_JOB,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-order-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-order-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-order-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -53,7 +53,7 @@
#define MAX_NOTES_LEN 2048
#define MAX_REFERENCE_LEN 2048
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, ORDER_ID },
@@ -194,7 +194,7 @@
static void
load_order_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -232,7 +232,7 @@
void
gnc_order_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_ORDER,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-owner-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-owner-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-owner-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -50,7 +50,7 @@
static void
load_owner( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
gchar* buf;
@@ -136,12 +136,11 @@
}
static void
-add_owner_col_info_to_list( const GncSqlBackend* be, const col_cvt_t* table_row,
+add_owner_col_info_to_list( const GncSqlBackend* be, const GncSqlColumnTableEntry* table_row,
GList** pList )
{
GncSqlColumnInfo* info;
gchar* buf;
- const col_cvt_t* subtable_row;
const gchar* type;
g_return_if_fail( be != NULL );
@@ -168,7 +167,7 @@
}
static void
-add_colname_to_list( const col_cvt_t* table_row, GList** pList )
+add_colname_to_list( const GncSqlColumnTableEntry* table_row, GList** pList )
{
gchar* buf;
@@ -180,7 +179,7 @@
static void
add_gvalue_owner_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
- const gpointer pObject, const col_cvt_t* table_row, GSList** pList )
+ const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
GValue* subfield_value;
GncOwner* owner;
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-tax-table-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-tax-table-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-tax-table-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -63,7 +63,7 @@
#define TT_TABLE_NAME "taxtables"
#define TT_TABLE_VERSION 1
-static col_cvt_t tt_col_table[] =
+static GncSqlColumnTableEntry tt_col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, GNC_TT_NAME },
@@ -80,7 +80,7 @@
#define TTENTRIES_TABLE_NAME "taxtable_entries"
#define TTENTRIES_TABLE_VERSION 1
-static col_cvt_t ttentries_col_table[] =
+static GncSqlColumnTableEntry ttentries_col_table[] =
{
{ "taxtable", CT_TAXTABLEREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncTaxTableEntryGetTable, set_obj_guid },
@@ -95,7 +95,7 @@
/* Special column table because we need to be able to access the table by
a column other than the primary key */
-static col_cvt_t guid_col_table[] =
+static GncSqlColumnTableEntry guid_col_table[] =
{
{ "taxtable", CT_GUID, 0, 0, NULL, NULL, get_obj_guid, set_obj_guid },
{ NULL }
@@ -342,7 +342,7 @@
static void
load_taxtable_guid( const GncSqlBackend* be, GncSqlRow* row,
QofSetterFunc setter, gpointer pObject,
- const col_cvt_t* table_row )
+ const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
@@ -380,7 +380,7 @@
void
gnc_taxtable_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_TAXTABLE,
Modified: gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-vendor-sql.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-vendor-sql.c 2008-06-15 00:52:12 UTC (rev 17234)
+++ gnucash/branches/gda-dev2/src/business/business-core/sql/gnc-vendor-sql.c 2008-06-16 12:36:44 UTC (rev 17235)
@@ -61,7 +61,7 @@
#define TABLE_NAME "vendors"
#define TABLE_VERSION 1
-static col_cvt_t col_table[] =
+static GncSqlColumnTableEntry col_table[] =
{
{ "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
{ "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, VENDOR_NAME },
@@ -211,7 +211,7 @@
void
gnc_vendor_sql_initialize( void )
{
- static GncSqlDataType_t be_data =
+ static GncSqlObjectBackend be_data =
{
GNC_SQL_BACKEND_VERSION,
GNC_ID_VENDOR,
More information about the gnucash-changes
mailing list