Read if a field is a primary key, if it is nullable and its default value.

diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db
index e8988f40c82b2988448ef0bf5b074ca2a86fcf80..a527b479be25c444eed00eb8001f939da53cb077 100644 (file)
Binary files a/.anjuta_sym_db.db and b/.anjuta_sym_db.db differ

diff --git a/src/main.c b/src/main.c
index 829ce56aa48e1430a584f7c8d36e5dcbe0648fdb..cc612f563b6802ae32a4f1c21d8eba283de24582 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -154,8 +154,7 @@ copy_data ()
                                                                        error = NULL;
                                                                        if (!gda_holder_set_value (holder, gval, &error))
                                                                                {
-                                                                                       g_warning ("Unable to set the holder for parameter «%s»: %s.",
-                                                                                                  param_name,
+                                                                                       g_warning ("Unable to set the holder for parameter: %s.",
                                                                                                   error != NULL && error->message != NULL ? error->message : "no details");
                                                                                }
                                                                        g_free (param_name);
@@ -252,7 +251,14 @@ read_fields (Table *table, GdaServerOperation *op)
                                        column->gtype = mt_column->gtype;
                                        column->pkey = mt_column->pkey;
                                        column->nullok = mt_column->nullok;
-                                       column->default_value = g_strdup (mt_column->default_value);
+                                       if (mt_column->default_value != NULL)
+                                               {
+                                                       column->default_value = g_strdup (mt_column->default_value);
+                                               }
+                                       else
+                                               {
+                                                       column->default_value = NULL;
+                                               }
                                        table->fields = g_slist_append (table->fields, column);
 
                                        if (verbose)
@@ -281,7 +287,7 @@ read_fields (Table *table, GdaServerOperation *op)
                                        if (!gda_server_operation_set_value_at (op,
                                                                                column->column_name,
                                                                                &error,
-                                                                               g_strdup_printf ("/FIELDS_A/@COLUMN_NAME/%d", i)))
+                                                                               "/FIELDS_A/@COLUMN_NAME/%d", i))
                                                {
                                                        g_warning ("Error on setting GdaServerOperation's value: %s.",
                                                                   error != NULL && error->message != NULL ? error->message : "no details");
@@ -292,12 +298,54 @@ read_fields (Table *table, GdaServerOperation *op)
                                        if (!gda_server_operation_set_value_at (op,
                                                                                column->column_type,
                                                                                &error,
-                                                                               g_strdup_printf ("/FIELDS_A/@COLUMN_TYPE/%d", i)))
+                                                                               "/FIELDS_A/@COLUMN_TYPE/%d", i))
                                                {
                                                        g_warning ("Error on setting GdaServerOperation's value: %s.",
                                                                   error != NULL && error->message != NULL ? error->message : "no details");
                                                        continue;
                                                }
+
+                                       if (column->pkey)
+                                               {
+                                                       error = NULL;
+                                                       if (!gda_server_operation_set_value_at (op,
+                                                                                               "TRUE",
+                                                                                               &error,
+                                                                                               "/FIELDS_A/@COLUMN_PKEY/%d", i))
+                                                               {
+                                                                       g_warning ("Error on setting GdaServerOperation's value: %s.",
+                                                                                          error != NULL && error->message != NULL ? error->message : "no details");
+                                                                       continue;
+                                                               }
+                                               }
+
+                                       if (!column->nullok)
+                                               {
+                                                       error = NULL;
+                                                       if (!gda_server_operation_set_value_at (op,
+                                                                                               "TRUE",
+                                                                                               &error,
+                                                                                               "/FIELDS_A/@COLUMN_NNUL/%d", i))
+                                                               {
+                                                                       g_warning ("Error on setting GdaServerOperation's value: %s.",
+                                                                                          error != NULL && error->message != NULL ? error->message : "no details");
+                                                                       continue;
+                                                               }
+                                               }
+
+                                       if (column->default_value != NULL)
+                                               {
+                                                       error = NULL;
+                                                       if (!gda_server_operation_set_value_at (op,
+                                                                                               column->default_value,
+                                                                                               &error,
+                                                                                               "/FIELDS_A/@COLUMN_DEFAULT/%d", i))
+                                                               {
+                                                                       g_warning ("Error on setting GdaServerOperation's value: %s.",
+                                                                                          error != NULL && error->message != NULL ? error->message : "no details");
+                                                                       continue;
+                                                               }
+                                               }
                                }
                }
        g_object_unref (mstruct);

diff --git a/tests/db.db b/tests/db.db
index e5ace60f48966dc6caf863e7af4769b18e38b61c..77295cccbf00de1e7b147391e34398fd8aeb3862 100644 (file)
Binary files a/tests/db.db and b/tests/db.db differ

diff --git a/tests/refdb.db b/tests/refdb.db
index 932e681acccb2d3d9b928af5e5f0bad7678254fc..7b3d334f8d818d7d4b6caa60a80a2005c4f010a1 100644 (file)
Binary files a/tests/refdb.db and b/tests/refdb.db differ