[phpwiki-checkins] SF.net SVN: phpwiki:[8245] trunk/schemas

[<var...@us...>]

Revision: 8245
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8245&view=rev
Author:   vargenau
Date:     2012-03-06 16:16:54 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Fix bug 3492111: add space after "--" in comments

Modified Paths:
--------------
    trunk/schemas/mssql-destroy.sql
    trunk/schemas/mssql-initialize.sql
    trunk/schemas/mysql-destroy.sql
    trunk/schemas/oci8-destroy.sql
    trunk/schemas/oci8-initialize.sql
    trunk/schemas/psql-1_3_12.sql
    trunk/schemas/psql-destroy.sql
    trunk/schemas/psql-initialize.sql
    trunk/schemas/psql-tsearch2.sql
    trunk/schemas/sqlsrv-destroy.sql
    trunk/schemas/sqlsrv-initialize.sql

Modified: trunk/schemas/mssql-destroy.sql
===================================================================
--- trunk/schemas/mssql-destroy.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/mssql-destroy.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -8,7 +8,7 @@
 DROP TABLE session;
 
 DROP TABLE pref;
---DROP TABLE user;
+-- DROP TABLE user;
 DROP TABLE member;
 
 -- wikilens theme

Modified: trunk/schemas/mssql-initialize.sql
===================================================================
--- trunk/schemas/mssql-initialize.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/mssql-initialize.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -71,12 +71,12 @@
 -- deprecated since 1.3.12. only useful for seperate databases.
 -- better use the extra pref table where such users can be created easily 
 -- without password.
---CREATE TABLE user (
+-- CREATE TABLE user (
 --  	userid 	CHAR(48) NOT NULL,
 --  	passwd 	CHAR(48) DEFAULT '',
 --	prefs  	TEXT NULL DEFAULT '',
 --	groupname CHAR(48) DEFAULT 'users'
---);
+-- );
 
 -- Use the member table, if you need it for n:m user-group relations,
 -- and adjust your DBAUTH_AUTH_ SQL statements.

Modified: trunk/schemas/mysql-destroy.sql
===================================================================
--- trunk/schemas/mysql-destroy.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/mysql-destroy.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -10,7 +10,7 @@
 -- upgrade from 1.3.7:
 
 drop table if exists pref;
---drop table if exists user;
+-- drop table if exists user;
 drop table if exists member;
 drop table if exists accesslog;
 

Modified: trunk/schemas/oci8-destroy.sql
===================================================================
--- trunk/schemas/oci8-destroy.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/oci8-destroy.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -3,7 +3,7 @@
 set verify off
 set feedback off
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specify for
@@ -14,13 +14,13 @@
 
 define prefix=phpwiki_
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
---================================================================
+-- ================================================================
 -- Note on Oracle datatypes...
 -- 
 -- Most of the 'NOT NULL' constraints on the character columns have been 

Modified: trunk/schemas/oci8-initialize.sql
===================================================================
--- trunk/schemas/oci8-initialize.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/oci8-initialize.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -3,7 +3,7 @@
 set verify off
 set feedback off
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specify for
@@ -14,13 +14,13 @@
 
 define prefix=phpwiki_
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
---================================================================
+-- ================================================================
 -- Note on Oracle datatypes...
 -- 
 -- Most of the 'NOT NULL' constraints on the character columns have been 
@@ -63,8 +63,8 @@
 define pref_tbl=&prefix.pref
 define pref_id=&prefix.pref_id
 
---define user_tbl=&prefix.user
---define user_id=&prefix.user_id
+-- define user_tbl=&prefix.user
+-- define user_id=&prefix.user_id
 
 define member_tbl=&prefix.member
 define member_userid=&prefix.member_userid
@@ -157,14 +157,14 @@
 
 -- better use the extra pref table where such users can be created easily 
 -- without password.
