mirror of
https://github.com/silverstripe/silverstripe-sqlite3
synced 2024-10-22 17:05:37 +02:00
Compare commits
37 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
df532bb741 | ||
|
1a87b18e71 | ||
|
ee7f0e4d25 | ||
|
66c1c09b74 | ||
|
d3d03d9f79 | ||
|
f949becc6a | ||
|
ecaadc029e | ||
|
05abb3f483 | ||
|
a919f8a317 | ||
|
2ba8fe5c50 | ||
|
f9dfa9f34c | ||
|
c95b0105f5 | ||
|
22d46a5ef8 | ||
|
10c85d4179 | ||
|
34a3221097 | ||
|
1589089f5b | ||
|
e919bdffd9 | ||
|
40b9e876ba | ||
|
c2569099ce | ||
|
5eacbe7842 | ||
|
7add192ebf | ||
|
0fa6b0fde7 | ||
|
62ef14f711 | ||
|
0efd40e5c2 | ||
|
418c1178a1 | ||
|
4167d9fd1a | ||
|
6432ceea0d | ||
|
d315c61ea0 | ||
|
c346e64590 | ||
|
a38ab53e33 | ||
|
978c371820 | ||
|
b36f3598bb | ||
|
34648b9c05 | ||
|
f176bb0a39 | ||
|
0e6aa26f55 | ||
|
ca4a76eaab | ||
|
77e5a5e18c |
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
@ -4,13 +4,8 @@ on:
|
||||
push:
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
# Every Sunday at 3:00pm UTC
|
||||
schedule:
|
||||
- cron: '0 15 * * 0'
|
||||
|
||||
jobs:
|
||||
ci:
|
||||
name: CI
|
||||
# Only run cron on the silverstripe account
|
||||
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
|
||||
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
|
||||
|
16
.github/workflows/dispatch-ci.yml
vendored
Normal file
16
.github/workflows/dispatch-ci.yml
vendored
Normal file
@ -0,0 +1,16 @@
|
||||
name: Dispatch CI
|
||||
|
||||
on:
|
||||
# At 3:00 PM UTC, only on Sunday and Monday
|
||||
schedule:
|
||||
- cron: '0 15 * * 0,1'
|
||||
|
||||
jobs:
|
||||
dispatch-ci:
|
||||
name: Dispatch CI
|
||||
# Only run cron on the silverstripe account
|
||||
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Dispatch CI
|
||||
uses: silverstripe/gha-dispatch-ci@v1
|
@ -1,5 +1 @@
|
||||
<?php
|
||||
|
||||
use SilverStripe\Dev\Deprecation;
|
||||
|
||||
Deprecation::notification_version('1.4.0', 'sqlite3');
|
||||
|
@ -170,7 +170,7 @@ class SQLite3Connector extends DBConnector
|
||||
|
||||
public function escapeString($value)
|
||||
{
|
||||
return $this->dbConn->escapeString($value);
|
||||
return $this->dbConn->escapeString($value ?? '');
|
||||
}
|
||||
|
||||
public function selectDatabase($name)
|
||||
|
@ -60,6 +60,16 @@ class SQLite3Database extends Database
|
||||
*/
|
||||
protected $livesInMemory = false;
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
protected $transactionNesting = 0;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected $transactionSavepoints = [];
|
||||
|
||||
/**
|
||||
* List of default pragma values
|
||||
*
|
||||
@ -348,7 +358,7 @@ class SQLite3Database extends Database
|
||||
"(Title LIKE '%$relevanceKeywords%' OR MenuTitle LIKE '%$relevanceKeywords%'"
|
||||
. " OR Content LIKE '%$relevanceKeywords%' OR MetaDescription LIKE '%$relevanceKeywords%')"
|
||||
. " + (Title LIKE '%$htmlEntityRelevanceKeywords%' OR MenuTitle LIKE '%$htmlEntityRelevanceKeywords%'"
|
||||
. " OR Content LIKE '%$htmlEntityRelevanceKeywords%' OR MetaDescriptio "
|
||||
. " OR Content LIKE '%$htmlEntityRelevanceKeywords%' OR MetaDescription "
|
||||
. " LIKE '%$htmlEntityRelevanceKeywords%')";
|
||||
$relevance[$fileClass] = "(Name LIKE '%$relevanceKeywords%' OR Title LIKE '%$relevanceKeywords%')";
|
||||
} else {
|
||||
@ -401,7 +411,7 @@ class SQLite3Database extends Database
|
||||
$queries[$class]->setFrom('"'.DataObject::getSchema()->baseDataTable($class).'"');
|
||||
$queries[$class]->setSelect(array());
|
||||
foreach ($select[$class] as $clause) {
|
||||
if (preg_match('/^(.*) +AS +"?([^"]*)"?/i', $clause, $matches)) {
|
||||
if (preg_match('/^(.*) +AS +"?([^"]*)"?/i', $clause ?? '', $matches)) {
|
||||
$queries[$class]->selectField($matches[1], $matches[2]);
|
||||
} else {
|
||||
$queries[$class]->selectField(str_replace('"', '', $clause));
|
||||
@ -450,6 +460,19 @@ class SQLite3Database extends Database
|
||||
return version_compare($this->getVersion(), '3.6', '>=');
|
||||
}
|
||||
|
||||
/**
|
||||
* Does this database support transaction modes?
|
||||
*
|
||||
* SQLite doesn't support transaction modes.
|
||||
*
|
||||
* @param string $mode
|
||||
* @return bool
|
||||
*/
|
||||
public function supportsTransactionMode(string $mode): bool
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public function supportsExtensions($extensions = array('partitions', 'tablespaces', 'clustering'))
|
||||
{
|
||||
if (isset($extensions['partitions'])) {
|
||||
@ -465,26 +488,148 @@ class SQLite3Database extends Database
|
||||
|
||||
public function transactionStart($transaction_mode = false, $session_characteristics = false)
|
||||
{
|
||||
$this->query('BEGIN');
|
||||
if ($this->transactionDepth()) {
|
||||
$this->transactionSavepoint('NESTEDTRANSACTION' . $this->transactionDepth());
|
||||
} else {
|
||||
$this->query('BEGIN');
|
||||
$this->transactionDepthIncrease();
|
||||
}
|
||||
}
|
||||
|
||||
public function transactionSavepoint($savepoint)
|
||||
{
|
||||
$this->query("SAVEPOINT \"$savepoint\"");
|
||||
$this->transactionDepthIncrease($savepoint);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch the name of the most recent savepoint
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function getTransactionSavepointName()
|
||||
{
|
||||
return end($this->transactionSavepoints);
|
||||
}
|
||||
|
||||
public function transactionRollback($savepoint = false)
|
||||
{
|
||||
// Named transaction
|
||||
if ($savepoint) {
|
||||
$this->query("ROLLBACK TO $savepoint;");
|
||||
$this->transactionDepthDecrease();
|
||||
return true;
|
||||
}
|
||||
|
||||
// Fail if transaction isn't available
|
||||
if (!$this->transactionDepth()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($this->transactionIsNested()) {
|
||||
$this->transactionRollback($this->getTransactionSavepointName());
|
||||
} else {
|
||||
$this->query('ROLLBACK;');
|
||||
$this->transactionDepthDecrease();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function transactionDepth()
|
||||
{
|
||||
return $this->transactionNesting;
|
||||
}
|
||||
|
||||
public function transactionEnd($chain = false)
|
||||
{
|
||||
$this->query('COMMIT;');
|
||||
// Fail if transaction isn't available
|
||||
if (!$this->transactionDepth()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($this->transactionIsNested()) {
|
||||
$savepoint = $this->getTransactionSavepointName();
|
||||
$this->query('RELEASE ' . $savepoint);
|
||||
$this->transactionDepthDecrease();
|
||||
} else {
|
||||
$this->query('COMMIT;');
|
||||
$this->resetTransactionNesting();
|
||||
}
|
||||
|
||||
if ($chain) {
|
||||
$this->transactionStart();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Indicate whether or not the current transaction is nested
|
||||
* Returns false if there are no transactions, or the open
|
||||
* transaction is the 'outer' transaction, i.e. not nested.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
protected function transactionIsNested()
|
||||
{
|
||||
return $this->transactionNesting > 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Increase the nested transaction level by one
|
||||
* savepoint tracking is optional because BEGIN
|
||||
* opens a transaction, but is not a named reference
|
||||
*
|
||||
* @param string $savepoint
|
||||
*/
|
||||
protected function transactionDepthIncrease($savepoint = null)
|
||||
{
|
||||
++$this->transactionNesting;
|
||||
if ($savepoint) {
|
||||
array_push($this->transactionSavepoints, $savepoint);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Decrease the nested transaction level by one
|
||||
* and reduce the savepoint tracking if we are
|
||||
* nesting, as the last one is no longer valid
|
||||
*/
|
||||
protected function transactionDepthDecrease()
|
||||
{
|
||||
if ($this->transactionIsNested()) {
|
||||
array_pop($this->transactionSavepoints);
|
||||
}
|
||||
--$this->transactionNesting;
|
||||
}
|
||||
|
||||
/**
|
||||
* In error condition, set transactionNesting to zero
|
||||
*/
|
||||
protected function resetTransactionNesting()
|
||||
{
|
||||
$this->transactionNesting = 0;
|
||||
$this->transactionSavepoints = [];
|
||||
}
|
||||
|
||||
public function query($sql, $errorLevel = E_USER_ERROR)
|
||||
{
|
||||
return parent::query($sql, $errorLevel);
|
||||
}
|
||||
|
||||
public function preparedQuery($sql, $parameters, $errorLevel = E_USER_ERROR)
|
||||
{
|
||||
return parent::preparedQuery($sql, $parameters, $errorLevel);
|
||||
}
|
||||
|
||||
/**
|
||||
* Inspect a SQL query prior to execution
|
||||
* @deprecated 2.2.0:3.0.0
|
||||
* @param string $sql
|
||||
*/
|
||||
protected function inspectQuery($sql)
|
||||
{
|
||||
// no-op
|
||||
}
|
||||
|
||||
public function clearTable($table)
|
||||
@ -527,7 +672,7 @@ class SQLite3Database extends Database
|
||||
|
||||
public function formattedDatetimeClause($date, $format)
|
||||
{
|
||||
preg_match_all('/%(.)/', $format, $matches);
|
||||
preg_match_all('/%(.)/', $format ?? '', $matches);
|
||||
foreach ($matches[1] as $match) {
|
||||
if (array_search($match, array('Y', 'm', 'd', 'H', 'i', 's', 'U')) === false) {
|
||||
user_error('formattedDatetimeClause(): unsupported format character %' . $match, E_USER_WARNING);
|
||||
@ -549,9 +694,9 @@ class SQLite3Database extends Database
|
||||
$modifiers[] = 'localtime';
|
||||
}
|
||||
|
||||
if (preg_match('/^now$/i', $date)) {
|
||||
if (preg_match('/^now$/i', $date ?? '')) {
|
||||
$date = "'now'";
|
||||
} elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date)) {
|
||||
} elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date ?? '')) {
|
||||
$date = "'$date'";
|
||||
}
|
||||
|
||||
@ -566,9 +711,9 @@ class SQLite3Database extends Database
|
||||
$modifiers[] = 'localtime';
|
||||
}
|
||||
|
||||
if (preg_match('/^now$/i', $date)) {
|
||||
if (preg_match('/^now$/i', $date ?? '')) {
|
||||
$date = "'now'";
|
||||
} elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date)) {
|
||||
} elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date ?? '')) {
|
||||
$date = "'$date'";
|
||||
}
|
||||
|
||||
@ -588,15 +733,15 @@ class SQLite3Database extends Database
|
||||
$modifiers2[] = 'localtime';
|
||||
}
|
||||
|
||||
if (preg_match('/^now$/i', $date1)) {
|
||||
if (preg_match('/^now$/i', $date1 ?? '')) {
|
||||
$date1 = "'now'";
|
||||
} elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date1)) {
|
||||
} elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date1 ?? '')) {
|
||||
$date1 = "'$date1'";
|
||||
}
|
||||
|
||||
if (preg_match('/^now$/i', $date2)) {
|
||||
if (preg_match('/^now$/i', $date2 ?? '')) {
|
||||
$date2 = "'now'";
|
||||
} elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date2)) {
|
||||
} elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date2 ?? '')) {
|
||||
$date2 = "'$date2'";
|
||||
}
|
||||
|
||||
|
@ -58,6 +58,11 @@ class SQLite3Query extends Query
|
||||
*/
|
||||
public function numRecords()
|
||||
{
|
||||
// Some queries are not iterable using fetchArray like CREATE statement
|
||||
if (!$this->handle->numColumns()) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
$this->handle->reset();
|
||||
$c=0;
|
||||
while ($this->handle->fetchArray()) {
|
||||
|
@ -2,10 +2,11 @@
|
||||
|
||||
namespace SilverStripe\SQLite;
|
||||
|
||||
use Exception;
|
||||
use SilverStripe\Control\Director;
|
||||
use SilverStripe\Dev\Debug;
|
||||
use SilverStripe\ORM\Connect\DBSchemaManager;
|
||||
use Exception;
|
||||
use SQLite3;
|
||||
|
||||
/**
|
||||
* SQLite schema manager class
|
||||
@ -231,7 +232,7 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||
if (self::$vacuum) {
|
||||
$this->query('VACUUM', E_USER_NOTICE);
|
||||
$message = $this->database->getConnector()->getLastError();
|
||||
if (preg_match('/authoriz/', $message)) {
|
||||
if (preg_match('/authoriz/', $message ?? '')) {
|
||||
$this->alterationMessage("VACUUM | $message", "error");
|
||||
} else {
|
||||
$this->alterationMessage("VACUUMing", "repaired");
|
||||
@ -275,21 +276,22 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||
}
|
||||
|
||||
$queries = array(
|
||||
"BEGIN TRANSACTION",
|
||||
"CREATE TABLE \"{$tableName}_alterfield_{$fieldName}\"(" . implode(',', $newColsSpec) . ")",
|
||||
"INSERT INTO \"{$tableName}_alterfield_{$fieldName}\" SELECT {$fieldNameList} FROM \"$tableName\"",
|
||||
"DROP TABLE \"$tableName\"",
|
||||
"ALTER TABLE \"{$tableName}_alterfield_{$fieldName}\" RENAME TO \"$tableName\"",
|
||||
"COMMIT"
|
||||
);
|
||||
|
||||
// Remember original indexes
|
||||
$indexList = $this->indexList($tableName);
|
||||
|
||||
// Then alter the table column
|
||||
foreach ($queries as $query) {
|
||||
$this->query($query.';');
|
||||
}
|
||||
$database = $this->database;
|
||||
$database->withTransaction(function () use ($database, $queries, $indexList) {
|
||||
foreach ($queries as $query) {
|
||||
$database->query($query . ';');
|
||||
}
|
||||
});
|
||||
|
||||
// Recreate the indexes
|
||||
foreach ($indexList as $indexName => $indexSpec) {
|
||||
@ -318,21 +320,22 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||
$oldColsStr = implode(',', $oldCols);
|
||||
$newColsSpecStr = implode(',', $newColsSpec);
|
||||
$queries = array(
|
||||
"BEGIN TRANSACTION",
|
||||
"CREATE TABLE \"{$tableName}_renamefield_{$oldName}\" ({$newColsSpecStr})",
|
||||
"INSERT INTO \"{$tableName}_renamefield_{$oldName}\" SELECT {$oldColsStr} FROM \"$tableName\"",
|
||||
"DROP TABLE \"$tableName\"",
|
||||
"ALTER TABLE \"{$tableName}_renamefield_{$oldName}\" RENAME TO \"$tableName\"",
|
||||
"COMMIT"
|
||||
);
|
||||
|
||||
// Remember original indexes
|
||||
$oldIndexList = $this->indexList($tableName);
|
||||
|
||||
// Then alter the table column
|
||||
foreach ($queries as $query) {
|
||||
$this->query($query.';');
|
||||
}
|
||||
$database = $this->database;
|
||||
$database->withTransaction(function () use ($database, $queries) {
|
||||
foreach ($queries as $query) {
|
||||
$database->query($query . ';');
|
||||
}
|
||||
});
|
||||
|
||||
// Recreate the indexes
|
||||
foreach ($oldIndexList as $indexName => $indexSpec) {
|
||||
@ -368,7 +371,7 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||
if ($sqlCreate && $sqlCreate['sql']) {
|
||||
preg_match(
|
||||
'/^[\s]*CREATE[\s]+TABLE[\s]+[\'"]?[a-zA-Z0-9_\\\]+[\'"]?[\s]*\((.+)\)[\s]*$/ims',
|
||||
$sqlCreate['sql'],
|
||||
$sqlCreate['sql'] ?? '',
|
||||
$matches
|
||||
);
|
||||
$fields = isset($matches[1])
|
||||
@ -429,6 +432,15 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||
return $this->buildSQLiteIndexName($table, $index);
|
||||
}
|
||||
|
||||
protected function convertIndexSpec($indexSpec)
|
||||
{
|
||||
$supportedIndexTypes = ['index', 'unique'];
|
||||
if (isset($indexSpec['type']) && !in_array($indexSpec['type'], $supportedIndexTypes)) {
|
||||
$indexSpec['type'] = 'index';
|
||||
}
|
||||
return parent::convertIndexSpec($indexSpec);
|
||||
}
|
||||
|
||||
public function indexList($table)
|
||||
{
|
||||
$indexList = array();
|
||||
@ -540,7 +552,18 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||
|
||||
// Set default
|
||||
if (!empty($values['default'])) {
|
||||
$default = str_replace(array('"', "'", "\\", "\0"), "", $values['default']);
|
||||
/*
|
||||
On escaping strings:
|
||||
|
||||
https://www.sqlite.org/lang_expr.html
|
||||
"A string constant is formed by enclosing the string in single quotes ('). A single quote within
|
||||
the string can be encoded by putting two single quotes in a row - as in Pascal. C-style escapes
|
||||
using the backslash character are not supported because they are not standard SQL."
|
||||
|
||||
Also, there is a nifty PHP function for this. However apparently one must still be cautious of
|
||||
the null character ('\0' or 0x0), as per https://bugs.php.net/bug.php?id=63419
|
||||
*/
|
||||
$default = SQLite3::escapeString(str_replace("\0", "", $values['default']));
|
||||
return "TEXT DEFAULT '$default'";
|
||||
} else {
|
||||
return 'TEXT';
|
||||
|
Loading…
Reference in New Issue
Block a user