aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/mysql_upgrader.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-07-30 14:15:09 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-07-30 14:15:09 +0200
commit21ee4c18546127d429eea9cc68490dbc52463bfd (patch)
tree05ee9f0bd018409d6b0a2610a1c04e9bd0802a38 /phpBB/develop/mysql_upgrader.php
parent8fd52c8243f63913aaf551e4c79251dfe6241298 (diff)
parent63a017ec90602a01910438956647990886a2be49 (diff)
downloadforums-21ee4c18546127d429eea9cc68490dbc52463bfd.tar
forums-21ee4c18546127d429eea9cc68490dbc52463bfd.tar.gz
forums-21ee4c18546127d429eea9cc68490dbc52463bfd.tar.bz2
forums-21ee4c18546127d429eea9cc68490dbc52463bfd.tar.xz
forums-21ee4c18546127d429eea9cc68490dbc52463bfd.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
Diffstat (limited to 'phpBB/develop/mysql_upgrader.php')
-rw-r--r--phpBB/develop/mysql_upgrader.php19
1 files changed, 19 insertions, 0 deletions
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 3e74ea8ab7..f5e7e97400 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -699,6 +699,24 @@ function get_schema_struct()
),
);
+ $schema_data['phpbb_login_attempts'] = array(
+ 'COLUMNS' => array(
+ 'attempt_ip' => array('VCHAR:40', ''),
+ 'attempt_browser' => array('VCHAR:150', ''),
+ 'attempt_forwarded_for' => array('VCHAR:255', ''),
+ 'attempt_time' => array('TIMESTAMP', 0),
+ 'user_id' => array('UINT', 0),
+ 'username' => array('VCHAR_UNI:255', 0),
+ 'username_clean' => array('VCHAR_CI', 0),
+ ),
+ 'KEYS' => array(
+ 'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
+ 'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+ 'att_time' => array('INDEX', array('attempt_time')),
+ 'user_id' => array('INDEX', 'user_id'),
+ ),
+ );
+
$schema_data['phpbb_moderator_cache'] = array(
'COLUMNS' => array(
'forum_id' => array('UINT', 0),
@@ -902,6 +920,7 @@ function get_schema_struct()
'field_default_value' => array('VCHAR_UNI', ''),
'field_validation' => array('VCHAR_UNI:20', ''),
'field_required' => array('BOOL', 0),
+ 'field_show_novalue' => array('BOOL', 0),
'field_show_on_reg' => array('BOOL', 0),
'field_show_on_vt' => array('BOOL', 0),
'field_show_profile' => array('BOOL', 0),