---prompt Creating &user_tbl
---CREATE TABLE &user_tbl (
+-- prompt Creating &user_tbl
+-- CREATE TABLE &user_tbl (
 --  	userid 	CHAR(48) NOT NULL,
 --  	passwd 	CHAR(48) DEFAULT '',
 --	prefs  	CLOB DEFAULT '',
 --	groupname CHAR(48) DEFAULT 'users',
 --  	CONSTRAINT &user_id PRIMARY KEY (userid)
---);
+-- );
 
 prompt Creating &member_tbl
 CREATE TABLE &member_tbl (

Modified: trunk/schemas/psql-1_3_12.sql
===================================================================
--- trunk/schemas/psql-1_3_12.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/psql-1_3_12.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -8,7 +8,7 @@
 -- $ /usr/bin/psql phpwiki < /usr/share/postgresql/contrib/tsearch2.sql 
 -- $ /usr/bin/psql phpwiki < psql-initialize.sql
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specified for
@@ -16,7 +16,7 @@
 
 \set prefix 	''
 
---================================================================
+-- ================================================================
 -- Which postgres user gets access to the tables?
 --
 -- You should set this to the name of the postgres
@@ -28,11 +28,11 @@
 
 \set httpd_user	'phpwiki'
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
 \set page_tbl 		:prefix 'page'
 \set page_id_seq 	:prefix 'page_id_seq'
@@ -61,8 +61,8 @@
 
 \set pref_tbl 	 	:prefix 'pref'
 \set pref_id_idx 	:prefix 'pref_id_idx'
---\set user_tbl 	 	:prefix 'users'
---\set user_id_idx  	:prefix 'users_id_idx'
+-- \set user_tbl 	 	:prefix 'users'
+-- \set user_id_idx  	:prefix 'users_id_idx'
 \set member_tbl  	:prefix 'member'
 \set member_id_idx  	:prefix 'member_id_idx'
 \set member_group_idx 	:prefix 'member_group_idx'
@@ -74,7 +74,7 @@
 \set accesslog_time_idx :prefix 'log_time_idx'
 \set accesslog_host_idx :prefix 'log_host_idx'
 
---================================================================
+-- ================================================================
 \echo schema enhancements
 
 ALTER TABLE :page_tbl 
@@ -121,7 +121,7 @@
 	ALTER COLUMN userid SET NOT NULL,
 	ADD FOREIGN KEY (userid) REFERENCES :pref_tbl;
 
---================================================================
+-- ================================================================
 
 \echo add tsearch2 fulltextsearch extension
 -- Use the tsearch2 fulltextsearch extension: (recommended) 7.4, 8.0, 8.1
@@ -143,7 +143,7 @@
 CREATE TRIGGER tsvectorupdate BEFORE UPDATE OR INSERT ON :version_tbl
        FOR EACH ROW EXECUTE PROCEDURE tsearch2(idxFTI, content);
 
---================================================================
+-- ================================================================
 
 \echo Initializing stored procedures
 

Modified: trunk/schemas/psql-destroy.sql
===================================================================
--- trunk/schemas/psql-destroy.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/psql-destroy.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -2,7 +2,7 @@
 
 \set QUIET
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specify for
@@ -10,11 +10,11 @@
 
 \set prefix 	''
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
 \set qprefix '\'' :prefix '\''
 \echo Dropping all PhpWiki tables with:
@@ -29,7 +29,7 @@
 \set link_tbl		:prefix 'link'
 \set session_tbl	:prefix 'session'
 \set pref_tbl		:prefix 'pref'
---\set user_tbl	        :prefix 'user'
+-- \set user_tbl	        :prefix 'user'
 \set member_tbl 	:prefix 'member'
 \set rating_tbl		:prefix 'rating'
 \set accesslog_tbl	:prefix 'accesslog'
@@ -78,8 +78,8 @@
 \echo Dropping table :pref_tbl
 DROP TABLE :pref_tbl;
 
---\echo Dropping table :user_tbl
---DROP TABLE :user_tbl;
+-- \echo Dropping table :user_tbl
+-- DROP TABLE :user_tbl;
 
 \echo Dropping table :session_tbl
 DROP TABLE :session_tbl;

Modified: trunk/schemas/psql-initialize.sql
===================================================================
--- trunk/schemas/psql-initialize.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/psql-initialize.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -2,7 +2,7 @@
 
 \set QUIET
 
---================================================================
+-- ================================================================
 -- Prefix for table names.
 --
 -- You should set this to the same value you specify for
@@ -10,7 +10,7 @@
 
 \set prefix 	''
 
---================================================================
+-- ================================================================
 -- Which postgres user gets access to the tables?
 --
 -- You should set this to the name of the postgres
@@ -27,11 +27,11 @@
 
 \set httpd_user	'wikiuser'
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
 \set qprefix '\'' :prefix '\''
 \set qhttp_user '\'' :httpd_user '\''
@@ -85,8 +85,8 @@
 
 \set pref_tbl 	 	:prefix 'pref'
 \set pref_id_idx 	:prefix 'pref_id_idx'
---\set user_tbl 	 	:prefix 'users'
---\set user_id_idx  	:prefix 'users_id_idx'
+-- \set user_tbl 	 	:prefix 'users'
+-- \set user_id_idx  	:prefix 'users_id_idx'
 \set member_tbl  	:prefix 'member'
 \set member_id_idx  	:prefix 'member_id_idx'
 \set member_group_idx 	:prefix 'member_group_idx'
@@ -107,7 +107,7 @@
         pagename 	VARCHAR(100) NOT NULL UNIQUE CHECK (pagename <> ''),
 	hits 		INT4 NOT NULL DEFAULT 0,
         pagedata 	TEXT NOT NULL DEFAULT '',
-	--cached_html  	bytea DEFAULT ''
+	-- cached_html  	bytea DEFAULT ''
 	cached_html  	TEXT DEFAULT ''
 );
 -- CREATE UNIQUE INDEX :page_id_idx ON :page_tbl (id);
@@ -218,9 +218,9 @@
 );
 CREATE UNIQUE INDEX :rating_id_idx ON :rating_tbl (dimension, raterpage, rateepage);
 
---================================================================
+-- ================================================================
 -- end of page relations
---================================================================
+-- ================================================================
 
 \echo Creating :session_tbl
 CREATE TABLE :session_tbl (
@@ -280,7 +280,7 @@
 CREATE INDEX :accesslog_host_idx ON :accesslog_tbl (remote_host);
 -- create extra indices on demand (usually referer. see plugin/AccessLogSql)
 
---================================================================
+-- ================================================================
 
 -- Use the tsearch2 fulltextsearch extension: (recommended) 7.4, 8.0, 8.1
 -- at first init it for the database:
@@ -305,7 +305,7 @@
 -- see http://www.sai.msu.su/~megera/oddmuse/index.cgi/Tsearch_V2_Notes
 -- update pg_ts_cfg set locale='en_US.UTF-8' where ts_name='default';
 
---================================================================
+-- ================================================================
 
 \echo You might want to ignore the following errors or run 
 \echo /usr/sbin/createuser -S -R -d  :httpd_user
@@ -325,7 +325,7 @@
 GRANT SELECT,INSERT,UPDATE,DELETE ON :rating_tbl	TO :httpd_user;
 GRANT SELECT,INSERT,UPDATE,DELETE ON :accesslog_tbl	TO :httpd_user;
 
---================================================================
+-- ================================================================
 -- some stored procedures to put unneccesary syntax into the server
 
 \echo Initializing stored procedures

Modified: trunk/schemas/psql-tsearch2.sql
===================================================================
--- trunk/schemas/psql-tsearch2.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/psql-tsearch2.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -7,20 +7,20 @@
 \set prefix 	''
 \set httpd_user	'phpwiki'
 
---example of ISpell dictionary:
+-- example of ISpell dictionary:
 -- UPDATE pg_ts_dict SET dict_initoption='DictFile="/usr/local/share/ispell/russian.dict" ,AffFile ="/usr/local/share/ispell/russian.aff", StopFile="/usr/local/share/ispell/russian.stop"' WHERE dict_name='ispell_template';
---example of synonym dict:
+-- example of synonym dict:
 -- UPDATE pg_ts_dict SET dict_initoption='/usr/local/share/ispell/english.syn' WHERE dict_id=5; 
 
 -- this might be needed:
 -- see http://www.sai.msu.su/~megera/oddmuse/index.cgi/Tsearch_V2_Notes
 -- update pg_ts_cfg set locale='en_US.UTF-8' where ts_name='default';
 
---================================================================
+-- ================================================================
 --
 -- Don't modify below this point unless you know what you are doing.
 --
---================================================================
+-- ================================================================
 
 \set qprefix '\'' :prefix '\''
 \set qhttp_user '\'' :httpd_user '\''

Modified: trunk/schemas/sqlsrv-destroy.sql
===================================================================
--- trunk/schemas/sqlsrv-destroy.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/sqlsrv-destroy.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -8,7 +8,7 @@
 DROP TABLE session;
 
 DROP TABLE pref;
---DROP TABLE user;
+-- DROP TABLE user;
 DROP TABLE member;
 
 -- wikilens theme

Modified: trunk/schemas/sqlsrv-initialize.sql
===================================================================
--- trunk/schemas/sqlsrv-initialize.sql	2012-03-05 08:49:38 UTC (rev 8244)
+++ trunk/schemas/sqlsrv-initialize.sql	2012-03-06 16:16:54 UTC (rev 8245)
@@ -26,14 +26,14 @@
         PRIMARY KEY (id),
 	UNIQUE (pagename)
 );
---SET IDENTITY_INSERT page ON;
+-- SET IDENTITY_INSERT page ON;
 
 CREATE TABLE version (
 	id              INT NOT NULL,
         version         INT NOT NULL,
 	mtime           INT NOT NULL,
 	minor_edit      TINYINT DEFAULT 0,
-        content         varchar(max) NOT NULL DEFAULT '',--can't be text
+        content         varchar(max) NOT NULL DEFAULT '', -- can't be text
         versiondata     TEXT NOT NULL DEFAULT '',
         PRIMARY KEY (id,version)
 );
@@ -89,12 +89,12 @@
 -- deprecated since 1.3.12. only useful for seperate databases.
 -- better use the extra pref table where such users can be created easily 
 -- without password.
---CREATE TABLE user (
+-- CREATE TABLE user (
 --  	userid 	CHAR(48) NOT NULL,
 --  	passwd 	CHAR(48) DEFAULT '',
 --	prefs  	TEXT NULL DEFAULT '',
 --	groupname CHAR(48) DEFAULT 'users'
---);
+-- );
 
 -- Use the member table, if you need it for n:m user-group relations,
 -- and adjust your DBAUTH_AUTH_ SQL statements.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.