Index: include/db/pgSet.h
===================================================================
--- include/db/pgSet.h	(revision 7511)
+++ include/db/pgSet.h	(working copy)
@@ -62,6 +62,7 @@
     bool IsNull(const int col) const { return (PQgetisnull(res, pos-1, col) != 0); }
     int ColScale(const int col) const;
     int ColNumber(const wxString &colName) const;
+    bool HasColumn(const wxString &colname) const;
 
 
     wxString GetVal(const int col) const;
Index: include/agent/dlgStep.h
===================================================================
--- include/agent/dlgStep.h	(revision 7511)
+++ include/agent/dlgStep.h	(working copy)
@@ -39,13 +39,17 @@
     wxString GetHelpPage(bool forCreate) const { return wxT("pgagent-steps"); }
 
 private:
+    void OnSelRemoteConn(wxCommandEvent& ev);
+    void OnSelLocalConn(wxCommandEvent& ev);
+    void OnSelectDatabase(wxCommandEvent &ev);
 
-	virtual bool IsUpToDate();
+    virtual bool IsUpToDate();
 
     long jobId;
     ctlSQLBox *sqlBox;
     pgaStep *step;
     pgaJob *job;
+    bool hasConnStrSupport;
 
     DECLARE_EVENT_TABLE()
 };
Index: include/agent/pgaStep.h
===================================================================
--- include/agent/pgaStep.h	(revision 7511)
+++ include/agent/pgaStep.h	(working copy)
@@ -46,6 +46,8 @@
     void iSetCode(const wxString &s) { code=s; }
     wxString GetDbname() const { return dbname; }
     void iSetDbname(const wxString &s) { dbname=s; }
+    wxString GetConnStr() const { return connstr; }
+    void iSetConnStr(const wxString &s) { connstr=s; }
     wxString GetOnError() const { return onError; }
     void iSetOnError(const wxString &s) { onError=s; }
     wxChar GetOnErrorChar() const { return onErrorChar; }
@@ -53,13 +55,15 @@
 	long GetRecId() const { return recId; }
     void iSetRecId(const long l) { recId=l; }
 
+    bool HasConnectionString() const { return !connstr.IsEmpty(); }
+
 	bool IsUpToDate();
 
     wxString GetHelpPage(bool forCreate) const { return wxT("pgagent-steps"); }
 
 private:
     bool enabled;
-    wxString kind, code, dbname, onError;
+    wxString kind, code, dbname, connstr, onError;
     wxChar kindChar, onErrorChar;
 	long recId;
 };
Index: include/schema/pgTable.h
===================================================================
--- include/schema/pgTable.h	(revision 7511)
+++ include/schema/pgTable.h	(working copy)
@@ -112,6 +112,8 @@
     pgObject *Refresh(ctlTree *browser, const wxTreeItemId item);
 	void iSetTriggersEnabled(ctlTree *browser, bool enable);
 
+    static bool HasColumn(pgConn *conn, wxString schemaname, wxString tblname, const wxString& colname);
+
 private:
     void UpdateInheritance();
     bool GetVacuumHint();
Index: include/dlg/module.mk
===================================================================
--- include/dlg/module.mk	(revision 7511)
+++ include/dlg/module.mk	(working copy)
@@ -52,7 +52,8 @@
 	$(srcdir)/include/dlg/dlgType.h \
 	$(srcdir)/include/dlg/dlgUser.h \
 	$(srcdir)/include/dlg/dlgView.h \
-	$(srcdir)/include/dlg/dlgManageMacros.h
+	$(srcdir)/include/dlg/dlgManageMacros.h \
+	$(srcdir)/include/dlg/dlgSelectDatabase.h
 
 EXTRA_DIST += \
         $(srcdir)/include/dlg/module.mk
Index: include/dlg/dlgSelectDatabase.h
===================================================================
--- include/dlg/dlgSelectDatabase.h	(revision 0)
+++ include/dlg/dlgSelectDatabase.h	(revision 0)
@@ -0,0 +1,63 @@
+//////////////////////////////////////////////////////////////////////////
+//
+// pgAdmin III - PostgreSQL Tools
+// RCS-ID:      $Id:$
+// Copyright (C) 2002 - 2008, The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// dlgSelectDatabase.h - Connect to a database
+//
+//////////////////////////////////////////////////////////////////////////
+
+#ifndef DLGSELECTDATABASE_H
+#define DLGSELECTDATABASE_H
+
+#include <wx/wx.h>
+#include <wx/image.h>
+#include <wx/treectrl.h>
+
+
+class pgServer;
+
+
+class dlgSelDBNode : public wxTreeItemData
+{
+
+public:
+    dlgSelDBNode(pgServer* server, const wxString& dbname=wxEmptyString);
+    dlgSelDBNode* createChild(const wxString& dbName);
+
+    wxString getDatabase() { return dbname; }
+    wxString getConnectionString();
+
+private:
+    pgServer*        server;  // Do not remove it, not owned by this
+    wxString         dbname;
+
+    friend class dlgSelectDatabase;
+   
+};
+
+
+class dlgSelectDatabase: public wxDialog
+{
+
+public:
+    dlgSelectDatabase(wxWindow* parent, int id, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxCLOSE_BOX);
+
+    wxString getConnInfo();
+    static bool getValidConnectionString(wxString connStr, wxString& resultStr);
+
+protected:
+    void Initialize();
+    void OnSelect(wxTreeEvent& ev);
+    void OnSelActivate(wxTreeEvent& ev);
+
+    wxTreeCtrl *tcServers;
+    dlgSelDBNode *selectedConn;
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif
+
Index: db/pgSet.cpp
===================================================================
--- db/pgSet.cpp	(revision 7511)
+++ db/pgSet.cpp	(working copy)
@@ -203,8 +203,21 @@
     return col;
 }
 
