[Lxr-commits] CVS: lxr/templates/initdb initdb-p-template.sql, 1.4, 1.5

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/initdb
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7723/templates/initdb

Modified Files:
	initdb-p-template.sql 
Log Message:
templates/html/initdb-p-template.sql: fix for PostgreSQL releases prior to 9.0

In these older releases, plpgsql language manager is not loaded by default. Insert commands in script output to fix the issue.

Index: initdb-p-template.sql
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/initdb/initdb-p-template.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- initdb-p-template.sql	17 Nov 2013 11:12:07 -0000	1.4
+++ initdb-p-template.sql	17 Nov 2013 15:17:24 -0000	1.5
@@ -52,19 +52,28 @@
 /*--*/
 /*--*/
 
+/*-	-------------------------------------------------------------
+ *-		Note about createlang below
+ *-	Prior to PostgreSQL release 9.0, the SQL driver is not loaded
+ *-	by default. It is therefore necessary to run command createlang.
+ *-	This is superfluous with releases >= 9.0 and results in an
+ *-	harmless warning which can be ignored
+ *-	-----------------------------------------------------------*/
 /*-		Create databases under LXR user
 		but it prevents from deleting user if databases exist
 -*//*- to activate place "- * /" at end of line (without spaces) -*/
 /*@IF	%_createglobals% && %_globaldb% */
 /*@XQT echo "*** PostgreSQL - Creating global database %DB_name%"*/
-/*@XQT dropdb   -U %DB_user% %DB_name%*/
-/*@XQT createdb -U %DB_user% %DB_name%*/
+/*@XQT dropdb     -U %DB_user% %DB_name%*/
+/*@XQT createdb   -U %DB_user% %DB_name%*/
+/*@XQT createlang -U %DB_user% -d %DB_name% plpgsql*/
 /*@ENDIF*/
 /*@IF	!%_globaldb% */
 /*@IF		%_dbuseroverride% */
 /*@XQT echo "*** PostgreSQL - Creating tree database %DB_name%"*/
-/*@XQT dropdb   -U %DB_tree_user% %DB_name%*/
-/*@XQT createdb -U %DB_tree_user% %DB_name%*/
+/*@XQT dropdb     -U %DB_tree_user% %DB_name%*/
+/*@XQT createdb   -U %DB_tree_user% %DB_name%*/
+/*@XQT createlang -U %DB_tree_user% -d %DB_name% plpgsql*/
 /*@ELSE*/
 /*-	When an overriding username is already known, %_dbuseroverride% is left
  *	equal to zero to prevent generating a duplicate user. We must however
@@ -72,11 +81,13 @@
  *	DB owner. -*/
 /*@XQT echo "*** PostgreSQL - Creating tree database %DB_name%"*/
 /*@IF			%DB_tree_user% */
-/*@XQT dropdb   -U %DB_tree_user% %DB_name%*/
-/*@XQT createdb -U %DB_tree_user% %DB_name%*/
+/*@XQT dropdb     -U %DB_tree_user% %DB_name%*/
+/*@XQT createdb   -U %DB_tree_user% %DB_name%*/
+/*@XQT createlang -U %DB_tree_user% -d %DB_name% plpgsql*/
 /*@ELSE*/
-/*@XQT dropdb   -U %DB_user% %DB_name%*/
-/*@XQT createdb -U %DB_user% %DB_name%*/
+/*@XQT dropdb     -U %DB_user% %DB_name%*/
+/*@XQT createdb   -U %DB_user% %DB_name%*/
+/*@XQT createlang -U %DB_user% -d %DB_name% plpgsql*/
 /*@ENDIF		%DB_tree_user% */
 /*@ENDIF	%_dbuseroverride% */
 /*@ENDIF !%_globaldb% */
@@ -88,13 +99,15 @@
 -*//*- to activate place "- * /" at end of line (without spaces)
 /*@IF	%_createglobals% && %_globaldb% */
 /*@XQT echo "*** PostgreSQL - Creating global database %DB_name%"*/
-/*@XQT dropdb   -U postgres %DB_name%*/
-/*@XQT createdb -U postgres %DB_name%*/
+/*@XQT dropdb     -U postgres %DB_name%*/
+/*@XQT createdb   -U postgres %DB_name%*/
+/*@XQT createlang -U postgres -d %DB_name% plpgsql*/
 /*@ENDIF*/
 /*@IF	!%_globaldb% */
 /*@XQT echo "*** PostgreSQL - Creating tree database %DB_name%"*/
-/*@XQT dropdb   -U postgres %DB_name%*/
-/*@XQT createdb -U postgres %DB_name%*/
+/*@XQT dropdb     -U postgres %DB_name%*/
+/*@XQT createdb   -U postgres %DB_name%*/
+/*@XQT createlang -U postgres -d %DB_name% plpgsql*/
 /*@ENDIF	!%_globaldb% */
 /*- end of disable/enable comment -*/
 /*--*/