Default argument for createdb

Changed EXIT_ON_ERROR to ON_ERROR_STOP in psql

5 files changed, 38 insertions, 33 deletions

diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index bdb1e189a0c..15b9c14bde6 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.8 1999/12/07 22:41:41 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.9 2000/02/10 20:08:55 petere Exp $
 Postgres documentation
 -->
 
@@ -121,6 +121,8 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
        <para>
 	Specifies the name of the database to be created.  The name must be
 	unique among all <productname>PostgreSQL</productname> databases in this installation.
+        The default is to create a database with the same name as the
+        current system user.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 4d0bf428c0a..4d31f426d9e 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.23 2000/02/07 23:10:03 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.24 2000/02/10 20:08:55 petere Exp $
 Postgres documentation
 -->
 
@@ -1645,24 +1645,6 @@ bar
       </varlistentry>
 
       <varlistentry>
-        <term><envar>EXIT_ON_ERROR</envar></term>
-	<listitem>
-	<para>
-	By default, if non-interactive scripts encounter an error, such as a
-	malformed <acronym>SQL</acronym> query or internal meta-command,
-	processing continues. This is has been the traditional behaviour of
-        <application>psql</application>but is often less than desirable. If this variable
-	is set, script processing will immediately terminate. If the script was
-	called from another script it will terminate in the same fashion.
-	If the outermost script was not called from an interactive <application>psql</application>
-	session but rather using the <option>-f</option> option, <application>psql</application>
-	will return error code 3, to distinguish this case from fatal
-	error conditions (error code 1).
-	</para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><envar>HISTCONTROL</envar></term>
 	<listitem>
 	<para>
@@ -1767,6 +1749,24 @@ bar
       </varlistentry>
 
       <varlistentry>
+        <term><envar>ON_ERROR_STOP</envar></term>
+	<listitem>
+	<para>
+	By default, if non-interactive scripts encounter an error, such as a
+	malformed <acronym>SQL</acronym> query or internal meta-command,
+	processing continues. This is has been the traditional behaviour of
+        <application>psql</application> but it is sometimes not desirable. If this variable
+	is set, script processing will immediately terminate. If the script was
+	called from another script it will terminate in the same fashion.
+	If the outermost script was not called from an interactive <application>psql</application>
+	session but rather using the <option>-f</option> option, <application>psql</application>
+	will return error code 3, to distinguish this case from fatal
+	error conditions (error code 1).
+	</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><envar>PORT</envar></term>
 	<listitem>
 	<para>
@@ -1886,7 +1886,7 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp
 
     <para>
     Since colons may legally appear in queries, the following rule applies: If the variable
-    is not set, the character sequence <quote>colon name</quote> is not changed. In any
+    is not set, the character sequence <quote>colon+name</quote> is not changed. In any
     case you can escape a colon with a backslash to protect it from interpretation.
     (The colon syntax for variables is standard <acronym>SQL</acronym> for embedded
     query languages, such as <application>ecpg</application>. The colon syntax for
@@ -1987,8 +1987,8 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp
       <varlistentry>
         <term><literal>%:</literal><replaceable class="parameter">name</replaceable><literal>:</literal></term>
 	<listitem><para>
-	The value of the <application>psql</application>, <quote>magic</quote>, or environment
-	variable <replaceable class="parameter">name</replaceable>. See the section
+	The value of the <application>psql</application>, variable <replaceable
+        class="parameter">name</replaceable>. See the section
 	<quote><xref linkend="APP-PSQL-variables" endterm="APP-PSQL-variables-title"></quote>
 	for details.</para>
 	</listitem>
@@ -2024,7 +2024,7 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp
     <application>psql</application> returns 0 to the shell if it finished normally,
     1 if a fatal error of its own (out of memory, file not found) occurs, 2 if the
     connection to the backend went bad and the session is not interactive, and 3 if
-    an error occurred in a script and the variable <envar>EXIT_ON_ERROR</envar> was
+    an error occurred in a script and the variable <envar>ON_ERROR_STOP</envar> was
     set.
     </para>
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 261f1344203..fe1d76bc76c 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.16 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.17 2000/02/10 20:08:56 petere Exp $
  */
 #include <c.h>
 #include "help.h"
@@ -54,7 +54,7 @@ usage(void)
 	if (!user)
 	{
 #ifndef WIN32
-		pw = getpwuid(getuid());
+		pw = getpwuid(geteuid());
 		if (pw)
 			user = pw->pw_name;
 		else
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 325a6b5ed85..e16bf782f3b 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.17 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.18 2000/02/10 20:08:56 petere Exp $
  */
 #include <c.h>
 #include "mainloop.h"
@@ -138,7 +138,7 @@ MainLoop(FILE *source)
 
 
 		/* Setting this will not have effect until next line. */
-		die_on_error = GetVariableBool(pset.vars, "EXIT_ON_ERROR");
+		die_on_error = GetVariableBool(pset.vars, "ON_ERROR_STOP");
 
 		/*
 		 * query_buf holds query already accumulated.  line is the
diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb
index 3fba2ae0e59..fd07e27292a 100644
--- a/src/bin/scripts/createdb
+++ b/src/bin/scripts/createdb
@@ -11,7 +11,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.7 2000/01/19 20:08:35 petere Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.8 2000/02/10 20:08:58 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -126,7 +126,7 @@ fi
 
 if [ -n "$MB" ]
 then
-        mbcode=`pg_encoding "$MB"`
+        mbcode=`${PATHNAME}pg_encoding "$MB"`
         if [ -z "$mbcode" ]
 	then
 		echo "$CMDNAME: \"$MB\" is not a valid encoding name"
@@ -135,9 +135,12 @@ then
 fi
 
 if [ -z "$dbname" ]; then
-	echo "$CMDNAME: missing required argument database name"
-        echo "Try -? for help."
-	exit 1
+        if [ "$PGUSER" ]; then
+                dbname=$PGUSER
+        else
+                dbname=`${PATHNAME}pg_id -u -n`
+        fi
+        [ $? -ne 0 ] && exit 1
 fi