SQLite: Set busy_timeout to 500

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 4876ebe07b6d1e81f476bc5560e738de2b2707e8..b33cd9aae50d0c1a8517b84e2f52cc9f85809b82 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -191,6 +191,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
                                if (is_readable($filename) && $this->query("ATTACH " . $this->quote(preg_match("~(^[/\\\\]|:)~", $filename) ? $filename : dirname($_SERVER["SCRIPT_FILENAME"]) . "/$filename") . " AS a")) { // is_readable - SQLite 3
                                        parent::__construct($filename);
                                        $this->query("PRAGMA foreign_keys = 1");
+                                       $this->query("PRAGMA busy_timeout = 500");
                                        return true;
                                }
                                return false;

diff --git a/changes.txt b/changes.txt
index 62a296adb671fb06cba34ccdd6fc6b88856e1579..5a9b02072900f516364a8fdde952fdbdfc2e23af 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -9,6 +9,7 @@ PostgreSQL: Use bigserial for bigint auto increment (bug #765, regression from 3
 PostgreSQL PDO: Support PgBouncer, unsupport PostgreSQL < 9.1 (bug #771)
 PostgreSQL 10: Support GENERATED ALWAYS BY IDENTITY (PR #386)
 PostgreSQL 11: Create PRIMARY KEY for auto increment columns
+SQLite: Set busy_timeout to 500
 MS SQL: Don't truncate comments to 30 chars (PR #376)
 Editor: Cast to string when searching (bug #325)
 Re-enable PHP warnings (regression from 4.7.8)