+bool pgSet::HasColumn(const wxString &colname) const
+{
+    if (needColQuoting)
+    {
+        wxString quotedColName = colname;
+        quotedColName.Replace(wxT("\""), wxT("\"\""));
+        return (PQfnumber(res, (wxT("\"") + quotedColName + wxT("\"")).mb_str(conv)) < 0 ? false : true);
+    }
+    else
+        return (PQfnumber(res, colname.mb_str(conv)) < 0 ? false : true);
 
+}
 
+
+
 char *pgSet::GetCharPtr(const int col) const
 {
     wxASSERT(col < nCols && col >= 0);
Index: agent/dlgStep.cpp
===================================================================
--- agent/dlgStep.cpp	(revision 7511)
+++ agent/dlgStep.cpp	(working copy)
@@ -14,16 +14,22 @@
 #include "utils/misc.h"
 #include "agent/dlgStep.h"
 #include "agent/pgaStep.h"
+#include "dlg/dlgSelectDatabase.h"
+#include "schema/pgTable.h"
 
 
 // pointer to controls
-#define	txtID				CTRL_TEXT("txtID")
+#define txtID               CTRL_TEXT("txtID")
 #define chkEnabled          CTRL_CHECKBOX("chkEnabled")
-#define cbDatabase          CTRL_COMBOBOX("cbDatabase")
 #define rbxKind             CTRL_RADIOBOX("rbxKind")
 #define rbxOnError          CTRL_RADIOBOX("rbxOnError")
 #define pnlDefinition       CTRL_PANEL("pnlDefinition")
 #define txtSqlBox           CTRL_TEXT("txtSqlBox")
+#define cbDatabase          CTRL_COMBOBOX2("cbDatabase")
+#define txtDatabase         CTRL_TEXT("txtDatabase")
+#define btnSelDatabase      CTRL_BUTTON("btnSelDatabase")
+#define rbRemoteConn        CTRL_RADIOBUTTON("rbRemoteConn")
+#define rbLocalConn         CTRL_RADIOBUTTON("rbLocalConn")
 
 #define CTL_SQLBOX  188
 
@@ -32,7 +38,11 @@
     EVT_COMBOBOX(XRCID("cbDatabase"),               dlgProperty::OnChange)
     EVT_RADIOBOX(XRCID("rbxKind"),                  dlgProperty::OnChange)
     EVT_RADIOBOX(XRCID("rbxOnError"),               dlgProperty::OnChange)
+    EVT_TEXT(XRCID("txtDatabase"),                  dlgProperty::OnChange)
     EVT_STC_MODIFIED(CTL_SQLBOX,                    dlgProperty::OnChangeStc)
+    EVT_BUTTON(XRCID("btnSelDatabase"),             dlgStep::OnSelectDatabase)
+    EVT_RADIOBUTTON(XRCID("rbRemoteConn"),          dlgStep::OnSelRemoteConn)
+    EVT_RADIOBUTTON(XRCID("rbLocalConn"),           dlgStep::OnSelLocalConn)
 END_EVENT_TABLE();
 
 
@@ -61,7 +71,7 @@
     delete placeholder;
     sizer->Layout();
 
-	txtID->Disable();
+    txtID->Disable();
 }
 
 
