From: Andrea Zagli Date: Mon, 24 Dec 2012 10:41:32 +0000 (+0100) Subject: Trying to read explicitly also table's fields. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=a9f2989a956238f7d6fd6d96cc9f290d8ae7c6eb;p=gdadbcopy Trying to read explicitly also table's fields. --- diff --git a/.cproject b/.cproject index dcf1892..d9f764f 100644 --- a/.cproject +++ b/.cproject @@ -3,8 +3,8 @@ - - + + @@ -16,26 +16,26 @@ - - - - - - - - + + + + diff --git a/src/main.c b/src/main.c index 7ff1c5b..6098f62 100644 --- a/src/main.c +++ b/src/main.c @@ -313,6 +313,44 @@ field_server_operation (Table *table, return TRUE; } +static void +read_fields_explicit (Table *table, GdaServerOperation *op, GdaDataModel *dm) +{ + guint col; + guint cols; + + GdaColumn *gda_column; + GdaMetaTableColumn *mt_column; + + cols = gda_data_model_get_n_columns (dm); + for (col = 0; col < cols; col++) + { + gda_column = gda_data_model_describe_column (dm, col); + + mt_column = g_new0 (GdaMetaTableColumn, 1); + mt_column->column_name = g_strdup (gda_column_get_name (gda_column)); + mt_column->column_type = g_strdup (gda_column_get_dbms_type (gda_column)); + mt_column->gtype = gda_column_get_g_type (gda_column); + /*mt_column->pkey = gda_column_get_*/ + mt_column->nullok = gda_column_get_allow_null (gda_column); + mt_column->default_value = gda_value_stringify (gda_column_get_default_value (gda_column)); + table->fields = g_slist_append (table->fields, mt_column); + + if (verbose) + { + g_printf ("\t\tField: %s - %s - %d - %d - %d - %s\n", + mt_column->column_name, + mt_column->column_type, + mt_column->gtype, + mt_column->pkey, + mt_column->nullok, + mt_column->default_value); + } + + field_server_operation (table, op, mt_column, col); + } +} + static void read_fields (Table *table, GdaServerOperation *op) { @@ -365,6 +403,8 @@ read_fields (Table *table, GdaServerOperation *op) table->fields = NULL; + if (meta_table->columns != NULL && meta_table->columns->data != NULL) + { i = 0; for (list = meta_table->columns; list; list = list->next, i++) { @@ -399,6 +439,34 @@ read_fields (Table *table, GdaServerOperation *op) field_server_operation (table, op, column, i); } + } + else + { + /* no columns; trying to read explicitly */ + GdaSqlParser *parser; + gchar *sql; + GdaStatement *stmt; + GdaDataModel *dm; + + g_printf ("* No columns from MetaStore: trying to read them from a select.\n"); + + parser = gda_connection_create_parser (gda_conn_ref_db); + if (!parser) + { + /* @cnc doe snot provide its own parser => use default one */ + parser = gda_sql_parser_new (); + } + + sql = g_strdup_printf ("SELECT * FROM %s", table->name); + stmt = gda_sql_parser_parse_string (parser, sql, NULL, NULL); + g_free (sql); + dm = gda_connection_statement_execute_select (gda_conn_ref_db, stmt, NULL, &error); + g_object_unref (stmt); + if (dm != NULL) + { + read_fields_explicit (table, op, dm); + } + } } g_object_unref (mstruct); } @@ -546,8 +614,6 @@ read_tables_explicit () Table *table; GdaServerOperation *op; - GdaColumn *gda_column; - GdaMetaTableColumn *mt_column; g_printf ("* Reading tables on reference database declared on command line.\n"); @@ -591,32 +657,7 @@ read_tables_explicit () } } - for (col = 0; col < cols; col++) - { - gda_column = gda_data_model_describe_column (dm, col); - - mt_column = g_new0 (GdaMetaTableColumn, 1); - mt_column->column_name = g_strdup (gda_column_get_name (gda_column)); - mt_column->column_type = g_strdup (gda_column_get_dbms_type (gda_column)); - mt_column->gtype = gda_column_get_g_type (gda_column); - /*mt_column->pkey = gda_column_get_*/ - mt_column->nullok = gda_column_get_allow_null (gda_column); - mt_column->default_value = gda_value_stringify (gda_column_get_default_value (gda_column)); - table->fields = g_slist_append (table->fields, mt_column); - - if (verbose) - { - g_printf ("\t\tField: %s - %s - %d - %d - %d - %s\n", - mt_column->column_name, - mt_column->column_type, - mt_column->gtype, - mt_column->pkey, - mt_column->nullok, - mt_column->default_value); - } - - field_server_operation (table, op, mt_column, col); - } + read_fields_explicit (table, op, dm); if (cols > 0) { @@ -731,6 +772,12 @@ read_tables () tables = g_slist_append (tables, table); } } + else + { + g_printf ("* No table on reference database.\n"); + read_tables_explicit (); + } + if (dm_tables != NULL) { g_object_unref (dm_tables); @@ -1011,10 +1058,10 @@ main (int argc, char *argv[]) read_tables (); g_printf ("* Copying data.\n"); - copy_data (); + //copy_data (); g_printf ("* Reading views.\n"); - read_views (); + //read_views (); if (output_file != NULL) {