| [vhffs-dev] [2140] WITH OIDS; is deprecated, replaced by WITH (OIDS); |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 2140
Author: gradator
Date: 2012-03-11 18:10:11 +0100 (Sun, 11 Mar 2012)
Log Message:
-----------
WITH OIDS; is deprecated, replaced by WITH (OIDS);
Modified Paths:
--------------
trunk/vhffs-backend/src/pgsql/initdb.sql.in
Modified: trunk/vhffs-backend/src/pgsql/initdb.sql.in
===================================================================
--- trunk/vhffs-backend/src/pgsql/initdb.sql.in 2012-03-10 16:57:07 UTC (rev 2139)
+++ trunk/vhffs-backend/src/pgsql/initdb.sql.in 2012-03-11 17:10:11 UTC (rev 2140)
@@ -36,8 +36,7 @@
-- services. This is an implementation of inheritance... Maybe
-- we could have used PostgreSQL built-in facilities...
-CREATE TABLE vhffs_object
-(
+CREATE TABLE vhffs_object (
-- ID of the object (referenced by child tables)
object_id serial,
-- Owner of this object
@@ -57,12 +56,10 @@
-- used a view aggregating all services with common fields...)
type int4 NOT NULL DEFAULT 0,
CONSTRAINT vhffs_object_pkey PRIMARY KEY (object_id)
-) WITH OIDS;
+) WITH (OIDS);
-- Access control lists
-
-CREATE TABLE vhffs_acl
-(
+CREATE TABLE vhffs_acl (
-- This object...
granted_oid int4,
-- ...has this permission...
@@ -70,12 +67,10 @@
-- ...on this object
target_oid int4 ,
CONSTRAINT vhffs_acl_pkey PRIMARY KEY (granted_oid, target_oid)
-) WITH OIDS;
+) WITH (OIDS);
-- Platform's groups
-
-CREATE TABLE vhffs_groups
-(
+CREATE TABLE vhffs_groups (
-- UNIX GID
gid serial,
-- Name of the group (UNIX)
@@ -90,14 +85,12 @@
quota_used int4 NOT NULL DEFAULT 0,
object_id int4 NOT NULL,
CONSTRAINT vhffs_groups_pkey PRIMARY KEY (gid)
-) WITH OIDS;
+) WITH (OIDS);
SELECT setval('vhffs_groups_gid_seq', @MINGID@);
-- Platform's users
-
-CREATE TABLE vhffs_users
-(
+CREATE TABLE vhffs_users (
-- UNIX UID
uid serial,
-- Main GID
@@ -130,14 +123,12 @@
-- IRC nick
ircnick varchar(16),
CONSTRAINT vhffs_users_pkey PRIMARY KEY (uid)
-) WITH OIDS;
+) WITH (OIDS);
SELECT setval('vhffs_users_uid_seq', @MINUID@) ;
-- Mailboxes hosted on this platform
-
-CREATE TABLE vhffs_boxes
-(
+CREATE TABLE vhffs_boxes (
-- Maildomain to which the box is attached
domain varchar,
-- Left part of the address
@@ -159,12 +150,10 @@
-- State of the box (we don't have object for this entity...)
state int4 NOT NULL,
CONSTRAINT vhffs_boxes_pkey PRIMARY KEY (domain,local_part)
-) WITH OIDS;
+) WITH (OIDS);
-- CVS repos on this platform
-
-CREATE TABLE vhffs_cvs
-(
+CREATE TABLE vhffs_cvs (
cvs_id serial,
-- repository path
cvsroot varchar NOT NULL,
@@ -172,12 +161,10 @@
public boolean NOT NULL,
object_id int4 NOT NULL,
CONSTRAINT vhffs_cvs_pkey PRIMARY KEY (cvs_id)
-) WITH OIDS;
+) WITH (OIDS);
-- DNS managed by this platform
-
-CREATE TABLE vhffs_dns
-(
+CREATE TABLE vhffs_dns (
dns_id serial,
-- Domain name
domain varchar(255) NOT NULL,
@@ -192,10 +179,9 @@
minimum INTEGER NOT NULL DEFAULT 86400,
ttl INTEGER NOT NULL DEFAULT 86400,
CONSTRAINT vhffs_dns_pkey4 PRIMARY KEY (dns_id)
-) WITH OIDS;
+) WITH (OIDS);
-- Resource records for DNS on this platform
-
CREATE TABLE vhffs_dns_rr (
id serial,
-- Zone to which this record is linked
@@ -208,12 +194,10 @@
aux INTEGER NOT NULL DEFAULT 0,
ttl INTEGER NOT NULL DEFAULT 86400,
CONSTRAINT vhffs_dns_rr_pkey PRIMARY KEY (id)
-) WITH OIDS;
+) WITH (OIDS);
-- Mail forwards on this platform
-
-CREATE TABLE vhffs_forward
-(
+CREATE TABLE vhffs_forward (
-- Mail domain to which this forward is linked
domain varchar NOT NULL,
-- Left part of the mail address
@@ -223,23 +207,19 @@
-- Is this used?!
password varchar NOT NULL,
CONSTRAINT vhffs_forward_pkey PRIMARY KEY (domain , local_part)
-) WITH OIDS;
+) WITH (OIDS);
-- Webareas for this platform
-
-CREATE TABLE vhffs_httpd
-(
+CREATE TABLE vhffs_httpd (
httpd_id serial,
-- Servername (virtual host), will be hashed to get the directory
servername varchar(200) NOT NULL,
object_id int4 NOT NULL,
CONSTRAINT vhffs_httpd_pkey PRIMARY KEY (httpd_id)
-) WITH OIDS;
+) WITH (OIDS);
-- Download repositories
-
-CREATE TABLE vhffs_repository
-(
+CREATE TABLE vhffs_repository (
repository_id serial,
-- Name of the repository
name varchar NOT NULL,
@@ -249,12 +229,10 @@
quota_used int4 NOT NULL DEFAULT 0,
object_id int4 NOT NULL,
CONSTRAINT vhffs_repository_pkey PRIMARY KEY (repository_id)
-) WITH OIDS;
+) WITH (OIDS);
-- Mass mailing made to the platform users
-
-CREATE TABLE vhffs_mailings
-(
+CREATE TABLE vhffs_mailings (
mailing_id serial,
-- Subject of the mail
subject VARCHAR NOT NULL,
@@ -265,12 +243,10 @@
-- State of the mailing (waiting to be sent, sent, ...)
state int4 NOT NULL,
CONSTRAINT vhffs_mailings_pkey PRIMARY KEY (mailing_id)
-) WITH OIDS;
+) WITH (OIDS);
-- Mail domains hosted on this platform
-
-CREATE TABLE vhffs_mxdomain
-(
+CREATE TABLE vhffs_mxdomain (
mxdomain_id serial,
-- Domain name
domain varchar,
@@ -280,12 +256,10 @@
catchall varchar NOT NULL,
object_id int4 NOT NULL,
CONSTRAINT vhffs_mxdomain_pkey PRIMARY KEY (mxdomain_id)
-) WITH OIDS;
+) WITH (OIDS);
-- Mailing lists of this platform
-
-CREATE TABLE vhffs_ml
-(
+CREATE TABLE vhffs_ml (
ml_id serial,
-- Left part of the mailing list address
local_part varchar(256) NOT NULL,
@@ -305,12 +279,10 @@
-- Signature appended to all messages
signature varchar(250),
CONSTRAINT vhffs_ml_pkey PRIMARY KEY (ml_id)
-) WITH OIDS;
+) WITH (OIDS);
-- Subscribers of a mailing list
-
-CREATE TABLE vhffs_ml_subscribers
-(
+CREATE TABLE vhffs_ml_subscribers (
sub_id serial,
-- Email address of the subscriber
member varchar(256) NOT NULL,
@@ -323,12 +295,10 @@
-- Language of the subscriber
language varchar(16),
CONSTRAINT vhffs_ml_subscribers_pkey PRIMARY KEY (sub_id)
-) WITH OIDS;
+) WITH (OIDS);
-- MySQL databases
-
-CREATE TABLE vhffs_mysql
-(
+CREATE TABLE vhffs_mysql (
mysql_id serial,
-- Name of the database
dbname varchar(200) NOT NULL,
@@ -338,12 +308,10 @@
dbpass VARCHAR(32) NOT NULL,
object_id int4 NOT NULL,
CONSTRAINT vhffs_mysql_pkey PRIMARY KEY (mysql_id)
-) WITH OIDS;
+) WITH (OIDS);
-- Objects' history
-
-CREATE TABLE vhffs_history
-(
+CREATE TABLE vhffs_history (
history_id serial,
object_id int4 NOT NULL,
-- Timestamp of the entry
@@ -352,7 +320,7 @@
message varchar(200),
source_uid int4 DEFAULT NULL,
CONSTRAINT vhffs_history_pkey PRIMARY KEY ( history_id )
-) WITH OIDS;
+) WITH (OIDS);
-- Link objects -> tags
CREATE TABLE vhffs_object_tag (
@@ -361,12 +329,10 @@
updated int8 NOT NULL,
updater_id int4,
CONSTRAINT vhffs_object_tag_pkey PRIMARY KEY ( object_id, tag_id )
-) WITH OIDS;
+) WITH (OIDS);
-- PostgreSQL databases on the platform
-
-CREATE TABLE vhffs_pgsql
-(
+CREATE TABLE vhffs_pgsql (
pgsql_id serial,
-- Name of the database
dbname varchar(200) NOT NULL,
@@ -376,12 +342,10 @@
dbpass varchar(32) NOT NULL,
object_id int4 NOT NULL,
CONSTRAINT vhffs_pgsql_pkey PRIMARY KEY (pgsql_id)
-) WITH OIDS;
+) WITH (OIDS);
-- SVN repositories
-
-CREATE TABLE vhffs_svn
-(
+CREATE TABLE vhffs_svn (
svn_id SERIAL,
-- Name (path) of the repo
reponame varchar NOT NULL,
@@ -392,12 +356,10 @@
-- Object representing this repository
object_id int4 NOT NULL,
CONSTRAINT vhffs_svn_pkey PRIMARY KEY( svn_id )
-) WITH OIDS;
+) WITH (OIDS);
-- Git repositories
-
-CREATE TABLE vhffs_git
-(
+CREATE TABLE vhffs_git (
git_id SERIAL,
-- Name of the repo
reponame varchar NOT NULL,
@@ -408,12 +370,10 @@
-- Object representing this Git repository
object_id int4 NOT NULL,
CONSTRAINT vhffs_git_pkey PRIMARY KEY( git_id )
-) WITH OIDS;
+) WITH (OIDS);
-- Mercurial repositories
-
-CREATE TABLE vhffs_mercurial
-(
+CREATE TABLE vhffs_mercurial (
mercurial_id SERIAL,
-- Name of the repo
reponame varchar NOT NULL,
@@ -424,12 +384,10 @@
-- Object representing this Git repository
object_id int4 NOT NULL,
CONSTRAINT vhffs_mercurial_pkey PRIMARY KEY( mercurial_id )
-) WITH OIDS;
+) WITH (OIDS);
-- Bazaar repositories
-
-CREATE TABLE vhffs_bazaar
-(
+CREATE TABLE vhffs_bazaar (
bazaar_id SERIAL,
-- Name of the repo
reponame varchar NOT NULL,
@@ -440,12 +398,10 @@
-- Object representing this Git repository
object_id int4 NOT NULL,
CONSTRAINT vhffs_bazaar_pkey PRIMARY KEY( bazaar_id )
-) WITH OIDS;
+) WITH (OIDS);
-- Cron tasks
-
-CREATE TABLE vhffs_cron
-(
+CREATE TABLE vhffs_cron (
cron_id SERIAL,
-- Path to the cron script/binary
cronpath varchar NOT NULL,
@@ -464,10 +420,9 @@
-- Object representing this Cron
object_id int4 NOT NULL,
CONSTRAINT vhffs_cron_pkey PRIMARY KEY( cron_id )
-) WITH OIDS;
+) WITH (OIDS);
-- Table containing all registered tags for this platform
-
CREATE TABLE vhffs_tag (
tag_id SERIAL,
-- Label for the tag in platform's default language
@@ -478,7 +433,7 @@
updater_id int4,
category_id int4 NOT NULL,
CONSTRAINT vhffs_tag_pkey PRIMARY KEY( tag_id )
-) WITH OIDS;
+) WITH (OIDS);
-- Table containing all tag categories for this platform
-- See vhffs_tag for description...
@@ -491,7 +446,7 @@
updated int8 NOT NULL,
updater_id int4,
CONSTRAINT vhffs_tag_category_pkey PRIMARY KEY( tag_category_id )
-) WITH OIDS;
+) WITH (OIDS);
-- Tag categories' translations
CREATE TABLE vhffs_tag_category_translation (
@@ -502,10 +457,9 @@
updated int8 NOT NULL,
updater_id int4,
CONSTRAINT vhffs_tag_category_translation_pkey PRIMARY KEY( tag_category_id, lang )
-) WITH OIDS;
+) WITH (OIDS);
-- Tags requested by users
-
CREATE TABLE vhffs_tag_request (
tag_request_id SERIAL,
-- Label of the category. We could have a label
@@ -522,7 +476,6 @@
);
-- Description & label translation for a tag
-
CREATE TABLE vhffs_tag_translation (
tag_id int4 NOT NULL,
lang VARCHAR(16) NOT NULL,
@@ -531,17 +484,16 @@
updated int8 NOT NULL,
updater_id int4,
CONSTRAINT vhffs_tag_translation_pkey PRIMARY KEY( tag_id, lang )
-) WITH OIDS;
+) WITH (OIDS);
-- Users of a group, groups of an user
-
CREATE TABLE vhffs_user_group
(
uid int4 NOT NULL,
gid int4 NOT NULL,
state int4 NOT NULL,
CONSTRAINT vhffs_user_group_pkey PRIMARY KEY (uid,gid)
-) WITH OIDS;
+) WITH (OIDS);
/****** Indexes and unique constraints *******/