From ea6d8712582cec9abf8269b1235a99d735c2cb41 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 29 Oct 2013 08:42:39 +0100 Subject: [PATCH] On autofill it mixed tables/fields of different datasources. --- src/datasources.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/datasources.c b/src/datasources.c index 98571ed..1b1767b 100644 --- a/src/datasources.c +++ b/src/datasources.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Andrea Zagli + * Copyright (C) 2010-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -365,9 +365,12 @@ datasources_add_all_tables (Datasources *datasources) while (gtk_events_pending ()) gtk_main_iteration (); /* check if already exists */ - sql = g_strdup_printf ("SELECT id FROM %stables WHERE name = '%s'", + sql = g_strdup_printf ("SELECT id" + " FROM %stables WHERE name = '%s'" + " AND id_datasources = %d", priv->commons->prefix, - table_name); + table_name, + id_ds); error = NULL; stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, &error); if (stmt == NULL || error != NULL) @@ -566,7 +569,10 @@ datasources_add_all_tables (Datasources *datasources) field_name = gda_value_stringify (gda_data_model_get_value_at (dm_fields, 0, row_fields, NULL)); /* check if already exists */ - sql = g_strdup_printf ("SELECT id FROM %sfields WHERE id_tables = %d AND name = '%s'", + sql = g_strdup_printf ("SELECT id" + " FROM %sfields" + " WHERE id_tables = %d" + " AND name = '%s'", priv->commons->prefix, new_id, field_name); -- 2.49.0