aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-05 13:24:58 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-05 13:24:58 -0800
commit36ef1d1bc63d6c2040947ee9c18ba16072ffb76e (patch)
tree56f3285bcef0418ea368d6aa62eccd3d6ba5bdbc
parent61aa33af1d30f047af709d7f513357e62c8307c3 (diff)
downloadvolse-hubzilla-36ef1d1bc63d6c2040947ee9c18ba16072ffb76e.tar.gz
volse-hubzilla-36ef1d1bc63d6c2040947ee9c18ba16072ffb76e.tar.bz2
volse-hubzilla-36ef1d1bc63d6c2040947ee9c18ba16072ffb76e.zip
move the instance stuff to abook where it belongs
-rwxr-xr-xboot.php2
-rw-r--r--install/schema_mysql.sql1
-rw-r--r--install/schema_postgres.sql1
-rw-r--r--install/update.php9
4 files changed, 11 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 48d81ff59..d80d5fd07 100755
--- a/boot.php
+++ b/boot.php
@@ -51,7 +51,7 @@ define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'
define ( 'STD_VERSION', '1.0' );
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1160 );
+define ( 'DB_UPDATE_VERSION', 1161 );
/**
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 3dab6c822..9c24cbd94 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `abook` (
`abook_profile` char(64) NOT NULL DEFAULT '',
`abook_incl` TEXT NOT NULL DEFAULT '',
`abook_excl` TEXT NOT NULL DEFAULT '',
+ `abook_instance` TEXT NOT NULL DEFAULT '',
PRIMARY KEY (`abook_id`),
KEY `abook_account` (`abook_account`),
KEY `abook_channel` (`abook_channel`),
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 95ed9acb7..0214c0c2a 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -22,6 +22,7 @@ CREATE TABLE "abook" (
"abook_profile" char(64) NOT NULL DEFAULT '',
"abook_incl" TEXT NOT NULL DEFAULT '',
"abook_excl" TEXT NOT NULL DEFAULT '',
+ "abook_instance" TEXT NOT NULL DEFAULT '',
PRIMARY KEY ("abook_id")
);
create index "abook_account" on abook ("abook_account");
diff --git a/install/update.php b/install/update.php
index 10ae6725e..37351656f 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1160 );
+define( 'UPDATE_VERSION' , 1161 );
/**
*
@@ -1950,3 +1950,10 @@ function update_r1159() {
}
+function update_r1160() {
+ $r1 = q("alter table abook add abook_instance text not null default '' ");
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}
+