Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity

Fix old unresolved merge conflicts in pg.sql

Browse Source 
Please note that ejabberd takes care to create the tables in your
ODBC database if needed. The file pg.sql is provided for reference
purposes only, as it isn't needed when preparing the database.
This commit is contained in:
Badlop 2011-01-09 18:51:24 +01:00
parent 159529d539
commit 2d3efdf983
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/odbc/pg.sql
View File

@ -44,11 +44,8 @@ CREATE TABLE rosterusers (
server character(1) NOT NULL, server character(1) NOT NULL,
subscribe text, subscribe text,
"type" text, "type" text,
<<<<<<< HEAD
PRIMARY KEY (host, username, jid) PRIMARY KEY (host, username, jid)
=======
created_at TIMESTAMP NOT NULL DEFAULT now() created_at TIMESTAMP NOT NULL DEFAULT now()
>>>>>>> 30
); );
CREATE TABLE rostergroups ( CREATE TABLE rostergroups (
@ -64,24 +61,16 @@ CREATE TABLE spool (
host text NOT NULL, host text NOT NULL,
xml text NOT NULL, xml text NOT NULL,
seq SERIAL, seq SERIAL,
<<<<<<< HEAD
PRIMARY KEY (host, username, seq) PRIMARY KEY (host, username, seq)
=======
created_at TIMESTAMP NOT NULL DEFAULT now() created_at TIMESTAMP NOT NULL DEFAULT now()
>>>>>>> 30
); );
CREATE TABLE vcard ( CREATE TABLE vcard (
<<<<<<< HEAD
username text NOT NULL, username text NOT NULL,
host text NOT NULL, host text NOT NULL,
vcard text NOT NULL, vcard text NOT NULL,
PRIMARY KEY (host, username) PRIMARY KEY (host, username)
=======
username text PRIMARY KEY,
vcard text NOT NULL,
created_at TIMESTAMP NOT NULL DEFAULT now() created_at TIMESTAMP NOT NULL DEFAULT now()
>>>>>>> 30
); );
CREATE TABLE vcard_search ( CREATE TABLE vcard_search (
@ -138,11 +127,8 @@ CREATE TABLE privacy_list (
host text NOT NULL, host text NOT NULL,
name text NOT NULL, name text NOT NULL,
id SERIAL UNIQUE, id SERIAL UNIQUE,
<<<<<<< HEAD
PRIMARY KEY (host, username, name) PRIMARY KEY (host, username, name)
=======
created_at TIMESTAMP NOT NULL DEFAULT now() created_at TIMESTAMP NOT NULL DEFAULT now()
>>>>>>> 30
); );
CREATE TABLE privacy_list_data ( CREATE TABLE privacy_list_data (
@ -164,11 +150,8 @@ CREATE TABLE private_storage (
host text NOT NULL, host text NOT NULL,
namespace text NOT NULL, namespace text NOT NULL,
data text NOT NULL, data text NOT NULL,
<<<<<<< HEAD
PRIMARY KEY (host, username, namespace) PRIMARY KEY (host, username, namespace)
=======
created_at TIMESTAMP NOT NULL DEFAULT now() created_at TIMESTAMP NOT NULL DEFAULT now()
>>>>>>> 30
); );
CREATE TABLE hosts ( CREATE TABLE hosts (