@@ -73,6 +83,8 @@
 
 int dlgStep::Go(bool modal)
 {
+
+    hasConnStrSupport = pgTable::HasColumn(connection, wxT("pgagent"), wxT("pga_jobstep"), wxT("jstconnstr"));
     cbDatabase->Append(wxT(" "));
     cbDatabase->SetSelection(0);
 
@@ -90,12 +102,26 @@
     if (step)
     {
         // edit mode
-		recId = step->GetRecId();
-		txtID->SetValue(NumToStr(recId));
-        if (step->GetDbname().IsEmpty())
-            cbDatabase->SetSelection(0);
+        recId = step->GetRecId();
+        txtID->SetValue(NumToStr(recId));
+
+        if (step->HasConnectionString())
+        {
+            rbRemoteConn->SetValue(true);
+            txtDatabase->Enable(true);
+            txtDatabase->ChangeValue(step->GetConnStr());
+            btnSelDatabase->Enable(true);
+            cbDatabase->Enable(false);
+        }
         else
-            cbDatabase->SetValue(step->GetDbname());
+        {
+			rbLocalConn->SetValue(true);
+            if (step->GetDbname().IsEmpty())
+                cbDatabase->SetSelection(0);
+            else
+                cbDatabase->SetValue(step->GetDbname());
+        }
+
         rbxKind->SetSelection(wxString(wxT("sb")).Find(step->GetKindChar()));
         rbxOnError->SetSelection(wxString(wxT("fsi")).Find(step->GetOnErrorChar()));
         sqlBox->SetText(step->GetCode());
@@ -105,6 +131,12 @@
     else
     {
         // create mode
+        rbLocalConn->SetValue(true);
+        cbDatabase->Enable(true);
+        btnSelDatabase->Enable(false);
+        txtDatabase->Enable(false);
+        if (!hasConnStrSupport)
+            rbLocalConn->Enable(false);
     }
 
     return dlgProperty::Go(modal);
@@ -128,19 +160,43 @@
     {
         enable  =  name != step->GetName()
                 || chkEnabled->GetValue() != step->GetEnabled()
-                || cbDatabase->GetValue().Trim() != step->GetDbname()
                 || rbxKind->GetSelection() != wxString(wxT("sb")).Find(step->GetKindChar())
                 || rbxOnError->GetSelection() != wxString(wxT("fsi")).Find(step->GetOnErrorChar())
                 || txtComment->GetValue() != step->GetComment()
                 || sqlBox->GetText() != step->GetCode();
+
+        if (!enable && rbxKind->GetSelection() == 0)
+        {
+            if (hasConnStrSupport)
+            {
+                if (step->HasConnectionString())
+                {
+                    if (rbRemoteConn->GetValue())
+                        enable = txtDatabase->GetValue().Trim() != step->GetConnStr();
+                    else
+                        enable = true;
+                }
+                else
+                {
+                    if (rbRemoteConn->GetValue())
+                        enable = true;
+                    else
+                        enable = cbDatabase->GetValue().Trim() != step->GetDbname();
+                }
+            }
+            else
+            {
+                enable = cbDatabase->GetValue().Trim() != step->GetDbname();
+            }
+        }
     }
     else
     {
         enable=true;
     }
 
-	if (statusBar)
-		statusBar->SetStatusText(wxEmptyString);
+    if (statusBar)
+        statusBar->SetStatusText(wxEmptyString);
 
     CheckValid(enable, !name.IsEmpty(), _("Please specify name."));
     CheckValid(enable, sqlBox->GetLength() > 0, _("Please specify code to execute."));
@@ -148,13 +204,47 @@
     // Disable/enable the database combo
     if (rbxKind->GetSelection() == 1)
     {
-        cbDatabase->SetSelection(0);
+        rbRemoteConn->Enable(false);
+        rbLocalConn->Enable(false);
+        // I don't see any reason to make
+        // the database combobox selection to 0
+        //cbDatabase->SetSelection(0);
+        txtDatabase->Enable(false);
+        btnSelDatabase->Enable(false);
         cbDatabase->Enable(false);
     }
     else
     {
-        cbDatabase->Enable(true);
-        CheckValid(enable, !cbDatabase->GetValue().Trim().IsEmpty(), _("Please select a database."));
+        if (hasConnStrSupport)
+        {
+            rbRemoteConn->Enable(true);
+            rbLocalConn->Enable(true);
+            if (rbRemoteConn->GetValue())
+            {
+                wxString validConnStr;                
+
+                btnSelDatabase->Enable(true);
+                txtDatabase->Enable(true);
+                cbDatabase->Enable(false);
+                CheckValid(enable, !txtDatabase->GetValue().Trim().IsEmpty(), _("Please select a connection string."));
+                CheckValid(enable, dlgSelectDatabase::getValidConnectionString(txtDatabase->GetValue().Trim(), validConnStr), _("Please enter a valid connection string"));
+            }
+            else
+            {
+                cbDatabase->Enable(true);
+                btnSelDatabase->Enable(false);
+                txtDatabase->Enable(false);
+                CheckValid(enable, !cbDatabase->GetValue().Trim().IsEmpty(), _("Please select a database."));
+            }
+        }
+        else
+        {
+            cbDatabase->Enable(true);
+            // Make sure both radio buttons are disabled
+            rbRemoteConn->Enable(false);
+            rbLocalConn->Enable(false);
+            CheckValid(enable, !cbDatabase->GetValue().Trim().IsEmpty(), _("Please select a database."));
+        }
     }
 
     EnableOK(enable);
@@ -178,19 +268,39 @@
         wxString name=GetName();
         wxString kind = wxT("sb")[rbxKind->GetSelection()];
         wxString onerror = wxT("fsi")[rbxOnError->GetSelection()];
-        wxString db;
+        wxString db, connstr;
         wxString jstjobid;
         if (jobId)
             jstjobid = NumToStr(jobId);
         else
             jstjobid = wxT("<JobId>");
+        // SQL script expected
+        if (rbxKind->GetSelection() == 0)
+        {
+            if (hasConnStrSupport && rbRemoteConn->GetValue())
+			{
+                connstr = qtDbString(txtDatabase->GetValue().Trim());
+				db = wxT("''");
+			}
+            else
+			{
+                db = qtDbString(cbDatabase->GetValue().Trim());
+				connstr = wxT("''");
+			}
+        }
 
-        db = qtDbString(cbDatabase->GetValue().Trim());
-
-        sql = wxT("INSERT INTO pgagent.pga_jobstep (jstid, jstjobid, jstname, jstdesc, jstenabled, jstkind, jstonerror, jstcode, jstdbname)\n")
-              wxT("SELECT <StpId>, ") + jstjobid + wxT(", ") + qtDbString(name) + wxT(", ") + qtDbString(txtComment->GetValue()) + wxT(", ")
+        sql = wxT("INSERT INTO pgagent.pga_jobstep (jstid, jstjobid, jstname, jstdesc, jstenabled, jstkind, jstonerror, jstcode, jstdbname");
+        if (hasConnStrSupport)
+            sql += wxT(", jstconnstr");
+        sql += wxT(")\n ") \
+               wxT("SELECT <StpId>, ") + jstjobid + wxT(", ") + qtDbString(name) + wxT(", ") + qtDbString(txtComment->GetValue()) + wxT(", ")
                 + BoolToStr(chkEnabled->GetValue()) + wxT(", ") + qtDbString(kind) + wxT(", ") 
-                + qtDbString(onerror) + wxT(", ") + qtDbString(sqlBox->GetText()) + wxT(", ") + db + wxT(";\n");
+                + qtDbString(onerror) + wxT(", ") + qtDbString(sqlBox->GetText()) + wxT(", ") + db;
+        if (hasConnStrSupport)
+        {
+            sql += wxT(", ") + connstr;
+        }
+        sql += wxT(";\n");
     }
     return sql;
 }
