aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-131-2/+2
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10214] Correct Oracle create table query syntax in db_tools
| * [ticket/10214] Correct Oracle create table query syntax in db_toolsNils Adermann2011-06-131-2/+2
| | | | | | | | | | | | | | | | Removes the semicolon at end of oracle CREATE TABLE queries and adds a semicolon to the end of a SELECT query inside of the trigger for a new table's auto increment column before the end keyword PHPBB3-10214
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-121-1/+31
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9892] Correct copyright year [ticket/9892] Remove incorrect use of camel case [ticket/9892] Removing closing php tag from create_schema_files [ticket/9892] Transaction support for database update sql execution function [ticket/9892] count is a keyword in firebird, so renaming this alias [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config [ticket/9892] Shorten login_attempt key names to avoid firebird length problems [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state [ticket/9892] Adding a number of tests for db_tools [ticket/9892] Table prefix lengths influence index lengths in db_tools [ticket/9892] Shorten the index names on the q&a captcha [ticket/9892] column & index name limits, firebird auto increment in db_tools Conflicts: phpBB/develop/create_schema_files.php
| * [ticket/9892] Table prefix lengths influence index lengths in db_toolsNils Adermann2011-06-121-5/+9
| | | | | | | | PHPBB3-9892
| * [ticket/9892] column & index name limits, firebird auto increment in db_toolsNils Adermann2011-06-121-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Column names are limited to 30 characters - Index names are limited to 31 characters. On some dbms the index name contains both table name and actual index name so the limit applies to the sum of the lenghts of table name and index name. - Auto incremented column names are limited to 26 characters to provide an additional 4 characters for sequence names The code for firebird auto increment support using generators/sequences with triggers was copied from create_schema_files.php PHPBB3-9892
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-111-0/+13
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9992] Clarify explanations of ip and account limits on login [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN [ticket/9992] Use sql_fetchfield for single row and single column result [ticket/9992] Adding a limit on login attempts per IP. [ticket/9992] Make sql_create_table and sql_table_exists available in updater
| * [ticket/9992] Adding a limit on login attempts per IP.Nils Adermann2011-06-101-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | A new table was created to save all failed login attempts with corresponding information on username, ip and useragent. By default the limit is 50 login attempts within 6 hours per IP. The limit is relatively high to avoid big problems on sites behind a reverse proxy that don't receive the forwarded-for value as REMOTE_ADDR but see all users as coming from the same IP address. But if these users run into problems a special forwarded-for option is available to limit logins by forwarded-for value instead of ip. PHPBB3-9992
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-022-2/+2
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/9685] Test for databases that are able to nest transactions [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
| * [ticket/9685] Consistently name the new sql_buffer_nested_transactions functionNils Adermann2011-06-022-2/+2
| | | | | | | | PHPBB3-9685
* | [ticket/10146] Fix Firebird DECIMAL precision issue on develop.Andreas Fischer2011-05-111-1/+2
| | | | | | | | PHPBB3-10146
* | Merge branch 'develop-olympus' into developNils Adermann2011-05-051-4/+258
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications. [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools. [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools. [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools. [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools. [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools. [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
| * [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.Oleg Pudeyev2011-04-291-1/+1
| | | | | | | | PHPBB3-10003
| * [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.Oleg Pudeyev2011-04-291-2/+2
| | | | | | | | | | | | | | Most of it was already in db_tools, these changes could have applied to code that did not exist in db_tools at the time of the commit. PHPBB3-10003
| * [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.Oleg Pudeyev2011-04-291-4/+12
| | | | | | | | | | | | The diff in database_update was only partially relevant. PHPBB3-10003
| * [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.Oleg Pudeyev2011-04-291-6/+137
| | | | | | | | | | | | | | This was painful. Git wanted to patch hunks in wrong places. Hopefully I got it right. PHPBB3-10003
| * [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.Oleg Pudeyev2011-04-291-1/+109
| | | | | | | | | | | | This diff applied cleanly. PHPBB3-10003
| * [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.Oleg Pudeyev2011-04-291-2/+4
| | | | | | | | | | | | This change is somewhat questionable, maybe it should be reviewed. PHPBB3-10003
| * [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.Oleg Pudeyev2011-04-291-2/+7
| | | | | | | | PHPBB3-10003
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-311-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10112] Replaced a couple occurrences of count() with sizeof()
| * Merge remote branch 'callumacrae/ticket/10112' into develop-olympusIgor Wiedler2011-03-311-1/+1
| |\ | | | | | | | | | | | | * callumacrae/ticket/10112: [ticket/10112] Replaced a couple occurrences of count() with sizeof()
| | * [ticket/10112] Replaced a couple occurrences of count() with sizeof()Callum Macrae2011-03-301-1/+1
| | | | | | | | | | | | | | | | | | As per the coding guidlines, sizeof() should be used instead of count(). PHPBB3-10112
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-241-1/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/9946] Allow storage of data >4kB on Oracle again
| * | Merge branch 'ticket/jellydoughnut/9946' into develop-olympusAndreas Fischer2011-03-241-1/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9946: [ticket/9946] Allow storage of data >4kB on Oracle again
| | * | [ticket/9946] Allow storage of data >4kB on Oracle againJosh Woody2011-03-071-1/+2
| | |/ | | | | | | | | | | | | | | | This fixes the fix to PHPBB3-9132, which introduced a fatal error on Oracle. PHPBB3-9946
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-152-1/+19
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/9685] Buffer posts for search indexing when using mssqlnative.
| * | [ticket/9685] Buffer posts for search indexing when using mssqlnative.Nils Adermann2011-03-152-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | To have a generic solution there is now a sql_buffer_nested_transaction() which indicates that the given SQL driver requires buffering to run a transaction while iterating over another result set. PHPBB3-9685
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-102-4/+81
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10057] Fixes for a bunch of small problems. [ticket/10035] ACP template edit feature allows to read any files on webserver. [ticket/10057] Handle the case of missing interbase extension better. [ticket/10057] Fixed wrong usage of sql_error again, in firebird. [ticket/10057] Fixed usage of sql_error again. [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL. [ticket/10057] Fixed wrong usage of sql_error in postgres dbal. [ticket/10057] Skip ibase_service_attach if firebird connection failed. [ticket/10057] Check for interbase function existence. [ticket/10057] Split statements in firebird dbal for readability. [ticket/10057] Include error collector class file in postgres dbal. [ticket/10057] Moved error collector class into its own file. [ticket/10057] Use a class for error collection. [ticket/10057] More informative error messages in postgres dbal. [ticket/10057] No negative array indexing. [ticket/10057] Report postgres db connection errors.
| * | [ticket/10057] Fixes for a bunch of small problems.Oleg Pudeyev2011-03-082-2/+2
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Handle the case of missing interbase extension better.Oleg Pudeyev2011-03-071-1/+17
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Fixed wrong usage of sql_error again, in firebird.Oleg Pudeyev2011-03-071-2/+5
| | | | | | | | | | | | | | | | | | This necessitates adding connect_error property to firebird. PHPBB3-10057
| * | [ticket/10057] Fixed usage of sql_error again.Oleg Pudeyev2011-03-071-2/+4
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.Oleg Pudeyev2011-03-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | pg_last_error does not work if no connection was ever established. Therefore we must keep track of connection errors in postgres dbal ourselves. PHPBB3-10057
| * | [ticket/10057] Skip ibase_service_attach if firebird connection failed.Oleg Pudeyev2011-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | | ibase_errmsg works for the most recent call. If the connection fails, any error message is clobbered by ibase_service_attach call. PHPBB3-10057
| * | [ticket/10057] Check for interbase function existence.Oleg Pudeyev2011-03-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Calling nonexistent functions with @ destroys the script with no feedback as to the cause of the error. Check whether interbase functions exist before calling them. PHPBB3-10057
| * | [ticket/10057] Split statements in firebird dbal for readability.Oleg Pudeyev2011-03-061-2/+16
| | | | | | | | | | | | PHPBB3-10057
| * | [ticket/10057] Include error collector class file in postgres dbal.Oleg Pudeyev2011-03-061-0/+5
| | | | | | | | | | | | | | | | | | This change is in its own commit because it will be reverted for 3.1. PHPBB3-10057
| * | [ticket/10057] Use a class for error collection.Oleg Pudeyev2011-03-061-4/+6
| | | | | | | | | | | | | | | | | | | | | Replaced error collection functions with a class for a cleaner implementation. PHPBB3-10057
| * | [ticket/10057] More informative error messages in postgres dbal.Oleg Pudeyev2011-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | When pg_connect/pg_pconnect do not exist, mention that they come with pgsql extension. PHPBB3-10057
| * | [ticket/10057] Report postgres db connection errors.Oleg Pudeyev2011-03-061-1/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses two issues: 1. When pgsql extension is missing, @pg_connect would silently abort execution. Check for pg_connect existence before calling it, same with pg_pconnect. 2. When connection fails, the error reported by php is discarded. User is shown the failure message without the reason for failure, making debugging difficult. Collect the error (if any) via a temporarily installed error handler, and display it if connection failed. PHPBB3-10057
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-161-1/+1
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9859] Remove the years from the copyright statements in docs files. [ticket/9859] Remove the year from the copyright meta tag in docs/*.html [ticket/9859] Remove the meta copyright tag as well. [ticket/9859] Remove the credit line comment from all html files. [ticket/9859] Remove years in credit line from some more files.
| * [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Standard HTML output now includes: Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group Print output now includes: Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/ This also fixes an inconsistency where "phpBB Group" was linked instead of "phpBB". PHPBB3-9859
* | [task/config-class] Implemented a config class to replace the global array.Nils Adermann2011-01-103-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a phpbb_config class which simply holds an array and does not persist any data. It implements ArrayAccess, Countable and IteratorAggregate to allow regular use of configuration as if it was still an array. The phpbb_config_db class depends on an instance of the dbal and a cache driver. It obtains the configuration data from cache and database as necessary and persists data to the database. The functions set_config and set_config_count remain for backward compatability but they only call methods on the new config class now instead of directly manipulating the database and cache. PHPBB3-9988
* | [ticket/9574] Remove conditional PHP<5.2 codeIgor Wiedler2010-12-281-8/+1
| | | | | | | | | | | | | | There is a large amount of conditional code for PHP < 5.2 that can be removed with phpBB 3.1. PHPBB3-9574
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-1111-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | Merge branch 'develop-olympus' into developAndreas Fischer2010-11-031-6/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results. [task/mssql-db-tests] Split up database tests into SELECT and write operations [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start. [task/mssql-db-tests] sql_query_limit must return all results when total = 0 [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections [task/mssql-db-tests] Refactored getConnection into multiple smaller parts. [task/mssql-db-tests] Allow test configuration with environment variables. [task/mssql-db-tests] No longer display an error when skipping db tests. [task/mssql-db-tests] Use a simple getter for test case helpers. Conflicts: tests/template/template.php
| * Merge branch 'task/naderman/mssql-db-tests' into develop-olympusAndreas Fischer2010-11-031-6/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/naderman/mssql-db-tests: [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results. [task/mssql-db-tests] Split up database tests into SELECT and write operations [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start. [task/mssql-db-tests] sql_query_limit must return all results when total = 0 [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections [task/mssql-db-tests] Refactored getConnection into multiple smaller parts. [task/mssql-db-tests] Allow test configuration with environment variables. [task/mssql-db-tests] No longer display an error when skipping db tests. [task/mssql-db-tests] Use a simple getter for test case helpers.
| | * [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.Nils Adermann2010-10-251-1/+6
| | | | | | | | | | | | PHPBB3-9868
| | * [task/mssql-db-tests] sql_query_limit must return all results when total = 0Nils Adermann2010-10-251-5/+14
| | | | | | | | | | | | PHPBB3-9868
* | | Merge branch 'develop-olympus' into developIgor Wiedler2010-10-251-5/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9478] Validate maximum number of allowed recipients per PM value. [ticket/9686] Fix mssqlnative database data export [ticket/9595] List min/max characters indexed by search for mysql_fulltext. [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN. [ticket/9853] Change recaptcha theme from default to 'clean'.
| * | [ticket/9686] Fix mssqlnative database data exportNils Adermann2010-10-251-5/+15
| |/ | | | | | | | | | | | | | | | | We require version 1.1 of the sqlsrv extension anyway so the regular sqlsrv_num_rows can be used instead of buffering the result. The result buffer (class result_mssqlnative) should never automatically free the resource it receives - we consistently close resources using sql_freeresult(). PHPBB3-9686