harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-05-05 16:58:46 -07:00
parent 47ebddf99f 3ccefa20e8
commit f840082aae
29 changed files with 766 additions and 2599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/schema_mysql.sql
View File

@@ -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;

2
install/schema_postgres.sql
View File

@@ -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");

11
install/update.php
View File

@@ -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;
}