diff options
| author | zottel <github@zottel.net> | 2015-09-03 12:51:08 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2015-09-03 12:51:08 +0200 |
| commit | 015c7243b9b688acda9c1defce9055fe2c3c2e61 (patch) | |
| tree | 92dd58c4e5a1881b01acb414ea1d218d77ef4721 /install | |
| parent | d376d2a5908241082f2e91349c9100d41054f5d0 (diff) | |
| parent | f3cb17ac3b007afd2dc5bf7cdad8a054b4d7fcd8 (diff) | |
| download | volse-hubzilla-015c7243b9b688acda9c1defce9055fe2c3c2e61.tar.gz volse-hubzilla-015c7243b9b688acda9c1defce9055fe2c3c2e61.tar.bz2 volse-hubzilla-015c7243b9b688acda9c1defce9055fe2c3c2e61.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
include/zot.php
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 6 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 4 | ||||
| -rw-r--r-- | install/update.php | 26 |
3 files changed, 33 insertions, 3 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index d7d44a0a6..1793f89c2 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -108,6 +108,8 @@ CREATE TABLE IF NOT EXISTS `app` ( `app_price` char(255) NOT NULL DEFAULT '', `app_page` char(255) NOT NULL DEFAULT '', `app_requires` char(255) NOT NULL DEFAULT '', + `app_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `app_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), KEY `app_id` (`app_id`), KEY `app_name` (`app_name`), @@ -115,7 +117,9 @@ CREATE TABLE IF NOT EXISTS `app` ( KEY `app_photo` (`app_photo`), KEY `app_version` (`app_version`), KEY `app_channel` (`app_channel`), - KEY `app_price` (`app_price`) + KEY `app_price` (`app_price`), + KEY `app_created` (`app_created`), + KEY `app_edited` (`app_edited`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `attach` ( diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 4c307a7f0..d31c304eb 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -107,6 +107,8 @@ CREATE TABLE "app" ( "app_price" text NOT NULL DEFAULT '', "app_page" text NOT NULL DEFAULT '', "app_requires" text NOT NULL DEFAULT '', + "app_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', + "app_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', PRIMARY KEY ("id") ); create index "app_id" on app ("app_id"); @@ -116,6 +118,8 @@ create index "app_photo" on app ("app_photo"); create index "app_version" on app ("app_version"); create index "app_channel" on app ("app_channel"); create index "app_price" on app ("app_price"); +create index "app_created" on app ("app_created"); +create index "app_edited" on app ("app_edited"); CREATE TABLE "attach" ( "id" serial NOT NULL, "aid" bigint NOT NULL DEFAULT '0', diff --git a/install/update.php b/install/update.php index d0ea4d147..8e531b595 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1150 ); +define( 'UPDATE_VERSION' , 1151 ); /** * @@ -1775,4 +1775,26 @@ function update_r1149() { return UPDATE_SUCCESS; return UPDATE_FAILED; -}
\ No newline at end of file +} + +function update_r1150() { + + if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { + $r1 = q("ALTER TABLE app ADD app_created timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', + ADD app_edited timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' "); + } + else { + $r1 = q("ALTER TABLE app ADD app_created DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + ADD app_edited DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' "); + } + + $r2 = q("create index app_created on app ( app_created ) "); + $r3 = q("create index app_edited on app ( app_edited ) "); + + $r = $r1 && $r2 && $r3; + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + +} + |