makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2064 from hjpotter92/ticket/11875

Browse source 
[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
This commit is contained in:
Marc Alexander 2016-01-13 13:19:32 +01:00
commit 192a5f19f4
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/install/schemas/postgres_schema.sql
View file

@ -77,4 +77,3 @@ CREATE OPERATOR =(
SORT1= <); SORT1= <);
COMMIT; COMMIT;

2
phpBB/phpbb/db/tools/mssql.php
View file

@ -36,6 +36,7 @@ class mssql extends tools
'mssql' => array( 'mssql' => array(
'INT:' => '[int]', 'INT:' => '[int]',
'BINT' => '[float]', 'BINT' => '[float]',
'ULINT' => '[int]',
'UINT' => '[int]', 'UINT' => '[int]',
'UINT:' => '[int]', 'UINT:' => '[int]',
'TINT:' => '[int]', 'TINT:' => '[int]',
@ -66,6 +67,7 @@ class mssql extends tools
'mssqlnative' => array( 'mssqlnative' => array(
'INT:' => '[int]', 'INT:' => '[int]',
'BINT' => '[float]', 'BINT' => '[float]',
'ULINT' => '[int]',
'UINT' => '[int]', 'UINT' => '[int]',
'UINT:' => '[int]', 'UINT:' => '[int]',
'TINT:' => '[int]', 'TINT:' => '[int]',

1
phpBB/phpbb/db/tools/postgres.php
View file

@ -30,6 +30,7 @@ class postgres extends tools
'postgres' => array( 'postgres' => array(
'INT:' => 'INT4', 'INT:' => 'INT4',
'BINT' => 'INT8', 'BINT' => 'INT8',
'ULINT' => 'INT4', // unsigned
'UINT' => 'INT4', // unsigned 'UINT' => 'INT4', // unsigned
'UINT:' => 'INT4', // unsigned 'UINT:' => 'INT4', // unsigned
'USINT' => 'INT2', // unsigned 'USINT' => 'INT2', // unsigned

15
phpBB/phpbb/db/tools/tools.php
View file

@ -46,6 +46,7 @@ class tools implements tools_interface
'mysql_41' => array( 'mysql_41' => array(
'INT:' => 'int(%d)', 'INT:' => 'int(%d)',
'BINT' => 'bigint(20)', 'BINT' => 'bigint(20)',
'ULINT' => 'INT(10) UNSIGNED',
'UINT' => 'mediumint(8) UNSIGNED', 'UINT' => 'mediumint(8) UNSIGNED',
'UINT:' => 'int(%d) UNSIGNED', 'UINT:' => 'int(%d) UNSIGNED',
'TINT:' => 'tinyint(%d)', 'TINT:' => 'tinyint(%d)',
@ -76,6 +77,7 @@ class tools implements tools_interface
'mysql_40' => array( 'mysql_40' => array(
'INT:' => 'int(%d)', 'INT:' => 'int(%d)',
'BINT' => 'bigint(20)', 'BINT' => 'bigint(20)',
'ULINT' => 'INT(10) UNSIGNED',
'UINT' => 'mediumint(8) UNSIGNED', 'UINT' => 'mediumint(8) UNSIGNED',
'UINT:' => 'int(%d) UNSIGNED', 'UINT:' => 'int(%d) UNSIGNED',
'TINT:' => 'tinyint(%d)', 'TINT:' => 'tinyint(%d)',
@ -106,6 +108,7 @@ class tools implements tools_interface
'oracle' => array( 'oracle' => array(
'INT:' => 'number(%d)', 'INT:' => 'number(%d)',
'BINT' => 'number(20)', 'BINT' => 'number(20)',
'ULINT' => 'number(10)',
'UINT' => 'number(8)', 'UINT' => 'number(8)',
'UINT:' => 'number(%d)', 'UINT:' => 'number(%d)',
'TINT:' => 'number(%d)', 'TINT:' => 'number(%d)',
@ -136,11 +139,12 @@ class tools implements tools_interface
'sqlite' => array( 'sqlite' => array(
'INT:' => 'int(%d)', 'INT:' => 'int(%d)',
'BINT' => 'bigint(20)', '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', 'UINT:' => 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
'TINT:' => 'tinyint(%d)', 'TINT:' => 'tinyint(%d)',
'USINT' => 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED', 'USINT' => 'INTEGER UNSIGNED', // 'mediumint(4) UNSIGNED',
'BOOL' => 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED', 'BOOL' => 'INTEGER UNSIGNED', // 'tinyint(1) UNSIGNED',
'VCHAR' => 'varchar(255)', 'VCHAR' => 'varchar(255)',
'VCHAR:' => 'varchar(%d)', 'VCHAR:' => 'varchar(%d)',
'CHAR:' => 'char(%d)', 'CHAR:' => 'char(%d)',
@ -152,7 +156,7 @@ class tools implements tools_interface
'STEXT_UNI' => 'text(65535)', 'STEXT_UNI' => 'text(65535)',
'TEXT_UNI' => 'text(65535)', 'TEXT_UNI' => 'text(65535)',
'MTEXT_UNI' => 'mediumtext(16777215)', 'MTEXT_UNI' => 'mediumtext(16777215)',
'TIMESTAMP' => 'INTEGER UNSIGNED', //'int(11) UNSIGNED', 'TIMESTAMP' => 'INTEGER UNSIGNED', // 'int(11) UNSIGNED',
'DECIMAL' => 'decimal(5,2)', 'DECIMAL' => 'decimal(5,2)',
'DECIMAL:' => 'decimal(%d,2)', 'DECIMAL:' => 'decimal(%d,2)',
'PDECIMAL' => 'decimal(6,3)', 'PDECIMAL' => 'decimal(6,3)',
@ -166,6 +170,7 @@ class tools implements tools_interface
'sqlite3' => array( 'sqlite3' => array(
'INT:' => 'INT(%d)', 'INT:' => 'INT(%d)',
'BINT' => 'BIGINT(20)', 'BINT' => 'BIGINT(20)',
'ULINT' => 'INTEGER UNSIGNED',
'UINT' => 'INTEGER UNSIGNED', 'UINT' => 'INTEGER UNSIGNED',
'UINT:' => 'INTEGER UNSIGNED', 'UINT:' => 'INTEGER UNSIGNED',
'TINT:' => 'TINYINT(%d)', '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 * A list of types being unsigned for better reference in some db's
* @var array * @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). * This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array).