r16944 - gnucash/branches/gda-dev2/src - 1) Remove (internal) requirement that the first field of every table be the
Phil Longstaff
plongstaff at cvs.gnucash.org
Sun Feb 17 16:32:30 EST 2008
Author: plongstaff
Date: 2008-02-17 16:32:29 -0500 (Sun, 17 Feb 2008)
New Revision: 16944
Trac: http://svn.gnucash.org/trac/changeset/16944
Modified:
gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.h
gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-budget-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-commodity-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-lots-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-price-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-recurrence-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-slots-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-address-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-customer-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-employee-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-entry-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-invoice-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-job-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-order-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-owner-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-tax-table-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-vendor-gda.c
Log:
1) Remove (internal) requirement that the first field of every table be the
primary key and replace with explicit primary keys.
2) Remove auto-increment key fields for slots, recurrences and tax table
entries tables.
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -58,13 +58,13 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, "name" },
- { "account_type", CT_STRING, ACCOUNT_MAX_TYPE_LEN, COL_NNUL, NULL, ACCOUNT_TYPE_ },
- { "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, "commodity" },
- { "parent_guid", CT_GUID, 0, 0, NULL, NULL, get_parent, set_parent },
- { "code", CT_STRING, ACCOUNT_MAX_CODE_LEN, 0, "code" },
- { "description", CT_STRING, ACCOUNT_MAX_DESCRIPTION_LEN, 0, "description" },
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "name", CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, "name" },
+ { "account_type", CT_STRING, ACCOUNT_MAX_TYPE_LEN, COL_NNUL, NULL, ACCOUNT_TYPE_ },
+ { "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, "commodity" },
+ { "parent_guid", CT_GUID, 0, 0, NULL, NULL, get_parent, set_parent },
+ { "code", CT_STRING, ACCOUNT_MAX_CODE_LEN, 0, "code" },
+ { "description", CT_STRING, ACCOUNT_MAX_DESCRIPTION_LEN, 0, "description" },
{ NULL }
};
static col_cvt_t parent_col_table[] =
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -235,7 +235,7 @@
static void
create_string_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
@@ -247,7 +247,7 @@
dbms_type = gda_server_provider_get_default_dbms_type( server,
cnn, G_TYPE_STRING );
gnc_gda_add_table_column( server, cnn, array_data, table_row->col_name,
- dbms_type, table_row->size, table_row->flags | (pkey ? COL_PKEY : 0) );
+ dbms_type, table_row->size, table_row->flags );
}
static col_type_handler_t string_handler
@@ -337,7 +337,7 @@
static void
create_int_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
@@ -349,7 +349,7 @@
dbms_type = gda_server_provider_get_default_dbms_type( server,
cnn, G_TYPE_INT );
gnc_gda_add_table_column( server, cnn, array_data, table_row->col_name,
- dbms_type, table_row->size, table_row->flags | (pkey ? COL_PKEY : 0) );
+ dbms_type, table_row->size, table_row->flags );
}
static col_type_handler_t int_handler =
@@ -439,7 +439,7 @@
static void
create_boolean_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
@@ -451,7 +451,7 @@
dbms_type = gda_server_provider_get_default_dbms_type( server,
cnn, G_TYPE_INT );
gnc_gda_add_table_column( server, cnn, array_data, table_row->col_name,
- dbms_type, table_row->size, table_row->flags | (pkey ? COL_PKEY : 0) );
+ dbms_type, table_row->size, table_row->flags );
}
static col_type_handler_t boolean_handler =
@@ -540,7 +540,7 @@
static void
create_int64_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
@@ -552,7 +552,7 @@
dbms_type = gda_server_provider_get_default_dbms_type( server,
cnn, G_TYPE_INT64 );
gnc_gda_add_table_column( server, cnn, array_data, table_row->col_name,
- dbms_type, table_row->size, table_row->flags | (pkey ? COL_PKEY : 0) );
+ dbms_type, table_row->size, table_row->flags );
}
static col_type_handler_t int64_handler =
@@ -642,7 +642,7 @@
static void
create_double_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
@@ -654,7 +654,7 @@
dbms_type = gda_server_provider_get_default_dbms_type( server,
cnn, G_TYPE_INT64 );
gnc_gda_add_table_column( server, cnn, array_data, table_row->col_name,
- dbms_type, table_row->size, table_row->flags | (pkey ? COL_PKEY : 0) );
+ dbms_type, table_row->size, table_row->flags );
}
static col_type_handler_t double_handler =
@@ -754,7 +754,7 @@
static void
create_guid_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
g_return_if_fail( server != NULL );
g_return_if_fail( cnn != NULL );
@@ -762,7 +762,7 @@
g_return_if_fail( table_row != NULL );
gnc_gda_add_table_column( server, cnn, array_data, table_row->col_name,
- "char", GUID_ENCODING_LENGTH, table_row->flags | (pkey ? COL_PKEY : 0) );
+ "char", GUID_ENCODING_LENGTH, table_row->flags );
}
static col_type_handler_t guid_handler =
@@ -837,7 +837,7 @@
void
gnc_gda_create_objectref_guid_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
g_return_if_fail( server != NULL );
g_return_if_fail( cnn != NULL );
@@ -845,7 +845,7 @@
g_return_if_fail( table_row != NULL );
gnc_gda_add_table_column( server, cnn, array_data, table_row->col_name,
- "char", GUID_ENCODING_LENGTH, table_row->flags | (pkey ? COL_PKEY : 0) );
+ "char", GUID_ENCODING_LENGTH, table_row->flags );
}
/* ----------------------------------------------------------------- */
@@ -958,7 +958,7 @@
static void
create_timespec_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
@@ -970,7 +970,7 @@
dbms_type = gda_server_provider_get_default_dbms_type( server,
cnn, G_TYPE_DATE );
gnc_gda_add_table_column( server, cnn, array_data, table_row->col_name,
- dbms_type, table_row->size, table_row->flags | (pkey ? COL_PKEY : 0) );
+ dbms_type, table_row->size, table_row->flags );
}
static col_type_handler_t timespec_handler =
@@ -1253,7 +1253,7 @@
static void
create_numeric_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
gchar* buf;
@@ -1852,7 +1852,7 @@
col_type_handler_t* pHandler;
pHandler = get_handler( col_table[col].col_type );
- pHandler->create_col_fn( server, cnn, array_data, &col_table[col], col == 0 );
+ pHandler->create_col_fn( server, cnn, array_data, &col_table[col] );
}
if( !gda_server_operation_load_data_from_xml(op, root, error ) ) {
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.h
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.h 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.h 2008-02-17 21:32:29 UTC (rev 16944)
@@ -121,8 +121,8 @@
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table );
typedef void (*GNC_GDA_CREATE_COL_FN)( GdaServerProvider* server,
- GdaConnection* cnn, xmlNodePtr array_data,
- const col_cvt_t* table_row, gboolean pkey );
+ GdaConnection* cnn, xmlNodePtr array_data,
+ const col_cvt_t* table_row );
typedef void (*GNC_GDA_GET_GVALUE_QUERY_FN)( const GncGdaBackend* be,
QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GdaQuery* query );
@@ -195,7 +195,7 @@
GdaQueryCondition* gnc_gda_get_gvalue_objectref_guid_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query );
void gnc_gda_create_objectref_guid_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey );
+ xmlNodePtr array_data, const col_cvt_t* table_row );
void gnc_gda_append_guid_list_to_sql( GString* str, GList* list );
void _retrieve_guid_( gpointer pObject, gpointer pValue );
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -54,9 +54,9 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "root_account_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_root_account_guid, set_root_account_guid },
- { "root_template_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_root_template_guid, set_root_template_guid },
+ { "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 },
+ { "root_template_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_root_template_guid, set_root_template_guid },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-budget-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-budget-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-budget-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -52,10 +52,10 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, BUDGET_MAX_NAME_LEN, COL_NNUL, NULL, "name" },
- { "description", CT_STRING, BUDGET_MAX_DESCRIPTION_LEN, 0, NULL, "description" },
- { "num_periods", CT_INT, 0, COL_NNUL, NULL, "num_periods" },
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "name", CT_STRING, BUDGET_MAX_NAME_LEN, COL_NNUL, NULL, "name" },
+ { "description", CT_STRING, BUDGET_MAX_DESCRIPTION_LEN, 0, NULL, "description" },
+ { "num_periods", CT_INT, 0, COL_NNUL, NULL, "num_periods" },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-commodity-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-commodity-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-commodity-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -57,28 +57,28 @@
#define COMMODITY_MAX_QUOTE_TZ_LEN 50
static col_cvt_t col_table[] = {
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "namespace", CT_STRING, COMMODITY_MAX_NAMESPACE_LEN, COL_NNUL, NULL, NULL,
+ { "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,
(QofSetterFunc)gnc_commodity_set_namespace },
- { "mnemonic", CT_STRING, COMMODITY_MAX_MNEMONIC_LEN, COL_NNUL, NULL, NULL,
+ { "mnemonic", CT_STRING, COMMODITY_MAX_MNEMONIC_LEN, COL_NNUL, NULL, NULL,
(QofAccessFunc)gnc_commodity_get_mnemonic,
(QofSetterFunc)gnc_commodity_set_mnemonic },
- { "fullname", CT_STRING, COMMODITY_MAX_FULLNAME_LEN, COL_NNUL, NULL, NULL,
+ { "fullname", CT_STRING, COMMODITY_MAX_FULLNAME_LEN, COL_NNUL, NULL, NULL,
(QofAccessFunc)gnc_commodity_get_fullname,
(QofSetterFunc)gnc_commodity_set_fullname },
- { "cusip", CT_STRING, COMMODITY_MAX_CUSIP_LEN, 0, NULL, NULL,
+ { "cusip", CT_STRING, COMMODITY_MAX_CUSIP_LEN, 0, NULL, NULL,
(QofAccessFunc)gnc_commodity_get_cusip,
(QofSetterFunc)gnc_commodity_set_cusip },
- { "fraction", CT_INT, 0, COL_NNUL, NULL, NULL,
+ { "fraction", CT_INT, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gnc_commodity_get_fraction,
(QofSetterFunc)gnc_commodity_set_fraction },
- { "quote_flag", CT_INT, 0, COL_NNUL, NULL, NULL,
+ { "quote_flag", CT_INT, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gnc_commodity_get_quote_flag,
(QofSetterFunc)gnc_commodity_set_quote_flag },
- { "quote_source", CT_STRING, COMMODITY_MAX_QUOTESOURCE_LEN, 0, NULL, NULL,
+ { "quote_source", CT_STRING, COMMODITY_MAX_QUOTESOURCE_LEN, 0, NULL, NULL,
get_quote_source_name, set_quote_source_name },
- { "quote_tz", CT_STRING, COMMODITY_MAX_QUOTE_TZ_LEN, 0, NULL, NULL,
+ { "quote_tz", CT_STRING, COMMODITY_MAX_QUOTE_TZ_LEN, 0, NULL, NULL,
(QofAccessFunc)gnc_commodity_get_quote_tz,
(QofSetterFunc)gnc_commodity_set_quote_tz },
{ NULL }
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-lots-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-lots-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-lots-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -49,9 +49,9 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "account_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_lot_account, set_lot_account },
- { "is_closed", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL, (QofAccessFunc)gnc_lot_is_closed, set_lot_is_closed },
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "account_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_lot_account, set_lot_account },
+ { "is_closed", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL, (QofAccessFunc)gnc_lot_is_closed, set_lot_is_closed },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-price-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-price-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-price-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -49,13 +49,13 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, PRICE_COMMODITY },
- { "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, PRICE_CURRENCY },
- { "date", CT_TIMESPEC, 0, COL_NNUL, NULL, PRICE_DATE },
- { "source", CT_STRING, PRICE_MAX_SOURCE_LEN, 0, NULL, PRICE_SOURCE },
- { "type", CT_STRING, PRICE_MAX_TYPE_LEN, 0, NULL, PRICE_TYPE },
- { "value", CT_NUMERIC, 0, COL_NNUL, NULL, PRICE_VALUE },
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, PRICE_COMMODITY },
+ { "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, PRICE_CURRENCY },
+ { "date", CT_TIMESPEC, 0, COL_NNUL, NULL, PRICE_DATE },
+ { "source", CT_STRING, PRICE_MAX_SOURCE_LEN, 0, NULL, PRICE_SOURCE },
+ { "type", CT_STRING, PRICE_MAX_TYPE_LEN, 0, NULL, PRICE_TYPE },
+ { "value", CT_NUMERIC, 0, COL_NNUL, NULL, PRICE_VALUE },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-recurrence-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-recurrence-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-recurrence-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -62,14 +62,13 @@
static col_cvt_t col_table[] =
{
- { "recurrence_id", CT_INT, 0, COL_NNUL|COL_AUTOINC },
- { "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
+ { "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
get_obj_guid, set_obj_guid },
- { "recurrence_mult", CT_INT, 0, COL_NNUL, NULL, NULL,
+ { "recurrence_mult", CT_INT, 0, COL_NNUL, NULL, NULL,
get_recurrence_mult, set_recurrence_mult },
- { "recurrence_period_type", CT_STRING, BUDGET_MAX_RECURRENCE_PERIOD_TYPE_LEN, COL_NNUL, NULL, NULL,
+ { "recurrence_period_type", CT_STRING, BUDGET_MAX_RECURRENCE_PERIOD_TYPE_LEN, COL_NNUL, NULL, NULL,
get_recurrence_period_type, set_recurrence_period_type },
- { "recurrence_period_start", CT_GDATE, 0, COL_NNUL, NULL, NULL,
+ { "recurrence_period_start", CT_GDATE, 0, COL_NNUL, NULL, NULL,
get_recurrence_period_start, set_recurrence_period_start },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -59,21 +59,24 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, SX_MAX_NAME_LEN, 0, NULL, GNC_SX_NAME },
- { "start_date", CT_GDATE, 0, COL_NNUL, NULL, GNC_SX_START_DATE },
- { "last_occur", CT_GDATE, 0, 0, NULL, GNC_SX_LAST_DATE },
- { "num_occur", CT_INT, 0, COL_NNUL, NULL, GNC_SX_NUM_OCCUR },
- { "rem_occur", CT_INT, 0, COL_NNUL, NULL, GNC_SX_REM_OCCUR },
- { "auto_create", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL, get_autocreate, set_autocreate },
- { "auto_notify", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL, get_autonotify, set_autonotify },
- { "adv_creation", CT_INT, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "name", CT_STRING, SX_MAX_NAME_LEN, 0, NULL, GNC_SX_NAME },
+ { "start_date", CT_GDATE, 0, COL_NNUL, NULL, GNC_SX_START_DATE },
+ { "last_occur", CT_GDATE, 0, 0, NULL, GNC_SX_LAST_DATE },
+ { "num_occur", CT_INT, 0, COL_NNUL, NULL, GNC_SX_NUM_OCCUR },
+ { "rem_occur", CT_INT, 0, COL_NNUL, NULL, GNC_SX_REM_OCCUR },
+ { "auto_create", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
+ get_autocreate, set_autocreate },
+ { "auto_notify", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
+ get_autonotify, set_autonotify },
+ { "adv_creation", CT_INT, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)xaccSchedXactionGetAdvanceCreation,
(QofSetterFunc)xaccSchedXactionSetAdvanceCreation },
- { "adv_notify", CT_INT, 0, COL_NNUL, NULL, NULL,
+ { "adv_notify", CT_INT, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)xaccSchedXactionGetAdvanceReminder,
(QofSetterFunc)xaccSchedXactionSetAdvanceReminder },
- { "template_act_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_template_act_guid, set_template_act_guid },
+ { "template_act_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
+ get_template_act_guid, set_template_act_guid },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-slots-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-slots-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-slots-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -75,17 +75,23 @@
static col_cvt_t col_table[] =
{
- { "slot_id", CT_INT, 0, COL_NNUL|COL_AUTOINC },
- { "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_obj_guid, set_obj_guid },
- { "name", CT_STRING, SLOT_MAX_PATHNAME_LEN, COL_NNUL, NULL, NULL, get_path, set_path },
- { "slot_type", CT_INT, 0, COL_NNUL, NULL, NULL, get_slot_type, set_slot_type, },
- { "int64_val", CT_INT64, 0, 0, NULL, NULL, get_int64_val, set_int64_val },
- { "string_val", CT_STRING, SLOT_MAX_PATHNAME_LEN, 0, NULL, NULL, get_string_val, set_string_val },
- { "double_val", CT_DOUBLE, 0, 0, NULL, NULL, get_double_val, set_double_val },
- { "timespec_val", CT_TIMESPEC, 0, 0, NULL, NULL,
+ { "obj_guid", CT_GUID, 0, COL_NNUL, NULL, NULL,
+ get_obj_guid, set_obj_guid },
+ { "name", CT_STRING, SLOT_MAX_PATHNAME_LEN, COL_NNUL, NULL, NULL,
+ get_path, set_path },
+ { "slot_type", CT_INT, 0, COL_NNUL, NULL, NULL,
+ get_slot_type, set_slot_type, },
+ { "int64_val", CT_INT64, 0, 0, NULL, NULL,
+ get_int64_val, set_int64_val },
+ { "string_val", CT_STRING, SLOT_MAX_PATHNAME_LEN, 0, NULL, NULL,
+ get_string_val, set_string_val },
+ { "double_val", CT_DOUBLE, 0, 0, NULL, NULL,
+ get_double_val, set_double_val },
+ { "timespec_val", CT_TIMESPEC, 0, 0, NULL, NULL,
(QofAccessFunc)get_timespec_val, (QofSetterFunc)set_timespec_val },
- { "guid_val", CT_GUID, 0, 0, NULL, NULL, get_guid_val, set_guid_val },
- { "numeric_val", CT_NUMERIC, 0, 0, NULL, NULL,
+ { "guid_val", CT_GUID, 0, 0, NULL, NULL,
+ get_guid_val, set_guid_val },
+ { "numeric_val", CT_NUMERIC, 0, 0, NULL, NULL,
(QofAccessFunc)get_numeric_val, (QofSetterFunc)set_numeric_val },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -62,15 +62,15 @@
static col_cvt_t tx_col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)xaccTransGetCurrency, (QofSetterFunc)xaccTransSetCurrency },
- { "num", CT_STRING, TX_MAX_NUM_LEN, COL_NNUL, NULL, TRANS_NUM },
- { "post_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL,
+ { "num", CT_STRING, TX_MAX_NUM_LEN, COL_NNUL, NULL, TRANS_NUM },
+ { "post_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)xaccTransRetDatePostedTS, (QofSetterFunc)gnc_transaction_set_date_posted },
- { "enter_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL,
+ { "enter_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)xaccTransRetDateEnteredTS, (QofSetterFunc)gnc_transaction_set_date_entered },
- { "description", CT_STRING, TX_MAX_DESCRIPTION_LEN, 0, NULL, NULL,
+ { "description", CT_STRING, TX_MAX_DESCRIPTION_LEN, 0, NULL, NULL,
(QofAccessFunc)xaccTransGetDescription, (QofSetterFunc)xaccTransSetDescription },
{ NULL }
};
@@ -84,16 +84,17 @@
static col_cvt_t split_col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "tx_guid", CT_TXREF, 0, COL_NNUL, NULL, SPLIT_TRANS },
- { "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, NULL, SPLIT_ACCOUNT },
- { "memo", CT_STRING, SPLIT_MAX_MEMO_LEN, COL_NNUL, NULL, SPLIT_MEMO },
- { "action", CT_STRING, SPLIT_MAX_ACTION_LEN, COL_NNUL, NULL, SPLIT_ACTION },
- { "reconcile_state", CT_STRING, 1, COL_NNUL, NULL, NULL, get_split_reconcile_state, set_split_reconcile_state },
- { "reconcile_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "tx_guid", CT_TXREF, 0, COL_NNUL, NULL, SPLIT_TRANS },
+ { "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, NULL, SPLIT_ACCOUNT },
+ { "memo", CT_STRING, SPLIT_MAX_MEMO_LEN, COL_NNUL, NULL, SPLIT_MEMO },
+ { "action", CT_STRING, SPLIT_MAX_ACTION_LEN, COL_NNUL, NULL, SPLIT_ACTION },
+ { "reconcile_state", CT_STRING, 1, COL_NNUL, NULL, NULL,
+ get_split_reconcile_state, set_split_reconcile_state },
+ { "reconcile_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)xaccSplitRetDateReconciledTS, (QofSetterFunc)set_split_reconcile_date },
- { "value", CT_NUMERIC, 0, COL_NNUL, NULL, SPLIT_VALUE },
- { "quantity", CT_NUMERIC, 0, COL_NNUL, NULL, SPLIT_AMOUNT },
+ { "value", CT_NUMERIC, 0, COL_NNUL, NULL, SPLIT_VALUE },
+ { "quantity", CT_NUMERIC, 0, COL_NNUL, NULL, SPLIT_AMOUNT },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-address-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-address-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-address-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -222,7 +222,7 @@
static void
create_address_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
gchar* buf;
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -50,22 +50,22 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, GNC_BILLTERM_NAME },
- { "description", CT_STRING, MAX_DESCRIPTION_LEN, COL_NNUL, NULL, GNC_BILLTERM_DESC },
- { "refcount", CT_INT, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, GNC_BILLTERM_NAME },
+ { "description", CT_STRING, MAX_DESCRIPTION_LEN, COL_NNUL, NULL, GNC_BILLTERM_DESC },
+ { "refcount", CT_INT, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncBillTermGetRefcount, (QofSetterFunc)gncBillTermSetRefcount },
- { "invisible", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
+ { "invisible", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncBillTermGetInvisible, (QofSetterFunc)set_invisible },
- { "parent", CT_BILLTERMREF, 0, 0, NULL, NULL,
+ { "parent", CT_BILLTERMREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncBillTermGetParent, (QofSetterFunc)gncBillTermSetParent },
- { "child", CT_BILLTERMREF, 0, 0, NULL, NULL,
+ { "child", CT_BILLTERMREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncBillTermReturnChild, (QofSetterFunc)gncBillTermSetChild },
- { "type", CT_STRING, MAX_TYPE_LEN, COL_NNUL, NULL, GNC_BILLTERM_TYPE },
- { "duedays", CT_INT, 0, 0, 0, GNC_BILLTERM_DUEDAYS },
- { "discountdays", CT_INT, 0, 0, 0, GNC_BILLTERM_DISCDAYS },
- { "discount", CT_NUMERIC, 0, 0, 0, GNC_BILLTERM_DISCOUNT },
- { "cutoff", CT_INT, 0, 0, 0, GNC_BILLTERM_CUTOFF },
+ { "type", CT_STRING, MAX_TYPE_LEN, COL_NNUL, NULL, GNC_BILLTERM_TYPE },
+ { "duedays", CT_INT, 0, 0, 0, GNC_BILLTERM_DUEDAYS },
+ { "discountdays", CT_INT, 0, 0, 0, GNC_BILLTERM_DISCDAYS },
+ { "discount", CT_NUMERIC, 0, 0, 0, GNC_BILLTERM_DISCOUNT },
+ { "cutoff", CT_INT, 0, 0, 0, GNC_BILLTERM_CUTOFF },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-customer-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-customer-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-customer-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -51,22 +51,22 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, CUSTOMER_NAME },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, CUSTOMER_ID },
- { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, CUSTOMER_NOTES },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
- { "discount", CT_NUMERIC, 0, COL_NNUL, NULL, CUSTOMER_DISCOUNT },
- { "credit", CT_NUMERIC, 0, COL_NNUL, NULL, CUSTOMER_CREDIT },
- { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, CUSTOMER_NAME },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, CUSTOMER_ID },
+ { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, CUSTOMER_NOTES },
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
+ { "discount", CT_NUMERIC, 0, COL_NNUL, NULL, CUSTOMER_DISCOUNT },
+ { "credit", CT_NUMERIC, 0, COL_NNUL, NULL, CUSTOMER_CREDIT },
+ { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncCustomerGetCurrency, (QofSetterFunc)gncCustomerSetCurrency },
- { "tax_override", CT_BOOLEAN, 0, COL_NNUL, NULL, CUSTOMER_TT_OVER },
- { "addr", CT_ADDRESS, 0, 0, NULL, CUSTOMER_ADDR },
- { "shipaddr", CT_ADDRESS, 0, 0, NULL, CUSTOMER_SHIPADDR },
- { "terms", CT_BILLTERMREF, 0, 0, NULL, CUSTOMER_TERMS },
- { "tax_included", CT_INT, 0, 0, NULL, NULL,
+ { "tax_override", CT_BOOLEAN, 0, COL_NNUL, NULL, CUSTOMER_TT_OVER },
+ { "addr", CT_ADDRESS, 0, 0, NULL, CUSTOMER_ADDR },
+ { "shipaddr", CT_ADDRESS, 0, 0, NULL, CUSTOMER_SHIPADDR },
+ { "terms", CT_BILLTERMREF, 0, 0, NULL, CUSTOMER_TERMS },
+ { "tax_included", CT_INT, 0, 0, NULL, NULL,
(QofAccessFunc)gncCustomerGetTaxIncluded, (QofSetterFunc)gncCustomerSetTaxIncluded },
- { "taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL,
+ { "taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncCustomerGetTaxTable, (QofSetterFunc)gncCustomerSetTaxTable },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-employee-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-employee-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-employee-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -55,18 +55,18 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "username", CT_STRING, MAX_USERNAME_LEN, COL_NNUL, NULL, EMPLOYEE_USERNAME },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, EMPLOYEE_ID },
- { "language", CT_STRING, MAX_LANGUAGE_LEN, COL_NNUL, NULL, EMPLOYEE_LANGUAGE },
- { "acl", CT_STRING, MAX_ACL_LEN, COL_NNUL, NULL, EMPLOYEE_ACL },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
- { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "username", CT_STRING, MAX_USERNAME_LEN, COL_NNUL, NULL, EMPLOYEE_USERNAME },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, EMPLOYEE_ID },
+ { "language", CT_STRING, MAX_LANGUAGE_LEN, COL_NNUL, NULL, EMPLOYEE_LANGUAGE },
+ { "acl", CT_STRING, MAX_ACL_LEN, COL_NNUL, NULL, EMPLOYEE_ACL },
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
+ { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncEmployeeGetCurrency, (QofSetterFunc)gncEmployeeSetCurrency },
- { "ccard_guid", CT_ACCOUNTREF, 0, COL_NNUL, NULL, EMPLOYEE_CC },
- { "workday", CT_NUMERIC, 0, COL_NNUL, NULL, EMPLOYEE_WORKDAY },
- { "rate", CT_NUMERIC, 0, COL_NNUL, NULL, EMPLOYEE_RATE },
- { "addr", CT_ADDRESS, 0, 0, NULL, EMPLOYEE_ADDR },
+ { "ccard_guid", CT_ACCOUNTREF, 0, COL_NNUL, NULL, EMPLOYEE_CC },
+ { "workday", CT_NUMERIC, 0, COL_NNUL, NULL, EMPLOYEE_WORKDAY },
+ { "rate", CT_NUMERIC, 0, COL_NNUL, NULL, EMPLOYEE_RATE },
+ { "addr", CT_ADDRESS, 0, 0, NULL, EMPLOYEE_ADDR },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-entry-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-entry-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-entry-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -55,33 +55,39 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "date", CT_TIMESPEC, 0, COL_NNUL, NULL, ENTRY_DATE },
- { "entered", CT_TIMESPEC, 0, COL_NNUL, NULL, ENTRY_DATE_ENTERED },
- { "description", CT_STRING, MAX_DESCRIPTION_LEN, 0, NULL, ENTRY_DESC },
- { "action", CT_STRING, MAX_ACTION_LEN, 0, NULL, ENTRY_ACTION },
- { "notes", CT_STRING, MAX_NOTES_LEN, 0, NULL, ENTRY_NOTES },
- { "quantity", CT_NUMERIC, 0, 0, NULL, ENTRY_QTY },
- { "i_acct", CT_ACCOUNTREF, 0, 0, NULL, ENTRY_IACCT },
- { "i_price", CT_NUMERIC, 0, 0, NULL, ENTRY_IPRICE },
- { "i_discount", CT_NUMERIC, 0, 0, NULL, NULL, (QofAccessFunc)gncEntryGetInvDiscount, (QofSetterFunc)gncEntrySetInvDiscount },
- { "invoice", CT_INVOICEREF, 0, 0, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "date", CT_TIMESPEC, 0, COL_NNUL, NULL, ENTRY_DATE },
+ { "entered", CT_TIMESPEC, 0, COL_NNUL, NULL, ENTRY_DATE_ENTERED },
+ { "description", CT_STRING, MAX_DESCRIPTION_LEN, 0, NULL, ENTRY_DESC },
+ { "action", CT_STRING, MAX_ACTION_LEN, 0, NULL, ENTRY_ACTION },
+ { "notes", CT_STRING, MAX_NOTES_LEN, 0, NULL, ENTRY_NOTES },
+ { "quantity", CT_NUMERIC, 0, 0, NULL, ENTRY_QTY },
+ { "i_acct", CT_ACCOUNTREF, 0, 0, NULL, ENTRY_IACCT },
+ { "i_price", CT_NUMERIC, 0, 0, NULL, ENTRY_IPRICE },
+ { "i_discount", CT_NUMERIC, 0, 0, NULL, NULL,
+ (QofAccessFunc)gncEntryGetInvDiscount, (QofSetterFunc)gncEntrySetInvDiscount },
+ { "invoice", CT_INVOICEREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncEntryGetInvoice, (QofSetterFunc)gncEntrySetInvoice },
- { "i_disc_type", CT_STRING, MAX_DISCTYPE_LEN, 0, NULL, ENTRY_INV_DISC_TYPE },
- { "i_disc_how", CT_STRING, MAX_DISCHOW_LEN, 0, NULL, ENTRY_INV_DISC_HOW },
- { "i_taxable", CT_BOOLEAN, 0, 0, NULL, ENTRY_INV_TAXABLE },
- { "i_taxincluded", CT_BOOLEAN, 0, 0, NULL, ENTRY_INV_TAX_INC },
- { "i_taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL, (QofAccessFunc)gncEntryGetInvTaxTable, (QofSetterFunc)gncEntrySetInvTaxTable },
- { "b_acct", CT_ACCOUNTREF, 0, 0, NULL, ENTRY_BACCT },
- { "b_price", CT_NUMERIC, 0, 0, NULL, ENTRY_BPRICE },
- { "bill", CT_INVOICEREF, 0, 0, NULL, NULL, (QofAccessFunc)gncEntryGetBill, (QofSetterFunc)gncEntrySetBill },
- { "b_taxable", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILL_TAXABLE },
- { "b_taxincluded", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILL_TAX_INC },
- { "b_taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL, (QofAccessFunc)gncEntryGetBillTaxTable, (QofSetterFunc)gncEntrySetBillTaxTable },
- { "b_paytype", CT_INT, 0, 0, NULL, NULL, (QofAccessFunc)gncEntryGetBillPayment, (QofSetterFunc)gncEntrySetBillPayment },
- { "billable", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILLABLE },
- { "billto", CT_OWNERREF, 0, 0, NULL, ENTRY_BILLTO },
- { "order_guid", CT_ORDERREF, 0, 0, NULL, NULL, (QofAccessFunc)gncEntryGetOrder, (QofSetterFunc)gncEntrySetOrder },
+ { "i_disc_type", CT_STRING, MAX_DISCTYPE_LEN, 0, NULL, ENTRY_INV_DISC_TYPE },
+ { "i_disc_how", CT_STRING, MAX_DISCHOW_LEN, 0, NULL, ENTRY_INV_DISC_HOW },
+ { "i_taxable", CT_BOOLEAN, 0, 0, NULL, ENTRY_INV_TAXABLE },
+ { "i_taxincluded", CT_BOOLEAN, 0, 0, NULL, ENTRY_INV_TAX_INC },
+ { "i_taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL,
+ (QofAccessFunc)gncEntryGetInvTaxTable, (QofSetterFunc)gncEntrySetInvTaxTable },
+ { "b_acct", CT_ACCOUNTREF, 0, 0, NULL, ENTRY_BACCT },
+ { "b_price", CT_NUMERIC, 0, 0, NULL, ENTRY_BPRICE },
+ { "bill", CT_INVOICEREF, 0, 0, NULL, NULL,
+ (QofAccessFunc)gncEntryGetBill, (QofSetterFunc)gncEntrySetBill },
+ { "b_taxable", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILL_TAXABLE },
+ { "b_taxincluded", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILL_TAX_INC },
+ { "b_taxtable", CT_TAXTABLEREF, 0, 0, NULL, NULL,
+ (QofAccessFunc)gncEntryGetBillTaxTable, (QofSetterFunc)gncEntrySetBillTaxTable },
+ { "b_paytype", CT_INT, 0, 0, NULL, NULL,
+ (QofAccessFunc)gncEntryGetBillPayment, (QofSetterFunc)gncEntrySetBillPayment },
+ { "billable", CT_BOOLEAN, 0, 0, NULL, ENTRY_BILLABLE },
+ { "billto", CT_OWNERREF, 0, 0, NULL, ENTRY_BILLTO },
+ { "order_guid", CT_ORDERREF, 0, 0, NULL, NULL,
+ (QofAccessFunc)gncEntryGetOrder, (QofSetterFunc)gncEntrySetOrder },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-invoice-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-invoice-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-invoice-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -52,25 +52,25 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, INVOICE_ID },
- { "date_opened", CT_TIMESPEC, 0, COL_NNUL, NULL, INVOICE_OPENED },
- { "date_posted", CT_TIMESPEC, 0, 0, NULL, INVOICE_POSTED },
- { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, INVOICE_NOTES },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
- { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, INVOICE_ID },
+ { "date_opened", CT_TIMESPEC, 0, COL_NNUL, NULL, INVOICE_OPENED },
+ { "date_posted", CT_TIMESPEC, 0, 0, NULL, INVOICE_POSTED },
+ { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, INVOICE_NOTES },
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
+ { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncInvoiceGetCurrency, (QofSetterFunc)gncInvoiceSetCurrency },
- { "owner", CT_OWNERREF, 0, 0, NULL, NULL,
+ { "owner", CT_OWNERREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncInvoiceGetOwner, (QofSetterFunc)gncInvoiceSetOwner },
- { "terms", CT_BILLTERMREF, 0, 0, NULL, INVOICE_TERMS },
- { "billing_id", CT_STRING, MAX_BILLING_ID_LEN, 0, NULL, INVOICE_BILLINGID },
- { "post_txn", CT_TXREF, 0, 0, NULL, INVOICE_POST_TXN },
- { "post_lot", CT_LOTREF, 0, 0, NULL, NULL,
+ { "terms", CT_BILLTERMREF, 0, 0, NULL, INVOICE_TERMS },
+ { "billing_id", CT_STRING, MAX_BILLING_ID_LEN, 0, NULL, INVOICE_BILLINGID },
+ { "post_txn", CT_TXREF, 0, 0, NULL, INVOICE_POST_TXN },
+ { "post_lot", CT_LOTREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncInvoiceGetPostedLot, (QofSetterFunc)gncInvoiceSetPostedLot },
- { "post_acc", CT_ACCOUNTREF, 0, 0, NULL, INVOICE_ACC },
- { "billto", CT_OWNERREF, 0, 0, NULL, NULL,
+ { "post_acc", CT_ACCOUNTREF, 0, 0, NULL, INVOICE_ACC },
+ { "billto", CT_OWNERREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncInvoiceGetBillTo, (QofSetterFunc)gncInvoiceSetBillTo },
- { "charge_amt", CT_NUMERIC, 0, 0, NULL, NULL,
+ { "charge_amt", CT_NUMERIC, 0, 0, NULL, NULL,
(QofAccessFunc)gncInvoiceGetToChargeAmount, (QofSetterFunc)gncInvoiceSetToChargeAmount },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-job-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-job-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-job-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -49,12 +49,12 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, JOB_ID },
- { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, JOB_NAME },
- { "reference", CT_STRING, MAX_REFERENCE_LEN, COL_NNUL, NULL, JOB_REFERENCE },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, JOB_ACTIVE },
- { "owner", CT_OWNERREF, 0, COL_NNUL, NULL, JOB_OWNER },
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, JOB_ID },
+ { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, JOB_NAME },
+ { "reference", CT_STRING, MAX_REFERENCE_LEN, COL_NNUL, NULL, JOB_REFERENCE },
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, JOB_ACTIVE },
+ { "owner", CT_OWNERREF, 0, COL_NNUL, NULL, JOB_OWNER },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-order-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-order-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-order-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -48,14 +48,14 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, ORDER_ID },
- { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, ORDER_NOTES },
- { "reference", CT_STRING, MAX_REFERENCE_LEN, COL_NNUL, NULL, ORDER_REFERENCE },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
- { "date_opened", CT_TIMESPEC, 0, COL_NNUL, NULL, ORDER_OPENED },
- { "date_closed", CT_TIMESPEC, 0, COL_NNUL, NULL, ORDER_CLOSED },
- { "owner", CT_OWNERREF, 0, COL_NNUL, NULL, ORDER_OWNER },
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, ORDER_ID },
+ { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, ORDER_NOTES },
+ { "reference", CT_STRING, MAX_REFERENCE_LEN, COL_NNUL, NULL, ORDER_REFERENCE },
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
+ { "date_opened", CT_TIMESPEC, 0, COL_NNUL, NULL, ORDER_OPENED },
+ { "date_closed", CT_TIMESPEC, 0, COL_NNUL, NULL, ORDER_CLOSED },
+ { "owner", CT_OWNERREF, 0, COL_NNUL, NULL, ORDER_OWNER },
{ NULL },
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-owner-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-owner-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-owner-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -294,7 +294,7 @@
static void
create_owner_col( GdaServerProvider* server, GdaConnection* cnn,
- xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
+ xmlNodePtr array_data, const col_cvt_t* table_row )
{
const gchar* dbms_type;
gchar* buf;
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-tax-table-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-tax-table-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-tax-table-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -60,14 +60,14 @@
static col_cvt_t tt_col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, GNC_TT_NAME },
- { "refcount", CT_INT64, 0, COL_NNUL, NULL, GNC_TT_REFCOUNT },
- { "invisible", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, GNC_TT_NAME },
+ { "refcount", CT_INT64, 0, COL_NNUL, NULL, GNC_TT_REFCOUNT },
+ { "invisible", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncTaxTableGetInvisible, set_invisible },
- { "child", CT_TAXTABLEREF, 0, 0, NULL, NULL,
+ { "child", CT_TAXTABLEREF, 0, 0, NULL, NULL,
get_child, (QofSetterFunc)gncTaxTableSetChild },
- { "parent", CT_TAXTABLEREF, 0, 0, NULL, NULL,
+ { "parent", CT_TAXTABLEREF, 0, 0, NULL, NULL,
(QofAccessFunc)gncTaxTableGetParent, set_parent },
{ NULL }
};
@@ -76,14 +76,13 @@
static col_cvt_t ttentries_col_table[] =
{
- { "id", CT_INT, 0, COL_NNUL|COL_AUTOINC },
- { "taxtable", CT_TAXTABLEREF, 0, COL_NNUL, NULL, NULL,
+ { "taxtable", CT_TAXTABLEREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncTaxTableEntryGetTable, set_obj_guid },
- { "account", CT_ACCOUNTREF, 0, COL_NNUL, NULL, NULL,
+ { "account", CT_ACCOUNTREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncTaxTableEntryGetAccount, (QofSetterFunc)gncTaxTableEntrySetAccount },
- { "amount", CT_NUMERIC, 0, COL_NNUL, NULL, NULL,
+ { "amount", CT_NUMERIC, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncTaxTableEntryGetAmount, (QofSetterFunc)gncTaxTableEntrySetAmount },
- { "type", CT_INT, 0, COL_NNUL, NULL, NULL,
+ { "type", CT_INT, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncTaxTableEntryGetType, (QofSetterFunc)gncTaxTableEntrySetType },
{ NULL }
};
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-vendor-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-vendor-gda.c 2008-02-14 01:48:11 UTC (rev 16943)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-vendor-gda.c 2008-02-17 21:32:29 UTC (rev 16944)
@@ -58,19 +58,19 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, VENDOR_NAME },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, VENDOR_ID },
- { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, VENDOR_NOTES },
- { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL|COL_PKEY, "guid" },
+ { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, VENDOR_NAME },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, VENDOR_ID },
+ { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, VENDOR_NOTES },
+ { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncVendorGetCurrency, (QofSetterFunc)gncVendorSetCurrency },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncVendorGetActive, (QofSetterFunc)gncVendorSetActive },
- { "tax_override", CT_BOOLEAN, 0, COL_NNUL, NULL, VENDOR_TAX_OVERRIDE },
- { "addr", CT_ADDRESS, 0, 0, NULL, VENDOR_ADDR },
- { "terms", CT_BILLTERMREF, 0, 0, NULL, VENDOR_TERMS },
- { "tax_inc", CT_STRING, MAX_TAX_INC_LEN, 0, NULL, VENDOR_TAX_INC },
- { "tax_table", CT_TAXTABLEREF, 0, 0, NULL, VENDOR_TAX_TABLE },
+ { "tax_override", CT_BOOLEAN, 0, COL_NNUL, NULL, VENDOR_TAX_OVERRIDE },
+ { "addr", CT_ADDRESS, 0, 0, NULL, VENDOR_ADDR },
+ { "terms", CT_BILLTERMREF, 0, 0, NULL, VENDOR_TERMS },
+ { "tax_inc", CT_STRING, MAX_TAX_INC_LEN, 0, NULL, VENDOR_TAX_INC },
+ { "tax_table", CT_TAXTABLEREF, 0, 0, NULL, VENDOR_TAX_TABLE },
{ NULL }
};
More information about the gnucash-changes
mailing list