From 6be44e747856d5c967810701b6503b25e11fa134 Mon Sep 17 00:00:00 2001
From: dpage <dpage@a7884b65-44f6-0310-8a51-81a127f17b15>
Date: Tue, 10 Mar 2009 16:29:23 +0000
Subject: [PATCH] Use long command line options with psql in case of future
 changes to the short options as recently discussed on pgsql-hackers.

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7661 a7884b65-44f6-0310-8a51-81a127f17b15
---
 pgadmin/plugins.ini | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pgadmin/plugins.ini b/pgadmin/plugins.ini
index 24d16f3f2..29dddff52 100644
--- a/pgadmin/plugins.ini
+++ b/pgadmin/plugins.ini
@@ -84,7 +84,7 @@
 ; PSQL (Unix):
 ;
 Title=PSQL Console
-Command=/usr/bin/xterm -e $$PGBINDIR/psql -h $$HOSTNAME -p $$PORT -U $$USERNAME $$DATABASE
+Command=/usr/bin/xterm -e $$PGBINDIR/psql --host=$$HOSTNAME --port=$$PORT --username=$$USERNAME $$DATABASE
 Description=Open a PSQL console to the current database.
 KeyFile=$$PGBINDIR/psql
 Platform=unix
@@ -95,7 +95,7 @@ SetPassword=Yes
 ; PSQL (Windows):
 ;
 Title=PSQL Console
-Command="$$PGBINDIR\psql.exe" -h $$HOSTNAME -p $$PORT -U $$USERNAME $$DATABASE
+Command="$$PGBINDIR\psql.exe" --host=$$HOSTNAME --port=$$PORT --username=$$USERNAME $$DATABASE
 Description=Open a PSQL console to the current database.
 KeyFile=$$PGBINDIR\psql.exe
 Platform=windows
@@ -106,7 +106,7 @@ SetPassword=Yes
 ; PSQL (OSX):
 ;
 Title=PSQL Console
-Command=/usr/bin/osascript -e 'ignoring application responses' -e 'tell application "Terminal"' -e 'activate' -e 'do script with command "$$PGBINDIR/psql -h $$HOSTNAME -p $$PORT -U $$USERNAME $$DATABASE && exit || sleep 5 && exit"' -e 'end tell' -e 'end ignoring'
+Command=/usr/bin/osascript -e 'ignoring application responses' -e 'tell application "Terminal"' -e 'activate' -e 'do script with command "$$PGBINDIR/psql --host=$$HOSTNAME --port=$$PORT --username=$$USERNAME $$DATABASE && exit || sleep 5 && exit"' -e 'end tell' -e 'end ignoring'
 Description=Open a PSQL console to the current database.
 KeyFile=$$PGBINDIR/psql
 Platform=osx
@@ -118,7 +118,7 @@ SetPassword=Yes
 ; EDB PSQL (Unix):
 ;
 Title=EDB-PSQL Console
-Command=/usr/bin/xterm -e $$EDBBINDIR/edb-psql -h $$HOSTNAME -p $$PORT -U $$USERNAME $$DATABASE
+Command=/usr/bin/xterm -e $$EDBBINDIR/edb-psql --host=$$HOSTNAME --port=$$PORT --username=$$USERNAME $$DATABASE
 Description=Open a EDB-PSQL console to the current database.
 KeyFile=$$EDBBINDIR/edb-psql
 Platform=unix
@@ -129,7 +129,7 @@ SetPassword=Yes
 ; PSQL (Windows):
 ;
 Title=EDB-PSQL Console
-Command="$$EDBBINDIR\edb-psql.exe" -h $$HOSTNAME -p $$PORT -U $$USERNAME $$DATABASE
+Command="$$EDBBINDIR\edb-psql.exe" --host=$$HOSTNAME --port=$$PORT --username=$$USERNAME $$DATABASE
 Description=Open a EDB-PSQL console to the current database.
 KeyFile=$$EDBBINDIR\edb-psql.exe
 Platform=windows
@@ -140,7 +140,7 @@ SetPassword=Yes
 ; PSQL (OSX):
 ;
 Title=EDB-PSQL Console
-Command=/usr/bin/osascript -e 'ignoring application responses' -e 'tell application "Terminal"' -e 'activate' -e 'do script with command "$$EDBBINDIR/edb-psql -h $$HOSTNAME -p $$PORT -U $$USERNAME $$DATABASE && exit || sleep 5 && exit"' -e 'end tell' -e 'end ignoring'
+Command=/usr/bin/osascript -e 'ignoring application responses' -e 'tell application "Terminal"' -e 'activate' -e 'do script with command "$$EDBBINDIR/edb-psql --host=$$HOSTNAME --port=$$PORT --username=$$USERNAME $$DATABASE && exit || sleep 5 && exit"' -e 'end tell' -e 'end ignoring'
 Description=Open a EDB-PSQL console to the current database.
 KeyFile=$$EDBBINDIR/edb-psql
 Platform=osx
@@ -154,7 +154,7 @@ SetPassword=Yes
 ; [Separator]
 ;
 ; Title=Quick backup
-; Command=/usr/bin/xterm -e $$PGBINDIR/pg_dump -h $$HOSTNAME -p $$PORT -U $$USERNAME $$DATABASE > ~/db-`date +%Y%m%d%H%m`.bak
+; Command=/usr/bin/xterm -e $$PGBINDIR/pg_dump --host=$$HOSTNAME --port=$$PORT --username=$$USERNAME $$DATABASE > ~/db-`date +%Y%m%d%H%m`.bak
 ; Description=Perform a quick backup of the current database.
 ; KeyFile=$$PGBINDIR/pg_dump
 ; Platform=unix
-- 
2.39.5