@@ -203,8 +313,8 @@
     if (step)
     {
         // edit mode
-
         wxString name=GetName();
+        wxString kind = wxT("sb")[rbxKind->GetSelection()];
 
         wxString vars;
         if (name != step->GetName())
@@ -219,19 +329,66 @@
                 vars.Append(wxT(", "));
             vars.Append(wxT("jstenabled=") + BoolToStr(chkEnabled->GetValue()));
         }
-        if (cbDatabase->GetValue().Trim() != step->GetDbname())
+        if (hasConnStrSupport && kind == wxT("s"))
         {
+            if (rbRemoteConn->GetValue())
+            {
+                if (step->HasConnectionString())
+                {
+                    if (txtDatabase->GetValue().Trim() != step->GetConnStr())
+                    {
+                        if (!vars.IsEmpty())
+                            vars.Append(wxT(", "));
+                        vars.Append(wxT("jstconnstr=") + qtDbString(txtDatabase->GetValue().Trim()));
+                    }
+                }
+                else
+                {
+                    if (!vars.IsEmpty())
+                        vars.Append(wxT(", "));
+                    vars.Append(wxT("jstconnstr=") + qtDbString(txtDatabase->GetValue().Trim()) + wxT(", "));
+                    vars.Append(wxT("jstdbname=''"));
+                }
+            }
+            else
+            {
+                if (step->HasConnectionString())
+                {
+                    if (!vars.IsEmpty())
+                        vars.Append(wxT(", "));
+                    vars.Append(wxT("jstdbname=") + qtDbString(cbDatabase->GetValue().Trim()) + wxT(", "));
+                    vars.Append(wxT("jstconnstr=''"));
+                }
+                else
+                {
+                    if (cbDatabase->GetValue().Trim() != step->GetDbname())
+                    {
+                        if (!vars.IsEmpty())
+                            vars.Append(wxT(", "));
+                        vars.Append(wxT("jstdbname=") + qtDbString(cbDatabase->GetValue().Trim()));
+                    }
+                }
+            }
+        }
+        else if (kind == wxT("s"))
+        {
+            if (cbDatabase->GetValue().Trim() != step->GetDbname())
+            {
+                if (!vars.IsEmpty())
+                    vars.Append(wxT(", "));
+                vars.Append(wxT("jstdbname=") + qtDbString(cbDatabase->GetValue().Trim()));
+            }
+        }
+        else
+        {
             if (!vars.IsEmpty())
                 vars.Append(wxT(", "));
-            
-            if (!cbDatabase->GetCurrentSelection())
-                vars.Append(wxT("jstdbname=''"));
-            else
-                vars.Append(wxT("jstdbname=") + qtDbString(cbDatabase->GetValue()));
+            vars.Append(wxT("jstdbname=''"));
+            if (hasConnStrSupport)
+                vars.Append(wxT(", jstconnstr=''"));
         }
