OSDN Git Service

>>Also, what is the default connection mode of psql? It should probably be
authorBruce Momjian <bruce@momjian.us>
Wed, 24 Mar 2004 03:10:29 +0000 (03:10 +0000)
committerBruce Momjian <bruce@momjian.us>
Wed, 24 Mar 2004 03:10:29 +0000 (03:10 +0000)
>>equivalent to "-h localhost", shouldn't it?
>>
>>
>
>Now that is something I had not thought of.  Seems we can assume a Win32
>psql can never use unix domain sockets, so defaulting that to localhost
>is a good solution too.

Andrew Dunstan

src/bin/psql/startup.c

index 03f4e97..4991c7b 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.86 2004/03/21 22:29:11 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.87 2004/03/24 03:10:29 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -154,6 +154,11 @@ main(int argc, char *argv[])
        pset.getPassword = false;
 #endif
 
+#ifndef HAVE_UNIX_SOCKETS
+       /* default to localhost on platforms without unix sockets */
+       options.host = "localhost";
+#endif
+
        parse_psql_options(argc, argv, &options);
 
        if (!pset.popt.topt.fieldSep)