Make pg_regress use CREATE OR REPLACE LANGUAGE, so that --load-language

tglsfdc · tglsfdc · commit b951c03f8812 · 2010-02-24T01:35:14.000Z
will work whether or not the specified language is preinstalled.  This
responds to some complaints about having to change test scripts because
plpgsql is preinstalled as of 9.0.
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.69 2010/01/02 16:58:15 momjian Exp $
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.70 2010/02/24 01:35:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1791,12 +1791,13 @@ create_database(const char *dbname)
 				 dbname, dbname, dbname, dbname, dbname);
 
 	/*
-	 * Install any requested procedural languages
+	 * Install any requested procedural languages.  We use CREATE OR REPLACE
+	 * so that this will work whether or not the language is preinstalled.
 	 */
 	for (sl = loadlanguage; sl != NULL; sl = sl->next)
 	{
 		header(_("installing %s"), sl->str);
-		psql_command(dbname, "CREATE LANGUAGE \"%s\"", sl->str);
+		psql_command(dbname, "CREATE OR REPLACE LANGUAGE \"%s\"", sl->str);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.69 2010/01/02 16:58:15 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.70 2010/02/24 01:35:14 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -1791,12 +1791,13 @@ create_database(const char *dbname)`
`1791`	`1791`	`dbname, dbname, dbname, dbname, dbname);`
`1792`	`1792`
`1793`	`1793`	`/*`
`1794`		`- * Install any requested procedural languages`
	`1794`	`+ * Install any requested procedural languages. We use CREATE OR REPLACE`
	`1795`	`+ * so that this will work whether or not the language is preinstalled.`
`1795`	`1796`	`*/`
`1796`	`1797`	`for (sl = loadlanguage; sl != NULL; sl = sl->next)`
`1797`	`1798`	`{`
`1798`	`1799`	`header(_("installing %s"), sl->str);`
`1799`		`- psql_command(dbname, "CREATE LANGUAGE \"%s\"", sl->str);`
	`1800`	`+ psql_command(dbname, "CREATE OR REPLACE LANGUAGE \"%s\"", sl->str);`
`1800`	`1801`	`}`
`1801`	`1802`	`}`
`1802`	`1803`