-        if (rbxKind->GetSelection() != wxString(wxT("sb")).Find(step->GetKindChar()))
+        if (rbxKind->GetSelection() != kind)
         {
-            wxString kind = wxT("sb")[rbxKind->GetSelection()];
             if (!vars.IsEmpty())
                 vars.Append(wxT(", "));
             vars.Append(wxT("jstkind=") + qtDbString(kind));
@@ -278,3 +435,38 @@
 	else
 		return true;
 }
+
+void dlgStep::OnSelectDatabase(wxCommandEvent &ev)
+{
+    dlgSelectDatabase dlgSD(this, wxID_ANY);
+    if (dlgSD.ShowModal() == wxID_OK)
+    {
+        wxString strConnStr = dlgSD.getConnInfo();
+        if (!strConnStr.IsEmpty())
+            txtDatabase->SetValue(strConnStr);
+    }
+}
+
+void dlgStep::OnSelRemoteConn(wxCommandEvent& ev)
+{
+    if (rbRemoteConn->GetValue())
+    {
+        cbDatabase->Enable(false);
+        btnSelDatabase->Enable(true);
+        txtDatabase->Enable(true);
+    }
+    dlgProperty::OnChange(ev);
+}
+
+void dlgStep::OnSelLocalConn(wxCommandEvent& ev)
+{
+    if (rbLocalConn->GetValue())
+    {
+        cbDatabase->Enable(true);
+        btnSelDatabase->Enable(false);
+        txtDatabase->Enable(false);
+    }
+    dlgProperty::OnChange(ev);
+}
+
+
Index: agent/pgaStep.cpp
===================================================================
--- agent/pgaStep.cpp	(revision 7511)
+++ agent/pgaStep.cpp	(working copy)
@@ -56,7 +56,10 @@
         properties->AppendItem(_("ID"), GetRecId());
         properties->AppendItem(_("Enabled"), GetEnabled());
         properties->AppendItem(_("Kind"), GetKind());
-        properties->AppendItem(_("Database"), GetDbname());
+        if (GetConnStr().IsEmpty())
+            properties->AppendItem(_("Database"), GetDbname());
+        else
+            properties->AppendItem(_("Connection String"), GetConnStr());
         properties->AppendItem(_("Code"), GetCode());
         properties->AppendItem(_("On error"), GetOnError());
 
@@ -98,6 +101,8 @@
             step->iSetRecId(steps->GetLong(wxT("jstid")));
 			step->iSetXid(steps->GetOid(wxT("xmin")));
             step->iSetDbname(steps->GetVal(wxT("jstdbname")));
+            if (steps->HasColumn(wxT("jstconnstr")))
+                step->iSetConnStr(steps->GetVal(wxT("jstconnstr")));
             step->iSetCode(steps->GetVal(wxT("jstcode")));
             step->iSetEnabled(steps->GetBool(wxT("jstenabled")));
 
Index: schema/pgTable.cpp
===================================================================
--- schema/pgTable.cpp	(revision 7511)
+++ schema/pgTable.cpp	(working copy)
@@ -1211,3 +1211,53 @@
     return obj && obj->IsCreatedBy(tableFactory) && ((pgTable*)obj)->GetConnection()->BackendMinimumVersion(8, 2);
 }
 
+
+bool pgTable::HasColumn(pgConn *conn, wxString schemaname, wxString tblname, const wxString& colname)
+{
+    //
+    // SELECT a.attname
+    // FROM pg_catalog.pg_attribute a
+    // WHERE a.attrelid = (SELECT c.oid
+    //                     FROM pg_catalog.pg_class c
+    //                          LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+    //                     WHERE c.relname ~ '^(TABLENAME)$' AND 
+    //                           pg_catalog.pg_table_is_visible(c.oid) AND 
+    //                           n.nspname ~ '^(SCHEMANAME)$') AND 
+    //       a.attnum > 0 AND NOT a.attisdropped
+    // ORDER BY a.attnum
+    //
+    if (conn && conn->GetStatus() == PGCONN_OK)
+    {
+		tblname.Replace(wxT("\\"), wxT("\\\\"));
+		tblname.Replace(wxT("'"), wxT("''"));
+		schemaname.Replace(wxT("\\"), wxT("\\\\"));
+		schemaname.Replace(wxT("'"), wxT("''"));
+
+        wxString sql
+          = wxT("SELECT a.attname AS colname FROM pg_catalog.pg_attribute a ") \
+            wxT("WHERE a.attrelid = (SELECT c.oid FROM pg_catalog.pg_class c ") \
+            wxT("                    LEFT JOIN pg_catalog.pg_namespace n ON ") \
+            wxT("                                    n.oid = c.relnamespace ") \
+            wxT("                    WHERE c.relname ~ '^(") + tblname + wxT(")$' AND ") \
+            wxT("                          n.nspname ~ '^(") + schemaname + wxT(")$') AND ") \
+            wxT("      a.attnum > 0 AND NOT a.attisdropped ") \
+            wxT("ORDER BY a.attnum");
+
+        pgSet* set = conn->ExecuteSet(sql);
+        if (set)
+        {
+            while (!set->Eof())
+            {
+                if (set->GetVal(wxT("colname")) == colname)
+				{
+					delete set;
+                    return true;
+				}
+                set->MoveNext();
+            }
+        }
+		delete set;
+    }
+
+    return false;
+}
Index: pgAdmin3.vcproj
===================================================================
--- pgAdmin3.vcproj	(revision 7511)
+++ pgAdmin3.vcproj	(working copy)
@@ -655,6 +655,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\dlg\dlgSelectDatabase.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\dlg\dlgSequence.cpp"
 				>
 			</File>
