Fix WARN->NOTICE in docs. Change libpgeasy connection parameters to use

bmomjian · bmomjian · commit f63ba5cd6a71 · 2000-05-18T14:24:38.000Z
PQconnectdb() style connections.
diff --git a/contrib/findoidjoins/findoidjoins.c b/contrib/findoidjoins/findoidjoins.c
@@ -22,11 +22,14 @@ main(int argc, char **argv)
 	char		attname[256];
 	char		typname[256];
 	int			count;
+	char	    optstr[256];
 
 	if (argc != 2)
 		halt("Usage:  %s database\n", argv[0]);
 
-	connectdb(NULL, NULL, NULL, NULL, argv[1]);
+	snprintf(optstr, 256, "dbname=%s", argv[1]);
+	connectdb(optstr);
+
 	on_error_continue();
 	on_error_stop();
 
diff --git a/doc/src/sgml/libpgeasy.sgml b/doc/src/sgml/libpgeasy.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpgeasy.sgml,v 2.2 2000/04/27 18:45:43 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpgeasy.sgml,v 2.3 2000/05/18 14:24:31 momjian Exp $
 -->
 
  <chapter id="pgeasy-chapter">
@@ -35,7 +35,7 @@ PGresult   *doquery(char *query);
 
     <listitem>
      <para>
-PGconn     *connectdb();
+PGconn     *connectdb(char *options);
      </para>
     </listitem>
 
@@ -108,7 +108,7 @@ void        unset_result(PGresult *oldres);
   </para>
 
   <para>
-   For <literal>select</literal> queries, <function>fetch</function>
+   For <literal>SELECT</literal> queries, <function>fetch</function>
    allows you to pass pointers as parameters, and on return the variables
    are filled with data from the binary cursor you opened.  These binary
    cursors can not be used if you are running the
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.3 2000/03/31 06:17:21 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.4 2000/05/18 14:24:32 momjian Exp $
 -->
 
  <chapter>
@@ -303,7 +303,7 @@ CREATE TRIGGER trig_mytab_modcount BEFORE INSERT OR UPDATE ON mytab
       <term>elog <replaceable>level</replaceable> <replaceable>msg</replaceable></term>
       <listitem>
        <para>
-	Fire a log message. Possible levels are NOTICE, WARN, ERROR,
+	Fire a log message. Possible levels are NOTICE, ERROR,
 	FATAL, DEBUG and NOIND
 	like for the <function>elog</function> C function.
        </para>
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.6 1999/07/22 15:09:10 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.7 2000/05/18 14:24:32 momjian Exp $
 Postgres documentation
 -->
 
@@ -80,7 +80,7 @@ DROP
      </varlistentry>
      <varlistentry>
       <term><computeroutput>
-WARN RemoveAggregate: aggregate '<replaceable class="parameter">agg</replaceable>' for '<replaceable class="parameter">type</replaceable>' does not exist
+NOTICE RemoveAggregate: aggregate '<replaceable class="parameter">agg</replaceable>' for '<replaceable class="parameter">type</replaceable>' does not exist
        </computeroutput></term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.7 1999/07/22 15:09:10 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.8 2000/05/18 14:24:33 momjian Exp $
 Postgres documentation
 -->
 
@@ -77,7 +77,7 @@ DROP
      </varlistentry>
      <varlistentry>
       <term><computeroutput>
-WARN RemoveFunction: Function "<replaceable class="parameter">name</replaceable>" ("<replaceable class="parameter">types</replaceable>") does not exist
+NOTICE RemoveFunction: Function "<replaceable class="parameter">name</replaceable>" ("<replaceable class="parameter">types</replaceable>") does not exist
        </computeroutput></term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.6 1999/07/22 15:09:10 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.7 2000/05/18 14:24:33 momjian Exp $
 Postgres documentation
 -->
 
@@ -69,7 +69,7 @@ DROP
      </varlistentry>
      <varlistentry>
       <term><computeroutput>
