diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-30 12:21:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-30 12:21:36 +0200 |
| commit | e07ff7d3fbb9bef720831dc71470b70a882abfdf (patch) | |
| tree | 68934f0deb2fb9edef69954d1016734bc8662957 /install | |
| parent | b22fa9f7f4b77569c29b0fc881373393281b7bf4 (diff) | |
| parent | e769fbaffb09aa673d7475c598e7df7e7978d210 (diff) | |
| download | volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.gz volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.bz2 volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 4 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 12 |
3 files changed, 16 insertions, 2 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index c78259e41..0e626752d 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1131,6 +1131,7 @@ CREATE TABLE IF NOT EXISTS `site` ( `site_realm` char(255) NOT NULL DEFAULT '', `site_valid` smallint NOT NULL DEFAULT '0', `site_dead` smallint NOT NULL DEFAULT '0', + `site_type` smallint NOT NULL DEFAULT '0', PRIMARY KEY (`site_url`), KEY `site_flags` (`site_flags`), KEY `site_update` (`site_update`), @@ -1141,7 +1142,8 @@ CREATE TABLE IF NOT EXISTS `site` ( KEY `site_pull` (`site_pull`), KEY `site_realm` (`site_realm`), KEY `site_valid` (`site_valid`), - KEY `site_dead` (`site_dead`) + KEY `site_dead` (`site_dead`), + KEY `site_type` (`site_type`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `source` ( diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 6145e9ccb..f378a3e3d 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -1122,6 +1122,7 @@ CREATE TABLE "site" ( "site_realm" text NOT NULL DEFAULT '', "site_valid" smallint NOT NULL DEFAULT '0', "site_dead" smallint NOT NULL DEFAULT '0', + "site_type" smallint NOT NULL DEFAULT '0', PRIMARY KEY ("site_url") ); create index "site_flags" on site ("site_flags"); @@ -1133,6 +1134,7 @@ create index "site_sellpage" on site ("site_sellpage"); create index "site_realm" on site ("site_realm"); create index "site_valid" on site ("site_valid"); create index "site_dead" on site ("site_dead"); +create index "site_type" on site ("site_type"); CREATE TABLE "source" ( "src_id" serial NOT NULL, diff --git a/install/update.php b/install/update.php index 9f4457600..ace5239b5 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1155 ); +define( 'UPDATE_VERSION' , 1156 ); /** * @@ -1875,3 +1875,13 @@ function update_r1154() { } + +function update_r1155() { + + $r1 = q("alter table site add site_type smallint not null default '0' "); + $r2 = q("create index site_type on site ( site_type ) "); + if($r1 && $r2) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + |