- Make user and password defined in CREATE TABLE have precedence on

 the ones specified in a Federated Server. modified: storage/connect/tabjdbc.cpp - Typo modified: storage/connect/tabext.cpp modified: storage/connect/tabext.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjson.cpp

Author: Buggynours

storage/connect/tabext.cpp

@@ -1,7 +1,7 @@
 /************* Tabext C++ Functions Source Code File (.CPP) ************/
-/* Name: TABEXT.CPP Version 1.0 */
+/* Name: TABEXT.CPP Version 1.1 */
 /* */
-/* (C) Copyright to the author Olivier BERTRAND 2017   */
+/* (C) Copyright to the author Olivier BERTRAND 2017 - 2019 */
 /* */
 /* This file contains the TBX, TDB and OPJOIN classes functions. */
 /***********************************************************************/

storage/connect/tabext.h

@@ -1,7 +1,7 @@
 /*************** Tabext H Declares Source Code File (.H) ***************/
-/* Name: TABEXT.H Version 1.0 */
+/* Name: TABEXT.H Version 1.1 */
 /* */
-/* (C) Copyright to the author Olivier BERTRAND 2017   */
+/* (C) Copyright to the author Olivier BERTRAND 2017 - 2019 */
 /* */
 /* This is the EXTDEF, TABEXT and EXTCOL classes definitions. */
 /***********************************************************************/

storage/connect/tabjdbc.cpp

@@ -1,11 +1,11 @@
 /************* TabJDBC C++ Program Source Code File (.CPP) *************/
 /* PROGRAM NAME: TABJDBC */
 /* ------------- */
-/* Version 1.2 */
+/* Version 1.3 */
 /* */
 /* COPYRIGHT: */
 /* ---------- */
-/* (C) Copyright to the author Olivier BERTRAND 2016-2017 */
+/* (C) Copyright to the author Olivier BERTRAND 2016-2019 */
 /* */
 /* WHAT THIS PROGRAM DOES: */
 /* ----------------------- */
@@ -185,10 +185,10 @@ int JDBCDEF::ParseURL(PGLOBAL g, char *url, bool b)
 } else // host is a URL
 Url = PlugDup(g, server->host);
 
-if (server->username)
+if (!Username && server->username)
 Username = PlugDup(g, server->username);
 
-if (server->password)
+if (!Password && server->password)
 Password = PlugDup(g, server->password);
 
 return RC_NF;

storage/connect/tabjson.cpp

@@ -1,6 +1,6 @@
 /************* tabjson C++ Program Source Code File (.CPP) *************/
-/* PROGRAM NAME: tabjson Version 1.6 */
-/* (C) Copyright to the author Olivier BERTRAND 2014 - 2018 */
+/* PROGRAM NAME: tabjson Version 1.7 */
+/* (C) Copyright to the author Olivier BERTRAND 2014 - 2019 */
 /* This program are the JSON class DB execution routines. */
 /***********************************************************************/