Change libpgeasy to take dbname at end like all other interfaces.

diff --git a/src/interfaces/libpgeasy/examples/pginsert.c b/src/interfaces/libpgeasy/examples/pginsert.c
index 5fa96bf474d6d1aaf238a9d0c33b8d16a1db3f3c..18b5382ede711b51b1454c227bf5ac8f3a4f75c9 100644 (file)
--- a/src/interfaces/libpgeasy/examples/pginsert.c
+++ b/src/interfaces/libpgeasy/examples/pginsert.c
@@ -27,7 +27,7 @@ main(int argc, char **argv)
        if (argc != 2)
                halt("Usage:  %s database\n", argv[0]);
 
-       connectdb(argv[1], NULL, NULL, NULL, NULL);
+       connectdb(NULL, NULL, NULL, NULL, argv[1]);
 
        on_error_continue();
        doquery("DROP TABLE testfetch");

diff --git a/src/interfaces/libpgeasy/examples/pgnulltest.c b/src/interfaces/libpgeasy/examples/pgnulltest.c
index f54a3f5916c490136035a516142c70b111a770b1..da88efbbe48b4513a3edc1904769786ff005bcec 100644 (file)
--- a/src/interfaces/libpgeasy/examples/pgnulltest.c
+++ b/src/interfaces/libpgeasy/examples/pgnulltest.c
@@ -38,7 +38,7 @@ main(int argc, char **argv)
        if (argc != 2)
                halt("Usage:  %s database\n", argv[0]);
 
-       connectdb(argv[1], NULL, NULL, NULL, NULL);
+       connectdb(NULL, NULL, NULL, NULL, argv[1]);
 
        on_error_continue();
        doquery("DROP TABLE testfetch");

diff --git a/src/interfaces/libpgeasy/examples/pgwordcount.c b/src/interfaces/libpgeasy/examples/pgwordcount.c
index c5705e87fadb1db58c787019893d1a56498e6d2e..08138510ea88d70405a897b400e3a4546bb85b93 100644 (file)
--- a/src/interfaces/libpgeasy/examples/pgwordcount.c
+++ b/src/interfaces/libpgeasy/examples/pgwordcount.c
@@ -19,7 +19,7 @@ main(int argc, char **argv)
        if (argc != 2)
                halt("Usage:  %s database\n", argv[0]);
 
-       connectdb(argv[1], NULL, NULL, NULL, NULL);
+       connectdb(NULL, NULL, NULL, NULL, argv[1]);
        on_error_continue();
        doquery("DROP TABLE words");
        on_error_stop();

diff --git a/src/interfaces/libpgeasy/libpgeasy.c b/src/interfaces/libpgeasy/libpgeasy.c
index c2efe034c4a7a6f7b8b2a687654c63fab4c974d1..41d3d0429ca8aabd85e4855a45a7de0bf38eacd4 100644 (file)
--- a/src/interfaces/libpgeasy/libpgeasy.c
+++ b/src/interfaces/libpgeasy/libpgeasy.c
@@ -42,11 +42,11 @@ static int  tuple;
 **
 */
 PGconn *
-connectdb(char *dbName,
-                 char *pghost,
+connectdb(char *pghost,
                  char *pgport,
                  char *pgoptions,
-                 char *pgtty)
+                 char *pgtty,
+                 char *dbName)
 {
        /* make a connection to the database */
        conn = PQsetdb(pghost, pgport, pgoptions, pgtty, dbName);

diff --git a/src/interfaces/libpgeasy/libpgeasy.h b/src/interfaces/libpgeasy/libpgeasy.h
index e58d5a1cd60e8ad2bf8d71d92996a516d7785420..3686b4e92631d410efbe8a822d550c95c039bd5e 100644 (file)
--- a/src/interfaces/libpgeasy/libpgeasy.h
+++ b/src/interfaces/libpgeasy/libpgeasy.h
@@ -4,11 +4,11 @@
 */
 
 PGresult   *doquery(char *query);
-PGconn *connectdb(char *dbName,
-                 char *pghost,
+PGconn *connectdb(char *pghost,
                  char *pgport,
                  char *pgoptions,
-                 char *pgtty);
+                 char *pgtty,
+                 char *dbName);
 void           disconnectdb(void);
 int                    fetch(void *param,...);
 int                    fetchwithnulls(void *param,...);