@@ -1966,6 +1970,10 @@
 					>
 				</File>
 				<File
+					RelativePath=".\include\dlg\dlgSelectDatabase.h"
+					>
+				</File>
+				<File
 					RelativePath=".\include\dlg\dlgSequence.h"
 					>
 				</File>
Index: dlg/module.mk
===================================================================
--- dlg/module.mk	(revision 7511)
+++ dlg/module.mk	(working copy)
@@ -53,7 +53,8 @@
 	$(srcdir)/dlg/dlgType.cpp \
 	$(srcdir)/dlg/dlgUser.cpp \
 	$(srcdir)/dlg/dlgView.cpp \
-	$(srcdir)/dlg/dlgManageMacros.cpp
+	$(srcdir)/dlg/dlgManageMacros.cpp \
+	$(srcdir)/dlg/dlgSelectDatabase.cpp
 
 EXTRA_DIST += \
         $(srcdir)/dlg/module.mk 
Index: dlg/dlgSelectDatabase.cpp
===================================================================
--- dlg/dlgSelectDatabase.cpp	(revision 0)
+++ dlg/dlgSelectDatabase.cpp	(revision 0)
@@ -0,0 +1,307 @@
+//////////////////////////////////////////////////////////////////////////
+//
+// pgAdmin III - PostgreSQL Tools
+// RCS-ID:      $Id:$
+// Copyright (C) 2002 - 2008, The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// dlgSelectDatabase.cpp - Database Selection for connection string
+//
+//////////////////////////////////////////////////////////////////////////
+
+// App headers
+#include "pgAdmin3.h"
+
+#include <wx/regex.h>
+
+#include "utils/misc.h"
+#include "dlg/dlgSelectDatabase.h"
+#include "schema/pgServer.h"
+#include "frm/frmMain.h"
+
+extern frmMain *winMain;
+wxWindowID TCSERVER_ID = ::wxNewId();
+
+BEGIN_EVENT_TABLE(dlgSelectDatabase, wxDialog)
+    EVT_TREE_ITEM_ACTIVATED (TCSERVER_ID, dlgSelectDatabase::OnSelActivate)
+    EVT_TREE_SEL_CHANGED    (TCSERVER_ID, dlgSelectDatabase::OnSelect) 
+END_EVENT_TABLE()
+
+
+dlgSelectDatabase::dlgSelectDatabase(wxWindow* parent, int id, const wxPoint& pos, const wxSize& size, long style):
+    wxDialog(parent, id, wxT("Select Database"), pos, size, wxDEFAULT_DIALOG_STYLE)
+{
+
+#ifdef __WXMSW__
+    SetWindowStyleFlag(GetWindowStyleFlag() & ~wxMAXIMIZE_BOX);
+#endif
+
+    wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
+
+    tcServers = new wxTreeCtrl(this, TCSERVER_ID);
+    mainSizer->Add(tcServers, 1, wxEXPAND, 0);
+
+    wxBoxSizer *bottomSizer = new wxBoxSizer(wxHORIZONTAL);
+
+    bottomSizer->AddStretchSpacer();
+
+    wxButton *btnOk = new wxButton(this, wxID_OK, wxT("&OK"));
+    bottomSizer->Add(btnOk);
+ 
+    wxButton *btnCANCEL = new wxButton(this, wxID_CANCEL, wxT("&Cancel"));
+    bottomSizer->Add(btnCANCEL, 0, wxLEFT, 10);
+
+    mainSizer->Add(bottomSizer, 0, wxALL|wxALIGN_RIGHT, 5);
+    SetSizer(mainSizer);
+
+    SetSize(wxSize(200, 240));
+
+    Layout();
+    Centre();
+
+    Initialize();
+}
+
+void dlgSelectDatabase::Initialize()
+{
+    // Add the root node
+    pgServerCollection *serversObj = new pgServerCollection(serverFactory.GetCollectionFactory());
+    wxTreeItemId rootItemID = tcServers->AddRoot(wxGetTranslation(serverFactory.GetCollectionFactory()->GetTypeName()),
+           serversObj->GetIconId(), -1, serversObj);
+    tcServers->SetImageList(imageList);
+ 
+    ctlTree *browser=winMain->GetBrowser();
+    wxCookieType cookie;
+
+    wxTreeItemId servers=browser->GetRootItem();
+    wxTreeItemId serverItem=browser->GetFirstChild(servers, cookie);
+    while (serverItem)
+    {
+        pgServer *server = (pgServer*)browser->GetObject(serverItem);
+
+        dlgSelDBNode *cnInfo = new dlgSelDBNode(server);
+        wxTreeItemId itm = tcServers->AppendItem(rootItemID, server->GetFullName(), server->GetIconId(), -1, cnInfo);
+
+        pgConn* conn = server->connection();
+        
+        if (conn && conn->GetStatus() == PGCONN_OK)
+        {
+            pgSet *res = conn->ExecuteSet(wxT("SELECT datname, datallowconn FROM pg_catalog.pg_database"));
+            if (res)
+            {
+                while (!res->Eof())
+                {
+                    if (res->GetBool(wxT("datallowconn")))
+                    {
+                        dlgSelDBNode *cnInfo = new dlgSelDBNode(server, res->GetVal(wxT("datname")));
+                        tcServers->AppendItem(itm, cnInfo->getDatabase(), -1, -1, cnInfo);
+                    }
+
+                    res->MoveNext();
+                }
+            }
+        }
+
+        serverItem = browser->GetNextChild(servers, cookie);
+    }
+
+    tcServers->Expand(servers);
+    selectedConn = NULL;
+}
+
+void dlgSelectDatabase::OnSelect(wxTreeEvent& ev)
+{
+    wxTreeItemId sel = tcServers->GetSelection();
+
+    if (sel.IsOk() && sel != tcServers->GetRootItem())
+    {
+        selectedConn = (dlgSelDBNode *)tcServers->GetItemData(sel);
+    }
+    else
+    {
+       selectedConn = NULL;
+    }
+}
+
+void dlgSelectDatabase::OnSelActivate(wxTreeEvent& ev)
+{
+    wxTreeItemId selID = tcServers->GetSelection();
+
+    if (selID.IsOk() && selID != tcServers->GetRootItem())
+    {
+        selectedConn = (dlgSelDBNode *)tcServers->GetItemData(selID);
+
+        if (selectedConn->dbname.IsEmpty() && tcServers->GetChildrenCount(selID, false) == 0)
+        {
+            winMain->ReconnectServer(selectedConn->server, true);
+
+            pgConn* conn = selectedConn->server->connection();
+            if (conn && conn->GetStatus() == PGCONN_OK)
+            {
+                pgSet *res = conn->ExecuteSet(wxT("SELECT datname, datallowconn FROM pg_catalog.pg_database"));
+                if (res)
+                {
+                    while (!res->Eof())
+                    {
+                        if (res->GetBool(wxT("datallowconn")))
+                        {
+                            dlgSelDBNode *cnInfo = new dlgSelDBNode(selectedConn->server, res->GetVal(wxT("datname")));
+                            tcServers->AppendItem(selID, cnInfo->getDatabase(), -1, -1, cnInfo);
+                        }
+    
+                        res->MoveNext();
+                    }
+                }
+            }
+            tcServers->Expand(selID);
+        }
+    }
+    else
+    {
+       selectedConn = NULL;
+    }
+}
+
+
+wxString dlgSelectDatabase::getConnInfo()
+{
+    if (selectedConn)
+    {
+        return selectedConn->getConnectionString();
+    }
+
+    return wxEmptyString;
+}
+
+bool dlgSelectDatabase::getValidConnectionString(wxString connStr, wxString& resultStr)
+{
+    wxString      user;
+    wxString      dbname;
+    wxString      host;
+    unsigned long port = 0;
+    wxString      password;
+    unsigned long connection_timeout = 0; 
+
+    wxRegEx propertyExp;
+    
+    // Remove white-spaces ahead the '="
+    bool res = propertyExp.Compile(wxT("(([ ]*[\t]*)+)="));
+    propertyExp.ReplaceAll(&connStr, wxT("="));
+
+    // Remove white-spaces after the '="
+    res = propertyExp.Compile(wxT("=(([ ]*[\t]*)+)"));
+    propertyExp.ReplaceAll(&connStr, wxT("="));
+    wxArrayString tokens = wxStringTokenize(connStr, wxT("\t \n\r"));
+
+    unsigned int index = 0;
+    while (index < tokens.Count())
+    {
+        wxString prop, value;
+        
+        // Find pairs
+        //   i.e. user=xxx
+        //        password=xxx
+        wxArrayString pairs = wxStringTokenize(tokens[index++], wxT("="));
+
+        // pair must exist in pair=value format
+        if (pairs.GetCount()!= 2)
+            return false;
+
+        prop=pairs[0];
+        value=pairs[1];
+
+        if (prop.CmpNoCase(wxT("user")) == 0)
+            user = value;
+        else if (prop.CmpNoCase(wxT("host")) == 0 || prop.CmpNoCase(wxT("hostAddr")) == 0)
+            host = value;
+        else if (prop.CmpNoCase(wxT("port")) == 0)
+        {
+            if (!value.ToULong(&port))
+                // port must be an unsigned integer
+                return false;
+        }
+        else if (prop.CmpNoCase(wxT("password")) == 0)
+            password = value;
+        else if (prop.CmpNoCase(wxT("connection_timeout")) == 0)
+        {
+            if (!value.ToULong(&connection_timeout))
+                // connection timeout must be an unsigned interger
+                return false;
+        }
+        else if (prop.CmpNoCase(wxT("dbname")) == 0)
+            dbname = value;
+        else
+            // Not valid property found
+            return false;
+    }
+
+    if (dbname.IsEmpty())
+        return false;
+
+    if (!user.IsEmpty())
+        resultStr = wxT("user=") + user + wxT(" ");
+
+    if (!host.IsEmpty())
+    {
+        resultStr += wxT("host=") + host + wxT(" ");
+    }
+
+
+    if (!resultStr.IsEmpty())
+        resultStr += wxT(" ");
+    resultStr += wxT("dbname=") + dbname + wxT(" ");
+
+    if (port != 0)
+    {
+        wxString portStr;
+        portStr.Printf(wxT("port=%d"), port);
+        resultStr += portStr + wxT(" ");
+    }
+
+
+    if (connection_timeout != 0)
+    {
+        wxString strConnTimeOut;
+        strConnTimeOut.Printf(wxT("connection_timeout=%d"), connection_timeout);
+        resultStr += strConnTimeOut + wxT(" ");
+    }
+
+    if (!password.IsEmpty())
+    {
+        resultStr += wxT("password=") + password + wxT(" ");
+    }
+    
+    resultStr = resultStr.Trim();
+    
+    return true;
+}
+
+dlgSelDBNode::dlgSelDBNode (pgServer *_server, const wxString& _dbname)
+{
+    server = _server;
+    dbname = _dbname;
+}
+
+wxString dlgSelDBNode::getConnectionString()
+{
+    if (dbname.IsEmpty())
+        return wxEmptyString;
+
+    pgConn *conn = server->connection();
+    wxString connStr;
+
+    if (conn && conn->GetStatus() == PGCONN_OK)
+    {
+        connStr += wxT("user=") + conn->GetUser() + wxT(" ");
+        connStr += wxT("hostaddr=") + conn->GetHostAddress() + wxT(" ");
+
+        wxString port;
+        port.Printf(wxT("port=%d "), conn->GetPort());
+        connStr += port;
+
+        connStr += wxT("dbname=") + dbname;
+    }
+
+    return connStr;
+}
+
Index: ui/dlgStep.xrc
===================================================================
--- ui/dlgStep.xrc	(revision 7511)
+++ ui/dlgStep.xrc	(working copy)
@@ -17,10 +17,10 @@
             <object class="wxPanel" name="pnlProperties">
               <object class="wxFlexGridSizer">
                 <cols>2</cols>
