diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-05 16:58:46 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-05 16:58:46 -0700 |
| commit | f840082aaead8356a5787109f0c67179ecdf7993 (patch) | |
| tree | 05fcb73fae9412706a04a44a3188a187375d3ca4 /install | |
| parent | 47ebddf99f5487cbcdfbabaa367c7b09fa0a86e3 (diff) | |
| parent | 3ccefa20e8b10d0a507c6b002237664e721ca389 (diff) | |
| download | volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.gz volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.bz2 volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 2 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index bfeec0801..72e028764 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -32,6 +32,7 @@ CREATE TABLE IF NOT EXISTS `abook` ( `abook_unconnected` tinyint(4) NOT NULL DEFAULT '0', `abook_self` tinyint(4) NOT NULL DEFAULT '0', `abook_feed` tinyint(4) NOT NULL DEFAULT '0', + `abook_not_here` tinyint(4) NOT NULL DEFAULT '0', `abook_profile` char(64) NOT NULL DEFAULT '', `abook_incl` TEXT NOT NULL DEFAULT '', `abook_excl` TEXT NOT NULL DEFAULT '', @@ -54,6 +55,7 @@ CREATE TABLE IF NOT EXISTS `abook` ( KEY `abook_pending` (`abook_pending`), KEY `abook_unconnected` (`abook_unconnected`), KEY `abook_self` (`abook_self`), + KEY `abook_not_here` (`abook_not_here`), KEY `abook_feed` (`abook_feed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 02cb48d8c..ae6e41345 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -30,6 +30,7 @@ CREATE TABLE "abook" ( "abook_unconnected" smallint NOT NULL DEFAULT '0', "abook_self" smallint NOT NULL DEFAULT '0', "abook_feed" smallint NOT NULL DEFAULT '0', + "abook_not_here" smallint NOT NULL DEFAULT '0', "abook_profile" char(64) NOT NULL DEFAULT '', "abook_incl" TEXT NOT NULL DEFAULT '', "abook_excl" TEXT NOT NULL DEFAULT '', @@ -51,6 +52,7 @@ CREATE TABLE "abook" ( create index "abook_unconnected" on abook ("abook_unconnected"); create index "abook_self" on abook ("abook_self"); create index "abook_feed" on abook ("abook_feed"); + create index "abook_not_here" on abook ("abook_not_here"); create index "abook_profile" on abook ("abook_profile"); create index "abook_dob" on abook ("abook_dob"); create index "abook_connected" on abook ("abook_connected"); diff --git a/install/update.php b/install/update.php index ce65d1db9..65506a2f7 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1190 ); +define( 'UPDATE_VERSION' , 1191 ); /** * @@ -2532,3 +2532,12 @@ function update_r1189() { } +function update_r1190() { + $r1 = q("alter table abook add abook_not_here int(11) not null default '0' "); + + $r2 = q("create index abook_not_here on abook (abook_not_here)"); + + if($r1 && $r2) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} |