diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-28 19:06:31 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-28 19:06:31 -0700 |
| commit | 8fe3daab21f9aba00f7def3553247b0cbcf5f94a (patch) | |
| tree | 3e8b22ef3b197e4dbdba3e86f7427452d1cd6b73 /install | |
| parent | b381ec57346a6d7724b2317c120ce2e6e70edc37 (diff) | |
| parent | df5223fe9813a2f6bee053c1c3c6acbdbaf6d42f (diff) | |
| download | volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.tar.gz volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.tar.bz2 volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 8 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 4 | ||||
| -rw-r--r-- | install/update.php | 24 |
3 files changed, 33 insertions, 3 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 9a57fe101..407565f79 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -732,11 +732,15 @@ CREATE TABLE IF NOT EXISTS `menu` ( `menu_name` char(255) NOT NULL DEFAULT '', `menu_desc` char(255) NOT NULL DEFAULT '', `menu_flags` int(11) NOT NULL DEFAULT '0', + `menu_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `menu_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`menu_id`), KEY `menu_channel_id` (`menu_channel_id`), KEY `menu_name` (`menu_name`), - KEY `menu_flags` (`menu_flags`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; + KEY `menu_flags` (`menu_flags`), + KEY `menu_created` (`menu_created`), + KEY `menu_edited` (`menu_edited`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `menu_item` ( `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT, diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index c572bb086..0db9e341f 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -649,11 +649,15 @@ CREATE TABLE "menu" ( "menu_name" text NOT NULL DEFAULT '', "menu_desc" text NOT NULL DEFAULT '', "menu_flags" bigint NOT NULL DEFAULT '0', + "menu_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', + "menu_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', PRIMARY KEY ("menu_id") ); create index "menu_channel_id" on menu ("menu_channel_id"); create index "menu_name" on menu ("menu_name"); create index "menu_flags" on menu ("menu_flags"); +create index "menu_created" on menu ("menu_created"); +create index "menu_edited" on menu ("menu_edited"); CREATE TABLE "menu_item" ( "mitem_id" serial NOT NULL, "mitem_link" text NOT NULL DEFAULT '', diff --git a/install/update.php b/install/update.php index 13dd004c9..13a45d301 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1141 ); +define( 'UPDATE_VERSION' , 1142 ); /** * @@ -1624,3 +1624,25 @@ function update_r1140() { } +function update_r1141() { + if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { + $r1 = q("ALTER TABLE menu ADD menu_created timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', ADD menu_edited timestamp NOT NULL DEFAULT '0001-01-01 00:00:00'"); + $r2 = q("create index menu_created on menu ( menu_created ) "); + $r3 = q("create index menu_edited on menu ( menu_edited ) "); + $r = $r1 && $r2; + } + else + $r = q("ALTER TABLE menu ADD menu_created DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', ADD menu_edited DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', ADD INDEX ( menu_created ), ADD INDEX ( menu_edited ) "); + + $t = datetime_convert(); + q("update menu set menu_created = '%s', menu_edited = '%s' where true", + dbesc($t), + dbesc($t) + ); + + + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + +}
\ No newline at end of file |