-                <rows>6</rows>
+                <rows>8</rows>
                 <vgap>5</vgap>
                 <hgap>5</hgap>
-                <growablerows>5</growablerows>
+                <growablerows>7</growablerows>
                 <growablecols>1</growablecols>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stName">
@@ -64,6 +64,39 @@
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
+                  <object class="wxStaticText" name="stConnType">
+                    <label>Connection Type</label>
+                  </object>
+                  <flag>wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <option>1</option>
+                  <object class="wxGridSizer">
+                    <hgap>0</hgap>
+                    <rows>1</rows>
+                    <cols>2</cols>
+                    <vgap>0</vgap>
+                    <object class="sizeritem">
+                      <object class="wxRadioButton" name="rbLocalConn">
+                        <style>wxRB_GROUP</style>
+                        <label>Local</label>
+                        <enable>0</enable>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxRadioButton" name="rbRemoteConn">
+                        <label>Remote</label>
+                        <enable>0</enable>
+                      </object>
+                      <flag>wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    </object>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
                   <object class="wxStaticText" name="stDatabase">
                     <label>Database</label>
                   </object>
@@ -74,11 +107,45 @@
                   <object class="wxComboBox" name="cbDatabase">
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
+                    <enable>0</enable>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
+                  <object class="wxStaticText" name="stConnStr">
+                    <label>Connection String</label>
+                  </object>
+                  <flag>wxALIGN_TOP|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxPanel">
+                    <object class="wxFlexGridSizer">
+                      <cols>2</cols>
+                      <rows>1</rows>
+                      <growablerows></growablerows>
+                      <growablecols>0</growablecols>
+                      <object class="sizeritem">
+                        <object class="wxTextCtrl" name="txtDatabase">
+                          <enable>0</enable>
+                        </object>
+                        <flag>wxLEFT|wxRIGHT|wxGROW|wxEXPAND</flag>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxButton" name="btnSelDatabase">
+                          <label>...</label>
+                          <size>30,25</size>
+                          <enable>0</enable>
+                        </object>
+                      </object>
+                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    </object>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
                   <object class="wxRadioBox" name="rbxKind">
                     <content>
                       <item>SQL</item>