[Lxr-commits] CVS: lxr/templates/initdb initdb-m-template.sql, 1.2, 1.3 initdb-o-template.sql, 1.2,
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr/templates/initdb initdb-m-template.sql, 1.2, 1.3 initdb-o-template.sql, 1.2, 1.3 initdb-p-template.sql, 1.2, 1.3 initdb-s-template.sql, 1.2, 1.3
|
From: Andre-Littoz <ajl...@us...> - 2013-01-11 12:08:51
|
Update of /cvsroot/lxr/lxr/templates/initdb In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31635/templates/initdb Modified Files: initdb-m-template.sql initdb-o-template.sql initdb-p-template.sql initdb-s-template.sql Log Message: Configuration process: part 4/5 Upgrade initdb templates to LCL Index: initdb-m-template.sql =================================================================== RCS file: /cvsroot/lxr/lxr/templates/initdb/initdb-m-template.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- initdb-m-template.sql 14 Nov 2012 11:28:13 -0000 1.2 +++ initdb-m-template.sql 11 Jan 2013 12:08:48 -0000 1.3 @@ -32,108 +32,98 @@ of a single mysql invocation. -*/ /*--*/ /*--*/ -/*@begin_O createglobals==1*/ -/*@X echo "*** MySQL - Creating global user %DB_user%"*/ -/*@X mysql -u root -p <<END_OF_USER*/ +/*@IF %_createglobals% */ +/*@XQT echo "*** MySQL - Creating global user %DB_user%"*/ +/*@XQT mysql -u root -p <<END_OF_USER*/ drop user '%DB_user%'@'localhost'; -/*@X END_OF_USER*/ -/*@X mysql -u root -p <<END_OF_USER*/ +/*@XQT END_OF_USER*/ +/*@XQT mysql -u root -p <<END_OF_USER*/ create user '%DB_user%'@'localhost' identified by '%DB_password%'; grant all on *.* to '%DB_user%'@'localhost'; -/*@X END_OF_USER*/ -/*@end_O createglobals==1*/ -/*@begin_O dbuseroverride==1*/ -/*@X echo "*** MySQL - Creating tree user %DB_tree_user%"*/ -/*@X mysql -u root -p <<END_OF_USER*/ +/*@XQT END_OF_USER*/ +/*@ENDIF %_createglobals% */ +/*@IF %_dbuseroverride% */ +/*@XQT echo "*** MySQL - Creating tree user %DB_tree_user%"*/ +/*@XQT mysql -u root -p <<END_OF_USER*/ create user '%DB_tree_user%'@'localhost'; -/*@X END_OF_USER*/ -/*@X mysql -u root -p <<END_OF_USER*/ +/*@XQT END_OF_USER*/ +/*@XQT mysql -u root -p <<END_OF_USER*/ create user '%DB_tree_user%'@'localhost' identified by '%DB_tree_password%'; grant all on *.* to '%DB_tree_user%'@'localhost'; -/*@X END_OF_USER*/ -/*@end_O dbuseroverride==1*/ +/*@XQT END_OF_USER*/ +/*@ENDIF %_dbuseroverride% */ /*--*/ /*--*/ /*- Create databases under LXR user -*//*- to activate place "- * /" at end of line (without spaces) -*/ -/*@begin_O createglobals==1*/ -/*@begin_O dbpolicy==g*/ -/*@X echo "*** MySQL - Creating global database %DB_name%"*/ -/*@X mysql -u %DB_user% -p%DB_password% <<END_OF_CREATE*/ +/*@IF %_createglobals% && %_globaldb% */ +/*@XQT echo "*** MySQL - Creating global database %DB_name%"*/ +/*@XQT mysql -u %DB_user% -p%DB_password% <<END_OF_CREATE*/ drop database if exists %DB_name%; create database %DB_name%; -/*@X END_OF_CREATE*/ -/*@end_O dbpolicy==g*/ -/*@end_O createglobals==1*/ -/*@begin_O dbpolicy==t*/ -/*@X echo "*** MySQL - Creating tree database %DB_name%"*/ -/*@begin_O dbuseroverride==1*/ -/*@X mysql -u %DB_tree_user% -p%DB_tree_password% <<END_OF_CREATE*/ -/*@end_O dbuseroverride==1*/ -/*@begin_O dbuseroverride==0*/ -/*@X mysql -u %DB_user% -p%DB_password% <<END_OF_CREATE*/ -/*@end_O dbuseroverride==0*/ +/*@XQT END_OF_CREATE*/ +/*@ENDIF*/ +/*@IF !%_globaldb% */ +/*@XQT echo "*** MySQL - Creating tree database %DB_name%"*/ +/*@IF %_dbuseroverride% */ +/*@XQT mysql -u %DB_tree_user% -p%DB_tree_password% <<END_OF_CREATE*/ +/*@ELSE*/ +/*@XQT mysql -u %DB_user% -p%DB_password% <<END_OF_CREATE*/ +/*@ENDIF*/ drop database if exists %DB_name%; create database %DB_name%; -/*@X END_OF_CREATE*/ -/*@end_O dbpolicy==t*/ +/*@XQT END_OF_CREATE*/ +/*@ENDIF !%_globaldb% */ /*- end of disable/enable comment -*/ /*--*/ /*--*/ /*- Create databases under master user, may be restricted by site rules -*//*- to activate place "- * /" at end of line (without spaces) -/*@begin_O createglobals==1*/ -/*@begin_O dbpolicy==g*/ -/*@X echo "*** MySQL - Creating global database %DB_name%"*/ -/*@X mysql -u root -p <<END_OF_CREATE*/ +/*@IF %_createglobals% && %_globaldb% */ +/*@XQT echo "*** MySQL - Creating global database %DB_name%"*/ +/*@XQT mysql -u root -p <<END_OF_CREATE*/ drop database if exists %DB_name%; create database %DB_name%; -/*@X END_OF_CREATE*/ -/*@end_O dbpolicy==g*/ -/*@end_O createglobals==1*/ -/*@begin_O dbpolicy==t*/ -/*@X echo "*** MySQL - Creating tree database %DB_name%"*/ -/*@X mysql -u root -p <<END_OF_CREATE*/ +/*@XQT END_OF_CREATE*/ +/*@ENDIF*/ +/*@IF !%_globaldb% */ +/*@XQT echo "*** MySQL - Creating tree database %DB_name%"*/ +/*@XQT mysql -u root -p <<END_OF_CREATE*/ drop database if exists %DB_name%; create database %DB_name%; -/*@X END_OF_CREATE*/ -/*@end_O dbpolicy==t*/ +/*@XQT END_OF_CREATE*/ +/*@ENDIF !%_globaldb% */ /*- end of disable/enable comment -*/ /*--*/ /*--*/ -/*@X echo "*** MySQL - Configuring tables %DB_tbl_prefix% in database %DB_name%"*/ +/*@XQT echo "*** MySQL - Configuring tables %DB_tbl_prefix% in database %DB_name%"*/ /*- Create tables under LXR user -*//*- to activate place "- * /" at end of line (without spaces) -*/ -/*@begin_O createglobals==1*/ -/*@begin_O dbpolicy==g*/ -/*@X mysql -u %DB_user% -p%DB_password% <<END_OF_TEMPLATE*/ -/*@end_O dbpolicy==g*/ -/*@end_O createglobals==1*/ -/*@begin_O dbpolicy==t*/ -/*@begin_O dbuseroverride==1*/ -/*@X mysql -u %DB_tree_user% -p%DB_tree_password% <<END_OF_TEMPLATE*/ -/*@end_O dbuseroverride==1*/ -/*@begin_O dbuseroverride==0*/ -/*@X mysql -u %DB_user% -p%DB_password% <<END_OF_TEMPLATE*/ -/*@end_O dbuseroverride==0*/ -/*@end_O dbpolicy==t*/ +/*@IF %_createglobals% && %_globaldb% */ +/*@XQT mysql -u %DB_user% -p%DB_password% <<END_OF_TEMPLATE*/ +/*@ENDIF*/ +/*@IF !%_globaldb% */ +/*@IF %_dbuseroverride% */ +/*@XQT mysql -u %DB_tree_user% -p%DB_tree_password% <<END_OF_TEMPLATE*/ +/*@ELSE*/ +/*@XQT mysql -u %DB_user% -p%DB_password% <<END_OF_TEMPLATE*/ +/*@ENDIF*/ +/*@ENDIF !%_globaldb% */ /*- end of disable/enable comment -*/ /*--*/ /*--*/ /*- Create tables under master user, may be restricted by site rules -*//*- to activate place "- * /" at end of line (without spaces) -/*@begin_O createglobals==1*/ -/*@begin_O dbpolicy==g*/ -/*@X mysql -u root -p <<END_OF_TEMPLATE*/ -/*@end_O dbpolicy==g*/ -/*@end_O createglobals==1*/ -/*@begin_O dbpolicy==t*/ -/*@X mysql -u root -p <<END_OF_TEMPLATE*/ -/*@end_O dbpolicy==t*/ +/*@IF %_createglobals% && %_globaldb% */ +/*@XQT mysql -u root -p <<END_OF_TEMPLATE*/ +/*@ENDIF*/ +/*@IF !%_globaldb% */ +/*@XQT mysql -u root -p <<END_OF_TEMPLATE*/ +/*@ENDIF !%_globaldb% */ /*- end of disable/enable comment -*/ /*--*/ /*--*/ @@ -349,5 +339,5 @@ set session foreign_key_checks = @old_check; end// delimiter ; -/*@X END_OF_TEMPLATE*/ +/*@XQT END_OF_TEMPLATE*/ Index: initdb-o-template.sql =================================================================== RCS file: /cvsroot/lxr/lxr/templates/initdb/initdb-o-template.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- initdb-o-template.sql 14 Nov 2012 11:28:13 -0000 1.2 +++ initdb-o-template.sql 11 Jan 2013 12:08:48 -0000 1.3 @@ -27,8 +27,8 @@ * ************************************************************** -*/ -/*@X echo "*** Oracle - Database creation (!!! untested !!!) ***" */ -/*@sqlplus <<END_OF_TABLES*/ +/*@XQT echo "*** Oracle - Database creation (!!! untested !!!) ***" */ +/*@XQT sqlplus <<END_OF_TABLES*/ -- *** -- *** CAUTION -CAUTION - CAUTION *** -- *** @@ -338,4 +338,4 @@ commit; quit -/*@END_OF_TABLES*/ +/*@XQT END_OF_TABLES*/ Index: initdb-p-template.sql =================================================================== RCS file: /cvsroot/lxr/lxr/templates/initdb/initdb-p-template.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- initdb-p-template.sql 14 Nov 2012 11:28:13 -0000 1.2 +++ initdb-p-template.sql 11 Jan 2013 12:08:48 -0000 1.3 @@ -32,108 +32,100 @@ of a single psql invocation. -*/ /*--*/ /*--*/ -/*@begin_O createglobals==1*/ -/*@X echo "Note: deletion of user below fails if it owns databases"*/ -/*@X echo " and other objects."*/ -/*@X echo " If you want to keep some databases, ignore the error"*/ -/*@X echo " Otherwise, manually delete the objects"*/ -/*@X echo " and relaunch this script."*/ -/*@begin_O dbuser*/ -/*@X echo "*** PostgreSQL - Creating global user %DB_user%"*/ -/*@X dropuser -U postgres %DB_user%*/ -/*@X createuser -U postgres %DB_user% -d -P -R -S*/ -/*@end_O dbuser*/ -/*@end_O createglobals==1*/ -/*@begin_O dbuseroverride==1*/ -/*@X echo "*** PostgreSQL - Creating tree user %DB_tree_user%"*/ -/*@X dropuser -U postgres %DB_tree_user%*/ -/*@X createuser -U postgres %DB_tree_user% -d -P -R -S*/ -/*@end_O dbuseroverride==1*/ +/*@IF %_createglobals% */ +/*@XQT echo "Note: deletion of user below fails if it owns databases"*/ +/*@XQT echo " and other objects."*/ +/*@XQT echo " If you want to keep some databases, ignore the error"*/ +/*@XQT echo " Otherwise, manually delete the objects"*/ +/*@XQT echo " and relaunch this script."*/ +/*@IF %_dbuser%*/ +/*@XQT echo "*** PostgreSQL - Creating global user %DB_user%"*/ +/*@XQT dropuser -U postgres %DB_user%*/ +/*@XQT createuser -U postgres %DB_user% -d -P -R -S*/ +/*@ENDIF %_dbuser%*/ +/*@ENDIF %_createglobals% */ +/*@IF %_dbuseroverride% */ +/*@XQT echo "*** PostgreSQL - Creating tree user %DB_tree_user%"*/ +/*@XQT dropuser -U postgres %DB_tree_user%*/ +/*@XQT createuser -U postgres %DB_tree_user% -d -P -R -S*/ +/*@ENDIF %_dbuseroverride% */ /*--*/ /*--*/ /*- Create databases under LXR user but it prevents from deleting user if databases exist -*//*- to activate place "- * /" at end of line (without spaces) -*/ -/*@begin_O createglobals==1*/ -/*@begin_O dbpolicy==g*/ -/*@X echo "*** PostgreSQL - Creating global database %DB_name%"*/ -/*@X dropdb -U %DB_user% %DB_name%*/ -/*@X createdb -U %DB_user% %DB_name%*/ -/*@end_O dbpolicy==g*/ -/*@end_O createglobals==1*/ -/*@begin_O dbpolicy==t*/ -/*@begin_O dbuseroverride==1*/ -/*@X echo "*** PostgreSQL - Creating tree database %DB_name%"*/ -/*@X dropdb -U %DB_tree_user% %DB_name%*/ -/*@X createdb -U %DB_tree_user% %DB_name%*/ -/*@end_O dbuseroverride==1*/ -/*- When an overriding username is already known, dbuseroverride is left +/*@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%*/ +/*@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%*/ +/*@ELSE*/ +/*- When an overriding username is already known, %_dbuseroverride% is left * equal to zero to prevent generating a duplicate user. We must however * test the existence of %DB_tree_user% to operate under the correct * DB owner. -*/ -/*@begin_O dbuseroverride==0*/ -/*@X echo "*** PostgreSQL - Creating tree database %DB_name%"*/ -/*@begin_M DB_tree_user*/ -/*@X dropdb -U %DB_tree_user% %DB_name%*/ -/*@X createdb -U %DB_tree_user% %DB_name%*/ -/*@end_M DB_tree_user*/ -/*@begin_M !DB_tree_user*/ -/*@X dropdb -U %DB_user% %DB_name%*/ -/*@X createdb -U %DB_user% %DB_name%*/ -/*@end_M !DB_tree_user*/ -/*@end_O dbuseroverride==0*/ -/*@end_O dbpolicy==t*/ +/*@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%*/ +/*@ELSE*/ +/*@XQT dropdb -U %DB_user% %DB_name%*/ +/*@XQT createdb -U %DB_user% %DB_name%*/ +/*@ENDIF %DB_tree_user% */ +/*@ENDIF %_dbuseroverride% */ +/*@ENDIF !%_globaldb% */ /*- end of disable/enable comment -*/ /*--*/ /*--*/ /*- Create databases under master user, usually postgres may be restricted by site rules -*//*- to activate place "- * /" at end of line (without spaces) -/*@begin_O createglobals==1*/ -/*@begin_O dbpolicy==g*/ -/*@X echo "*** PostgreSQL - Creating global database %DB_name%"*/ -/*@X dropdb -U postgres %DB_name%*/ -/*@X createdb -U postgres %DB_name%*/ -/*@end_O dbpolicy==g*/ -/*@end_O createglobals==1*/ -/*@begin_O dbpolicy==t*/ -/*@X echo "*** PostgreSQL - Creating tree database %DB_name%"*/ -/*@X dropdb -U postgres %DB_name%*/ -/*@X createdb -U postgres %DB_name%*/ -/*@end_O dbpolicy==t*/ +/*@IF %_createglobals% && %_globaldb% */ +/*@XQT echo "*** PostgreSQL - Creating global database %DB_name%"*/ +/*@XQT dropdb -U postgres %DB_name%*/ +/*@XQT createdb -U postgres %DB_name%*/ +/*@ENDIF*/ +/*@IF !%_globaldb% */ +/*@XQT echo "*** PostgreSQL - Creating tree database %DB_name%"*/ +/*@XQT dropdb -U postgres %DB_name%*/ +/*@XQT createdb -U postgres %DB_name%*/ +/*@ENDIF !%_globaldb% */ /*- end of disable/enable comment -*/ /*--*/ /*--*/ -/*@X echo "*** PostgreSQL - Configuring tables %DB_tbl_prefix% in database %DB_name%"*/ +/*@XQT echo "*** PostgreSQL - Configuring tables %DB_tbl_prefix% in database %DB_name%"*/ /*- Create databases under LXR user * but it prevents from deleting user if databases exist * * Note: - * When an overriding username is already known, dbuseroverride is left + * When an overriding username is already known, %_dbuseroverride% is left * equal to zero to prevent generating a duplicate user. We must however * test the existence of %DB_tree_user% to register the correct DB owner. * -*//*- to activate place "- * /" at end of line (without spaces) -*/ -/*@begin_O dbuseroverride==1*/ -/*@X psql -q -U %DB_tree_user% %DB_name% <<END_OF_TABLES*/ -/*@end_O dbuseroverride==1*/ -/*@begin_O dbuseroverride==0*/ -/*@begin_M DB_tree_user*/ -/*@X psql -q -U %DB_tree_user% %DB_name% <<END_OF_TABLES*/ -/*@end_M DB_tree_user*/ -/*@begin_M !DB_tree_user*/ -/*@X psql -q -U %DB_user% %DB_name% <<END_OF_TABLES*/ -/*@end_M !DB_tree_user*/ -/*@end_O dbuseroverride==0*/ +/*@IF %_dbuseroverride% */ +/*@XQT psql -q -U %DB_tree_user% %DB_name% <<END_OF_TABLES*/ +/*@ELSE*/ +/*@IF %DB_tree_user% */ +/*@XQT psql -q -U %DB_tree_user% %DB_name% <<END_OF_TABLES*/ +/*@ELSE*/ +/*@XQT psql -q -U %DB_user% %DB_name% <<END_OF_TABLES*/ +/*@ENDIF %DB_tree_user% */ +/*@ENDIF %_dbuseroverride% */ /*- end of disable/enable comment -*/ /*--*/ /*--*/ /*- Create databases under master user, usually postgres may be restricted by site rules -*//*- to activate place "- * /" at end of line (without spaces) -/*@X psql -q -U postgres %DB_name% <<END_OF_TABLES*/ +/*@XQT psql -q -U postgres %DB_name% <<END_OF_TABLES*/ /*- end of disable/enable comment -*/ drop sequence if exists %DB_tbl_prefix%filenum; drop sequence if exists %DB_tbl_prefix%symnum; @@ -195,23 +187,21 @@ create function %DB_tbl_prefix%erasefile() returns trigger language PLpgSQL -/*@begin_O shell*/ +/*@IF %_shell% */ as \$\$ -/*@end_O shell*/ -/*@begin_O !shell*/ +/*@ELSE*/ as $$ -/*@end_O !shell*/ +/*@ENDIF %_shell% */ begin delete from %DB_tbl_prefix%files where fileid = old.fileid; return old; end; -/*@begin_O shell*/ +/*@IF %_shell% */ \$\$; -/*@end_O shell*/ -/*@begin_O !shell*/ +/*@ELSE*/ $$; -/*@end_O !shell*/ +/*@ENDIF %_shell% */ drop trigger if exists %DB_tbl_prefix%remove_file on %DB_tbl_prefix%status; @@ -247,24 +237,22 @@ * by the process PID. It must then be quoted if the * resulting file is intended to be executed as a script. -*/ -/*@begin_O shell*/ +/*@IF %_shell% */ as \$\$ -/*@end_O shell*/ -/*@begin_O !shell*/ +/*@ELSE*/ as $$ -/*@end_O !shell*/ +/*@ENDIF %_shell% */ begin update %DB_tbl_prefix%status set relcount = relcount + 1 where fileid = new.fileid; return new; end; -/*@begin_O shell*/ +/*@IF %_shell% */ \$\$; -/*@end_O shell*/ -/*@begin_O !shell*/ +/*@ELSE*/ $$; -/*@end_O !shell*/ +/*@ENDIF %_shell% */ drop trigger if exists %DB_tbl_prefix%add_release on %DB_tbl_prefix%releases; @@ -282,12 +270,11 @@ create function %DB_tbl_prefix%decrel() returns trigger language PLpgSQL -/*@begin_O shell*/ +/*@IF %_shell% */ as \$\$ -/*@end_O shell*/ -/*@begin_O !shell*/ +/*@ELSE*/ as $$ -/*@end_O !shell*/ +/*@ENDIF %_shell% */ begin update %DB_tbl_prefix%status set relcount = relcount - 1 @@ -298,12 +285,11 @@ and relcount > 0; return old; end; -/*@begin_O shell*/ +/*@IF %_shell%*/ \$\$; -/*@end_O shell*/ -/*@begin_O !shell*/ +/*@ELSE*/ $$; -/*@end_O !shell*/ +/*@ENDIF %_shell% */ drop trigger if exists %DB_tbl_prefix%remove_release on %DB_tbl_prefix%releases; @@ -343,12 +329,11 @@ create function %DB_tbl_prefix%decsym() returns trigger language PLpgSQL -/*@begin_O shell*/ +/*@IF %_shell% */ as \$\$ -/*@end_O shell*/ -/*@begin_O !shell*/ +/*@ELSE*/ as $$ -/*@end_O !shell*/ +/*@ENDIF %_shell% */ begin update %DB_tbl_prefix%symbols set symcount = symcount - 1 @@ -356,12 +341,11 @@ and symcount > 0; return old; end; -/*@begin_O shell*/ +/*@IF %_shell% */ \$\$; -/*@end_O shell*/ -/*@begin_O !shell*/ +/*@ELSE*/ $$; -/*@end_O !shell*/ +/*@ENDIF %_shell% */ /* Definitions */ /* symid: refers to symbol name @@ -439,5 +423,5 @@ grant select on %DB_tbl_prefix%usages to public; grant select on %DB_tbl_prefix%status to public; grant select on %DB_tbl_prefix%langtypes to public; -/*@X END_OF_TABLES*/ +/*@XQT END_OF_TABLES*/ Index: initdb-s-template.sql =================================================================== RCS file: /cvsroot/lxr/lxr/templates/initdb/initdb-s-template.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- initdb-s-template.sql 14 Nov 2012 11:28:13 -0000 1.2 +++ initdb-s-template.sql 11 Jan 2013 12:08:48 -0000 1.3 @@ -28,8 +28,8 @@ -*/ /*--*/ /*--*/ -/*@X echo "*** SQLite - Configuring tables %DB_tbl_prefix% in database %DB_name%"*/ -/*@X sqlite3 %DB_name% <<END_OF_TABLES*/ +/*@XQT echo "*** SQLite - Configuring tables %DB_tbl_prefix% in database %DB_name%"*/ +/*@XQT sqlite3 %DB_name% <<END_OF_TABLES*/ drop table if exists %DB_tbl_prefix%filenum; drop table if exists %DB_tbl_prefix%symnum; drop table if exists %DB_tbl_prefix%typenum; @@ -257,5 +257,5 @@ where symid = old.symid and symcount > 0; end; -/*@X END_OF_TABLES*/ +/*@XQT END_OF_TABLES*/ |
