aboutsummaryrefslogtreecommitdiffstats
path: root/install/schema_mysql.sql
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-05-31 11:01:24 +0200
committerMario Vavti <mario@mariovavti.com>2016-05-31 11:01:24 +0200
commit380f65d309a6ab01d8e804f704962d5baef9820a (patch)
tree896fd1d53ccb3863380653d1b065c7fc4ef7a641 /install/schema_mysql.sql
parent90f29590765f79fe4bd1e3d59e47ce932ec04d0d (diff)
parent670e83b30050201e3ac069c9dfa86a92aff2431d (diff)
downloadvolse-hubzilla-380f65d309a6ab01d8e804f704962d5baef9820a.tar.gz
volse-hubzilla-380f65d309a6ab01d8e804f704962d5baef9820a.tar.bz2
volse-hubzilla-380f65d309a6ab01d8e804f704962d5baef9820a.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'install/schema_mysql.sql')
-rw-r--r--install/schema_mysql.sql8
1 files changed, 4 insertions, 4 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index a674ab8c4..68b739f7a 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -96,15 +96,15 @@ CREATE TABLE IF NOT EXISTS `account` (
CREATE TABLE IF NOT EXISTS `addon` (
`id` int(11) NOT NULL AUTO_INCREMENT,
- `name` char(255) NOT NULL DEFAULT '',
+ `aname` char(255) NOT NULL DEFAULT '',
`version` char(255) NOT NULL DEFAULT '',
`installed` tinyint(1) NOT NULL DEFAULT '0',
`hidden` tinyint(1) NOT NULL DEFAULT '0',
- `timestamp` bigint(20) NOT NULL DEFAULT '0',
+ `tstamp` bigint(20) NOT NULL DEFAULT '0',
`plugin_admin` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `hidden` (`hidden`),
- KEY `name` (`name`),
+ KEY `aname` (`aname`),
KEY `installed` (`installed`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -519,7 +519,7 @@ CREATE TABLE IF NOT EXISTS `hook` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`hook` char(255) NOT NULL DEFAULT '',
`file` char(255) NOT NULL DEFAULT '',
- `function` char(255) NOT NULL DEFAULT '',
+ `fn` char(255) NOT NULL DEFAULT '',
`priority` int(11) unsigned NOT NULL DEFAULT '0',
`hook_version` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),