aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to 'install')
-rw-r--r--install/schema_mysql.sql14
-rw-r--r--install/schema_postgres.sql13
-rw-r--r--install/update.php50
3 files changed, 75 insertions, 2 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 3143854f5..673e4cd75 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -609,7 +609,6 @@ CREATE TABLE IF NOT EXISTS `item` (
`resource_type` char(16) NOT NULL DEFAULT '',
`attach` mediumtext NOT NULL,
`sig` text NOT NULL,
- `diaspora_meta` mediumtext NOT NULL,
`location` char(191) NOT NULL DEFAULT '',
`coord` char(191) NOT NULL DEFAULT '',
`public_policy` char(191) NOT NULL DEFAULT '',
@@ -900,6 +899,19 @@ CREATE TABLE IF NOT EXISTS `outq` (
KEY `outq_priority` (`outq_priority`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS pchan (
+ `pchan_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `pchan_guid` char(191) NOT NULL DEFAULT '',
+ `pchan_hash` char(191) NOT NULL DEFAULT '',
+ `pchan_pubkey` text NOT NULL,
+ `pchan_prvkey` text NOT NULL,
+ PRIMARY KEY (`pchan_id`),
+ KEY `pchan_guid` (`pchan_guid`),
+ KEY `pchan_hash` (`pchan_hash`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
CREATE TABLE IF NOT EXISTS `pconfig` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL DEFAULT 0 ,
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index b8bbf5867..6acfc830d 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -872,6 +872,19 @@ create index "outq_async" on outq ("outq_async");
create index "outq_delivered" on outq ("outq_delivered");
create index "outq_priority" on outq ("outq_priority");
+
+CREATE TABLE "pchan" (
+ "pchan_id" serial NOT NULL,
+ "pchan_guid" text NOT NULL,
+ "pchan_hash" text NOT NULL,
+ "pchan_pubkey" text NOT NULL,
+ "pchan_prvkey" text NOT NULL,
+ PRIMARY KEY ("pchan_id")
+);
+
+create index "pchan_guid" on pchan ("pchan_guid");
+create index "pchan_hash" on pchan ("pchan_hash");
+
CREATE TABLE "pconfig" (
"id" serial NOT NULL,
"uid" bigint NOT NULL DEFAULT 0 ,
diff --git a/install/update.php b/install/update.php
index 07675a973..f7b9b03ed 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1196 );
+define( 'UPDATE_VERSION' , 1198 );
/**
*
@@ -3022,3 +3022,51 @@ function update_r1195() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}
+
+function update_r1196() {
+
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ $r1 = q("CREATE TABLE \"pchan\" (
+ \"pchan_id\" serial NOT NULL,
+ \"pchan_guid\" text NOT NULL,
+ \"pchan_hash\" text NOT NULL,
+ \"pchan_pubkey\" text NOT NULL,
+ \"pchan_prvkey\" text NOT NULL,
+ PRIMARY KEY (\"pchan_id\")
+)");
+
+ $r2 = q("create index \"pchan_guid\" on pchan (\"pchan_guid\")");
+ $r3 = q("create index \"pchan_hash\" on pchan (\"pchan_hash\")");
+
+ if($r1 && $r2 && $r3) {
+ return UPDATE_SUCCESS;
+ }
+ }
+ else {
+ $r1 = q("CREATE TABLE IF NOT EXISTS pchan (
+ pchan_id int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ pchan_guid char(191) NOT NULL DEFAULT '',
+ pchan_hash char(191) NOT NULL DEFAULT '',
+ pchan_pubkey text NOT NULL,
+ pchan_prvkey text NOT NULL,
+ PRIMARY KEY (pchan_id),
+ KEY pchan_guid (pchan_guid),
+ KEY pchan_hash (pchan_hash)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
+ if($r1) {
+ return UPDATE_SUCCESS;
+ }
+ }
+
+ return UPDATE_FAILED;
+}
+
+function update_r1197() {
+
+ $r = q("select diaspora_meta from item where true limit 1");
+ if($r) {
+ $r = q("ALTER TABLE item DROP diaspora_meta");
+ }
+
+ return UPDATE_SUCCESS;
+}