From 0bcc09f6661acabfac810974faa1d0007e8d87d9 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 31 May 2010 18:31:58 +0200 Subject: [PATCH] Some bugfixes. Added first test program: it seems to work. --- .gitignore | 1 + docs/sql/audit.sql | 16 +++++------ src/audit.c | 69 +++++++++++++++++++++++++++++++--------------- src/libaudit.h | 4 +-- tests/Makefile.am | 11 ++++++++ tests/test1.c | 33 ++++++++++++++++++++++ 6 files changed, 102 insertions(+), 32 deletions(-) create mode 100644 tests/test1.c diff --git a/.gitignore b/.gitignore index d228bcc..8bbe3ec 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ docs/reference/xml *.o *.la *.bak +test1 diff --git a/docs/sql/audit.sql b/docs/sql/audit.sql index db5c2d1..a744b77 100644 --- a/docs/sql/audit.sql +++ b/docs/sql/audit.sql @@ -1,15 +1,15 @@ CREATE TABLE datasources ( id integer NOT NULL, - name character(30) DEFAULT '', - cnc_string character(255) DEFAULT '', - status character(1) DEFAULT '', + name character varying(30) DEFAULT '', + cnc_string character varying(255) DEFAULT '', + status character varying(1) DEFAULT '', CONSTRAINT datasources_pkey PRIMARY KEY (id) ); CREATE TABLE tables ( id integer NOT NULL, - name character(30) DEFAULT '', - status character(1) DEFAULT '', + name character varying(30) DEFAULT '', + status character varying(1) DEFAULT '', id_datasources integer NOT NULL, CONSTRAINT tables_pkey PRIMARY KEY (id) ); @@ -17,15 +17,15 @@ CREATE TABLE tables ( CREATE TABLE fields ( id integer NOT NULL, id_tables integer NOT NULL, - name character(30) DEFAULT '', - status character(1) DEFAULT '', + name character varying(30) DEFAULT '', + status character varying(1) DEFAULT '', CONSTRAINT campi_pkey PRIMARY KEY (id) ); CREATE TABLE actions ( id bigint NOT NULL, type integer, - dn character(200) DEFAULT '', + dn character varying(200) DEFAULT '', date timestamp without time zone, id_tables integer, CONSTRAINT actions_pkey PRIMARY KEY (id) diff --git a/src/audit.c b/src/audit.c index d69cfca..ca35600 100644 --- a/src/audit.c +++ b/src/audit.c @@ -231,6 +231,9 @@ load_datasources (Audit *audit) datas->name = gdaex_data_model_get_field_value_stringify_at (dm, row, "name"); datas->cnc_string = gdaex_data_model_get_field_value_stringify_at (dm, row, "cnc_string"); + g_debug ("DATASOURCE\nid: %d\nname: %s\ncnc_string: %s", + datas->id, datas->name, datas->cnc_string); + datas->gdaex = gdaex_new_from_string (datas->cnc_string); priv->datasources = g_list_append (priv->datasources, (gpointer)datas); @@ -252,7 +255,7 @@ static Field while (c != NULL) { - if (strcmp (((Field *)c->data)->name, field) == 0) + if (g_strcmp0 (((Field *)c->data)->name, field) == 0) { return (Field *)c->data; } @@ -272,7 +275,7 @@ static Table while (t != NULL) { - if (strcmp (((Table *)t->data)->name, table) == 0) + if (g_strcmp0 (((Table *)t->data)->name, table) == 0) { return (Table *)t->data; } @@ -293,7 +296,7 @@ static Datasource while (f != NULL) { - if (strcmp (((Datasource *)f->data)->name, datasource) == 0) + if (g_strcmp0 (((Datasource *)f->data)->name, datasource) == 0) { return (Datasource *)f->data; } @@ -306,7 +309,7 @@ static Datasource static gboolean insert_value (Audit *audit, - gint id_azione, + gint id_actions, Table *table, gchar *field_name, gchar *value) @@ -323,10 +326,23 @@ insert_value (Audit *audit, } else { + /* find the new id */ + GdaDataModel *dm; + guint id_new; + + id_new = 0; + sql = g_strdup_printf ("SELECT COALESCE (MAX (id)) FROM values"); + dm = gdaex_query (priv->gdaex, sql); + if (dm != NULL && gda_data_model_get_n_rows (dm) == 1) + { + id_new = gdaex_data_model_get_value_integer_at (dm, 0, 0); + } + id_new++; + sql = g_strdup_printf ("INSERT INTO values" - " (id_actions, id_fields, value)" - " VALUES (%d, %d, '%s')", - id_azione, field->id, value); + " (id, id_actions, id_fields, value)" + " VALUES (%d, %d, %d, '%s')", + id_new, id_actions, field->id, value); gdaex_execute (priv->gdaex, sql); } @@ -382,18 +398,20 @@ Audit if (priv->gdaex == NULL) { - /* TO DO */ + /* TODO */ + g_message ("Error creating GdaEx object."); return NULL; } /* carico i datasource */ if (!load_datasources (audit)) { - /* TO DO */ + /* TODO */ + g_message ("Error loading datasources."); return NULL; } - return audit; + return audit; } /** @@ -413,14 +431,16 @@ Audit if (priv->gdaex == NULL) { - /* TO DO */ + /* TODO */ + g_message ("Error creating GdaEx object."); return NULL; } /* carico i datasource */ if (!load_datasources (audit)) { - /* TO DO */ + /* TODO */ + g_message ("Error loading datasources."); return NULL; } @@ -502,13 +522,14 @@ audit_action (Audit *audit, /* salvo l'azione */ if (action != AUDIT_ACTION_BEFORE_UPDATE) { + /* TODO find the way to save more than 2 digits for the seconds */ sql = g_strdup_printf ("INSERT INTO actions" - " (id, type, dn, date, id_tables, id_datasources)" - " VALUES (%d, %d, '%s', '%04d-%02d-%02d %02d:%02d:%02d', %d, %d)", + " (id, type, dn, date, id_tables)" + " VALUES (%d, %d, '%s', '%04d-%02d-%02d %02d:%02d:%02d', %d)", id, action, dn, tm_ora->tm_year + 1900, tm_ora->tm_mon + 1, tm_ora->tm_mday, tm_ora->tm_hour, tm_ora->tm_min, tm_ora->tm_sec, - table->id, datasource->id); + table->id); gdaex_execute (priv->gdaex, sql); } @@ -529,7 +550,8 @@ audit_action (Audit *audit, value = va_arg (vargs, gchar *); if (value == NULL) break; - sql_where = g_strconcat (sql_where, " AND ", field_name, "='", value, "'", NULL); + /* TODO the db field can be other type than string */ + sql_where = g_strconcat (sql_where, " AND ", field_name, " = ", value, "", NULL); field_name = va_arg (vargs, gchar *); } sql = g_strconcat (sql, sql_where, NULL); @@ -537,7 +559,8 @@ audit_action (Audit *audit, if (dm == NULL) return FALSE; - if (gda_data_model_get_n_rows (dm) == 0) return FALSE; + if (gda_data_model_get_n_rows (dm) == 0 || + gda_data_model_get_n_rows (dm) > 1) return FALSE; cols = gda_data_model_get_n_columns (dm); for (col = 0; col < cols; col++) @@ -545,7 +568,7 @@ audit_action (Audit *audit, /* trovo il field */ field_name = (gchar *)gda_data_model_get_column_title (dm, col); insert_value (audit, id, table, field_name, - gdaex_data_model_get_value_stringify_at (dm, col, 0)); + gdaex_data_model_get_value_stringify_at (dm, 0, col)); } break; @@ -561,7 +584,8 @@ audit_action (Audit *audit, value = va_arg (vargs, gchar *); if (value == NULL) break; - sql_where = g_strconcat (sql_where, " AND ", field_name, " = '", value, "'", NULL); + /* TODO the db field can be other type than string */ + sql_where = g_strconcat (sql_where, " AND ", field_name, " = ", value, "", NULL); field_name = va_arg (vargs, gchar *); } sql = g_strconcat (sql, sql_where, NULL); @@ -578,7 +602,7 @@ audit_action (Audit *audit, { g_hash_table_insert (priv->fields_updated, (gpointer)gda_data_model_get_column_title (dm, col), - (gpointer)gdaex_data_model_get_value_stringify_at (dm, col, 0)); + (gpointer)gdaex_data_model_get_value_stringify_at (dm, 0, col)); } break; @@ -594,7 +618,8 @@ audit_action (Audit *audit, value = va_arg (vargs, gchar *); if (value == NULL) break; - sql_where = g_strconcat (sql_where, " AND ", field_name, " = '", value, "'", NULL); + /* TODO the db field can be other type than string */ + sql_where = g_strconcat (sql_where, " AND ", field_name, " = ", value, "", NULL); field_name = va_arg (vargs, gchar *); } sql = g_strconcat (sql, sql_where, NULL); @@ -611,7 +636,7 @@ audit_action (Audit *audit, field_name = (gchar *)gda_data_model_get_column_title (dm, col); value = (gchar *)g_hash_table_lookup (priv->fields_updated, (gconstpointer)field_name); - value_new = gdaex_data_model_get_value_stringify_at (dm, col, 0); + value_new = gdaex_data_model_get_value_stringify_at (dm, 0, col); if (strcmp (value, value_new) != 0) { /* field modificato */ diff --git a/src/libaudit.h b/src/libaudit.h index f8c5adb..9817b9c 100644 --- a/src/libaudit.h +++ b/src/libaudit.h @@ -69,8 +69,8 @@ Audit *audit_new_from_string (const gchar *cnc_string); gboolean audit_action (Audit *audit, enum AuditActions action, const gchar *dn, - const gchar *nome_datasource, - const gchar *nome_tabella, + const gchar *datasource_name, + const gchar *table_name, ...); void audit_destroy (Audit *audit); diff --git a/tests/Makefile.am b/tests/Makefile.am index e69de29..809f782 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -0,0 +1,11 @@ +LIBS = $(LIBAUDIT_LIBS) \ + -export-dynamic + +AM_CPPFLAGS = $(LIBAUDIT_CFLAGS) \ + -I$(top_srcdir)/src + +noinst_PROGRAMS = test1 + +LDADD = $(top_builddir)/src/libaudit.la + +EXTRA_DIST = diff --git a/tests/test1.c b/tests/test1.c new file mode 100644 index 0000000..aaaf273 --- /dev/null +++ b/tests/test1.c @@ -0,0 +1,33 @@ +#include + +int +main (int argc, char *argv[]) +{ + GdaEx *gdaex; + Audit *audit; + + g_type_init (); + + audit = audit_new_from_string ("PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=audit"); + + if (audit == NULL) + { + g_message ("Error on creating audit object."); + return 0; + } + + gdaex = gdaex_new_from_string ("PostgreSQL://postgres:postgres@HOST=localhost;DB_NAME=audit"); + + gdaex_execute (gdaex, "DELETE FROM test1"); + + gdaex_execute (gdaex, "INSERT INTO test1 VALUES (1, 'Mary Red', 25, 1500.45)"); + audit_action (audit, AUDIT_ACTION_INSERT, "I", "audit_test1", "test1", "id", "1", NULL); + + audit_action (audit, AUDIT_ACTION_BEFORE_UPDATE, "I", "audit_test1", "test1", "id", "1", NULL); + gdaex_execute (gdaex, "UPDATE test1 SET age=30 WHERE id = 1"); + audit_action (audit, AUDIT_ACTION_AFTER_UPDATE, "I", "audit_test1", "test1", "id", "1", NULL); + + audit_destroy (audit); + + return 0; +} -- 2.49.0