diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-13 13:19:32 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-13 13:21:08 +0100 |
| commit | 192a5f19f4d2f8aba4798815848d23558462df70 (patch) | |
| tree | e296a2ed09f846a2248ac8fae6f8f84e1af53045 /phpBB/phpbb/db/tools | |
| parent | 08647781c09849843cc30fd5e36f9dafa02faf6e (diff) | |
| parent | 7696f39ac3ecb803468f230129a76dac59f2972b (diff) | |
| download | forums-192a5f19f4d2f8aba4798815848d23558462df70.tar forums-192a5f19f4d2f8aba4798815848d23558462df70.tar.gz forums-192a5f19f4d2f8aba4798815848d23558462df70.tar.bz2 forums-192a5f19f4d2f8aba4798815848d23558462df70.tar.xz forums-192a5f19f4d2f8aba4798815848d23558462df70.zip | |
Merge pull request #2064 from hjpotter92/ticket/11875
[ticket/11875] Set default data type from MEDIUMINT (3byte) to INT(10) (4byte)
Conflicts:
phpBB/includes/db/schema_data.php
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/phpbb/db/tools/tools.php
Diffstat (limited to 'phpBB/phpbb/db/tools')
| -rw-r--r-- | phpBB/phpbb/db/tools/mssql.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/tools/postgres.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/db/tools/tools.php | 15 |
3 files changed, 13 insertions, 5 deletions
diff --git a/phpBB/phpbb/db/tools/mssql.php b/phpBB/phpbb/db/tools/mssql.php index 6e58171040..a90a85bbb2 100644 --- a/phpBB/phpbb/db/tools/mssql.php +++ b/phpBB/phpbb/db/tools/mssql.php @@ -36,6 +36,7 @@ class mssql extends tools 'mssql' => array( 'INT:' => '[int]', 'BINT' => '[float]', + 'ULINT' => '[int]', 'UINT' => '[int]', 'UINT:' => '[int]', 'TINT:' => '[int]', @@ -66,6 +67,7 @@ class mssql extends tools 'mssqlnative' => array( 'INT:' => '[int]', 'BINT' => '[float]', + 'ULINT' => '[int]', 'UINT' => '[int]', 'UINT:' => '[int]', 'TINT:' => '[int]', diff --git a/phpBB/phpbb/db/tools/postgres.php b/phpBB/phpbb/db/tools/postgres.php index 8b61625c3c..e2a4e668a6 100644 --- a/phpBB/phpbb/db/tools/postgres.php +++ b/phpBB/phpbb/db/tools/postgres.php @@ -30,6 +30,7 @@ class postgres extends tools 'postgres' => array( 'INT:' => 'INT4', 'BINT' => 'INT8', + 'ULINT' => 'INT4', // unsigned 'UINT' => 'INT4', // unsigned 'UINT:' => 'INT4', // unsigned 'USINT' => 'INT2', // unsigned diff --git a/phpBB/phpbb/db/tools/tools.php b/phpBB/phpbb/db/tools/tools.php index f06871a1d7..e00683dd46 100644 --- a/phpBB/phpbb/db/tools/tools.php +++ b/phpBB/phpbb/db/tools/tools.php @@ -46,6 +46,7 @@ class tools implements tools_interface 'mysql_41' => array( 'INT:' => 'int(%d)', 'BINT' => 'bigint(20)', + 'ULINT' => 'INT(10) UNSIGNED', 'UINT' => 'mediumint(8) UNSIGNED', 'UINT:' => 'int(%d) UNSIGNED', 'TINT:' => 'tinyint(%d)', @@ -76,6 +77,7 @@ class tools implements tools_interface 'mysql_40' => array( 'INT:' => 'int(%d)', 'BINT' => 'bigint(20)', + 'ULINT' => 'INT(10) UNSIGNED', 'UINT' => 'mediumint(8) UNSIGNED', 'UINT:' => 'int(%d) UNSIGNED', 'TINT:' => 'tinyint(%d)', @@ -106,6 +108,7 @@ class tools implements tools_interface 'oracle' => array( 'INT:' => 'number(%d)', 'BINT' => 'number(20)', + 'ULINT' => 'number(10)', 'UINT' => 'number(8)', 'UINT:' => 'number(%d)', 'TINT:' => 'number(%d)', @@ -136,11 +139,12 @@ class tools implements tools_interface 'sqlite' => array( 'INT:' => 'int(%d)', 'BINT' => 'bigint(20)', - 'UINT' => 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED', + 'ULINT' => 'INTEGER UNSIGNED', // 'int(10) UNSIGNED', + 'UINT' => 'INTEGER UNSIGNED', // 'mediumint(8) UNSIGNED', 'UINT:' => 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED', 'TINT:' => 'tinyint(%d)', - 'USINT' => 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED', - 'BOOL' => 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED', + 'USINT' => 'INTEGER UNSIGNED', // 'mediumint(4) UNSIGNED', + 'BOOL' => 'INTEGER UNSIGNED', // 'tinyint(1) UNSIGNED', 'VCHAR' => 'varchar(255)', 'VCHAR:' => 'varchar(%d)', 'CHAR:' => 'char(%d)', @@ -152,7 +156,7 @@ class tools implements tools_interface 'STEXT_UNI' => 'text(65535)', 'TEXT_UNI' => 'text(65535)', 'MTEXT_UNI' => 'mediumtext(16777215)', - 'TIMESTAMP' => 'INTEGER UNSIGNED', //'int(11) UNSIGNED', + 'TIMESTAMP' => 'INTEGER UNSIGNED', // 'int(11) UNSIGNED', 'DECIMAL' => 'decimal(5,2)', 'DECIMAL:' => 'decimal(%d,2)', 'PDECIMAL' => 'decimal(6,3)', @@ -166,6 +170,7 @@ class tools implements tools_interface 'sqlite3' => array( 'INT:' => 'INT(%d)', 'BINT' => 'BIGINT(20)', + 'ULINT' => 'INTEGER UNSIGNED', 'UINT' => 'INTEGER UNSIGNED', 'UINT:' => 'INTEGER UNSIGNED', 'TINT:' => 'TINYINT(%d)', @@ -199,7 +204,7 @@ class tools implements tools_interface * A list of types being unsigned for better reference in some db's * @var array */ - var $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); + var $unsigned_types = array('ULINT', 'UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); /** * This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array). |