[libgda] Misc. small corrections



commit 7cf1a2252eb09ffdfde0aa614d84e9f1f9d65b94
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sun Nov 23 22:09:14 2014 +0100

    Misc. small corrections

 docker-tools/postgresql-test-server/build.sh |    2 +-
 providers/ldap/gda-ldap-provider.c           |    6 ++++++
 providers/postgres/gda-postgres-util.c       |    6 ++++--
 providers/web/php/gda-tester.php             |    2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/docker-tools/postgresql-test-server/build.sh b/docker-tools/postgresql-test-server/build.sh
index a433a5b..42a89a7 100755
--- a/docker-tools/postgresql-test-server/build.sh
+++ b/docker-tools/postgresql-test-server/build.sh
@@ -8,7 +8,7 @@ docker version > /dev/null 2>&1 || {
     exit 1
 }
 
-# download Notrhwind data if necessary
+# download Northwind data if necessary
 sqlfile=setup-data/northwind.sql
 if [ ! -e $sqlfile ]
 then
diff --git a/providers/ldap/gda-ldap-provider.c b/providers/ldap/gda-ldap-provider.c
index cb0b091..85b4c74 100644
--- a/providers/ldap/gda-ldap-provider.c
+++ b/providers/ldap/gda-ldap-provider.c
@@ -966,6 +966,12 @@ gda_ldap_provider_statement_execute (GdaServerProvider *provider, GdaConnection
                g_free (sql);
        }
 
+       /* check connection to LDAP is Ok */
+       LdapConnectionData *cdata;
+        cdata = (LdapConnectionData*) gda_virtual_connection_internal_get_provider_data 
(GDA_VIRTUAL_CONNECTION (cnc));
+       if (! gda_ldap_ensure_bound (cdata, error))
+               return NULL;
+
        GdaServerProviderBase *fset;
        fset = gda_server_provider_get_impl_functions_for_class (parent_class, 
GDA_SERVER_PROVIDER_FUNCTIONS_BASE);
        return fset->statement_execute (provider, cnc, stmt, params,
diff --git a/providers/postgres/gda-postgres-util.c b/providers/postgres/gda-postgres-util.c
index abdabcb..9291402 100644
--- a/providers/postgres/gda-postgres-util.c
+++ b/providers/postgres/gda-postgres-util.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008 Murray Cumming <murrayc murrayc com>
- * Copyright (C) 2008 - 2011 Vivien Malerba <malerba gnome-db org>
+ * Copyright (C) 2008 - 2014 Vivien Malerba <malerba gnome-db org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,9 @@
 static GdaConnectionEventCode
 gda_postgres_sqlsate_to_gda_code (const gchar *sqlstate)
 {
-        guint64 gda_code = g_ascii_strtoull (sqlstate, NULL, 0);
+        guint64 gda_code = 0;
+       if (sqlstate)
+               gda_code = g_ascii_strtoull (sqlstate, NULL, 0);
 
         switch (gda_code) {
                 case 42501:
diff --git a/providers/web/php/gda-tester.php b/providers/web/php/gda-tester.php
index 1c22e56..3eafa48 100644
--- a/providers/web/php/gda-tester.php
+++ b/providers/web/php/gda-tester.php
@@ -56,7 +56,7 @@ if ($test_connections) {
        }
 }
 else {
-       echo "<p>Connections listed below but not tested (set <tt>\$test_connections</tt> to <tt>true</tt> in 
the <tt>gda-config.php</tt> file to change):</p>\n";
+       echo "<p>Connections listed below but not tested (set <tt>\$test_connections</tt> to <tt>true</tt> in 
the <tt>gda-tester.php</tt> file to change):</p>\n";
        echo "<ul>\n";
        foreach ($cnc as $dbname => $dbpass) {
                echo "<li>Connection '".$dbname."'</li>\n";


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]