-WARN: Relation "<replaceable class="parameter">name</replaceable>" does not exist.
+NOTICE: Relation "<replaceable class="parameter">name</replaceable>" does not exist.
        </computeroutput></term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.42 2000/04/18 15:23:34 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.43 2000/05/18 14:24:33 momjian Exp $
 Postgres documentation
 -->
 
@@ -919,7 +919,7 @@ SET VARIABLE
      
      <varlistentry>
       <term><computeroutput>
-WARN:  Bad value for <replaceable class="parameter">variable</replaceable> (<replaceable class="parameter">value</replaceable>)
+NOTICE:  Bad value for <replaceable class="parameter">variable</replaceable> (<replaceable class="parameter">value</replaceable>)
        </computeroutput></term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.11 2000/05/02 20:01:52 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.12 2000/05/18 14:24:32 momjian Exp $
 -->
 
  <chapter id="start">
@@ -243,7 +243,7 @@ FATAL 1:Feb 17 23:19:55:process userid (2360) != database owner (268)
      the following:
      <programlisting>
 % createdb mydb
-WARN:user "your username" is not allowed to create/destroy databases
+NOTICE:user "your username" is not allowed to create/destroy databases
 createdb: database creation failed on mydb.
      </programlisting>
     </para>
diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
@@ -423,7 +423,7 @@ trigf()
 	int		ret, i;
 
 	if (!CurrentTriggerData)
-		elog(WARN, "trigf: triggers are not initialized");
+		elog(NOTICE, "trigf: triggers are not initialized");
 	
 	/* tuple to return to Executor */
 	if (TRIGGER_FIRED_BY_UPDATE(CurrentTriggerData->tg_event))
@@ -446,13 +446,13 @@ trigf()
 	
 	/* Connect to SPI manager */
 	if ((ret = SPI_connect()) < 0)
-		elog(WARN, "trigf (fired %s): SPI_connect returned %d", when, ret);
+		elog(NOTICE, "trigf (fired %s): SPI_connect returned %d", when, ret);
 	
 	/* Get number of tuples in relation */
 	ret = SPI_exec("select count(*) from ttest", 0);
 	
 	if (ret < 0)
-		elog(WARN, "trigf (fired %s): SPI_exec returned %d", when, ret);
+		elog(NOTICE, "trigf (fired %s): SPI_exec returned %d", when, ret);
 	
 	i = SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &amp;isnull);
 	
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.14 2000/05/02 20:01:53 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.15 2000/05/18 14:24:32 momjian Exp $
 -->
 
  <chapter id="xfunc">
@@ -253,7 +253,7 @@ CREATE FUNCTION new_emp() RETURNS EMP
 
 	<programlisting>
 	 <computeroutput>
-WARN::function declared to return type EMP does not retrieve (EMP.*)
+NOTICE::function declared to return type EMP does not retrieve (EMP.*)
 	 </computeroutput>
 	</programlisting>
        </para>
@@ -286,7 +286,7 @@ SELECT name(new_emp()) AS nobody;
 
 	<programlisting>
 SELECT new_emp().name AS nobody;
-WARN:parser: syntax error at or near "."
+NOTICE:parser: syntax error at or near "."
 	</programlisting>
        </para>
       </listitem>
diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml
@@ -55,7 +55,7 @@ complex_in(char *str)
     double x, y;
     Complex *result;
     if (sscanf(str, " ( %lf , %lf )", &amp;x, &amp;y) != 2) {
-        elog(WARN, "complex_in: error in parsing
+        elog(NOTICE, "complex_in: error in parsing
         return NULL;
     }
     result = (Complex *)palloc(sizeof(Complex));
diff --git a/src/interfaces/libpgeasy/examples/Makefile b/src/interfaces/libpgeasy/examples/Makefile
@@ -4,12 +4,13 @@
 #    Makefile for pgeasy examples
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/examples/Attic/Makefile,v 1.1 1999/10/11 18:03:01 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/examples/Attic/Makefile,v 1.2 2000/05/18 14:24:37 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
+CFLAGS=-I/usr/local/pgsql/include
 TARGET = pginsert pgwordcount pgnulltest
-LDFLAGS = -lpgeasy
+LDFLAGS = -L/usr/local/pgsql/lib -lpgeasy
 
 all : $(TARGET)
 
diff --git a/src/interfaces/libpgeasy/examples/pginsert.c b/src/interfaces/libpgeasy/examples/pginsert.c
@@ -23,11 +23,13 @@ main(int argc, char **argv)
 				avarchar[51],
 				atext[51];
 	time_t		aabstime;
+	char	    optstr[256];
 
 	if (argc != 2)
 		halt("Usage:  %s database\n", argv[0]);
 
-	connectdb(NULL, NULL, NULL, NULL, argv[1]);
+	snprintf(optstr, 256, "dbname=%s", argv[1]);
+	connectdb(optstr);
 
 	on_error_continue();
 	doquery("DROP TABLE testfetch");
diff --git a/src/interfaces/libpgeasy/examples/pgnulltest.c b/src/interfaces/libpgeasy/examples/pgnulltest.c
@@ -34,11 +34,13 @@ main(int argc, char **argv)
 				avarchar_null,
 				atext_null,
 				aabstime_null;
+	char	    optstr[256];
 
 	if (argc != 2)
 		halt("Usage:  %s database\n", argv[0]);
 
-	connectdb(NULL, NULL, NULL, NULL, argv[1]);
+	snprintf(optstr, 256, "dbname=%s", argv[1]);
+	connectdb(optstr);
 
 	on_error_continue();
 	doquery("DROP TABLE testfetch");
diff --git a/src/interfaces/libpgeasy/examples/pgwordcount.c b/src/interfaces/libpgeasy/examples/pgwordcount.c
@@ -15,11 +15,14 @@ main(int argc, char **argv)
 	int			row = 0;
 	int			count;
 	char		line[4000];
+	char	    optstr[256];
 
 	if (argc != 2)
 		halt("Usage:  %s database\n", argv[0]);
 
-	connectdb(NULL, NULL, NULL, NULL, argv[1]);
+	snprintf(optstr, 256, "dbname=%s", argv[1]);
+	connectdb(optstr);
+
 	on_error_continue();
 	doquery("DROP TABLE words");
 	on_error_stop();
diff --git a/src/interfaces/libpgeasy/libpgeasy.3 b/src/interfaces/libpgeasy/libpgeasy.3
diff --git a/src/interfaces/libpgeasy/libpgeasy.c b/src/interfaces/libpgeasy/libpgeasy.c
@@ -44,16 +44,12 @@ static int	tuple;
 **
 */
 PGconn *
-connectdb(char *pghost,
-		  char *pgport,
-		  char *pgoptions,
-		  char *pgtty,
-		  char *dbName)
+connectdb(char *options)
 {
 	/* make a connection to the database */
-	conn = PQsetdb(pghost, pgport, pgoptions, pgtty, dbName);
+	conn = PQconnectdb(options);
 	if (PQstatus(conn) == CONNECTION_BAD)
-		halt("Connection to database '%s' failed.\n%s\n", dbName,
+		halt("Connection to database using '%s' failed.\n%s\n", options,
 			 PQerrorMessage(conn));
 	return conn;
 }
diff --git a/src/interfaces/libpgeasy/libpgeasy.h b/src/interfaces/libpgeasy/libpgeasy.h
@@ -4,11 +4,7 @@
 */
 
 PGresult   *doquery(char *query);
-PGconn *connectdb(char *pghost,
-		  char *pgport,
-		  char *pgoptions,
-		  char *pgtty,
-		  char *dbName);
+PGconn 	   *connectdb(char *options);
 void		disconnectdb(void);
 int			fetch(void *param,...);
 int			fetchwithnulls(void *param,...);
