Compare commits
63 Commits
2.1.0-alph
...
2
Author | SHA1 | Date |
---|---|---|
Steve Boyd | df532bb741 | |
Will Rossiter | 1a87b18e71 | |
Guy Sartorelli | ee7f0e4d25 | |
Thomas Portelange | 66c1c09b74 | |
Thomas Portelange | d3d03d9f79 | |
Guy Sartorelli | f949becc6a | |
Thomas Portelange | ecaadc029e | |
Thomas Portelange | 05abb3f483 | |
Guy Sartorelli | f102cad3bf | |
Steve Boyd | d142dd77e4 | |
Steve Boyd | a919f8a317 | |
Steve Boyd | ea06c57cfb | |
Guy Sartorelli | d399c27722 | |
Steve Boyd | bf07381fc9 | |
Guy Sartorelli | 2ba8fe5c50 | |
Elliot Sawyer | f9dfa9f34c | |
Sam Minnée | c95b0105f5 | |
Michal Kleiner | 22d46a5ef8 | |
Robbie Averill | 10c85d4179 | |
Robbie Averill | b5a6416388 | |
Robbie Averill | 4edf7c23f8 | |
Mark Cameron | 3c8a06f5b9 | |
Robbie Averill | 34a3221097 | |
Sam Minnee | 1589089f5b | |
Sam Minnée | e919bdffd9 | |
Maxime Rainville | 40b9e876ba | |
NightjarNZ | c2569099ce | |
NightjarNZ | 5eacbe7842 | |
Maxime Rainville | 7add192ebf | |
NightjarNZ | 0fa6b0fde7 | |
NightjarNZ | 62ef14f711 | |
NightjarNZ | 0efd40e5c2 | |
NightjarNZ | 418c1178a1 | |
Daniel Hensby | 4167d9fd1a | |
Damian Mooyman | 6432ceea0d | |
Dylan Wagstaff | d315c61ea0 | |
Damian Mooyman | c346e64590 | |
Damian Mooyman | a38ab53e33 | |
Thomas Portelange | 978c371820 | |
Daniel Hensby | b36f3598bb | |
Mike Cochrane | 34648b9c05 | |
Daniel Hensby | f176bb0a39 | |
Damian Mooyman | 0e6aa26f55 | |
Damian Mooyman | 9b00630616 | |
Damian Mooyman | e8f4e55b8a | |
Damian Mooyman | 2bde2640c3 | |
Damian Mooyman | ca4a76eaab | |
Damian Mooyman | 77e5a5e18c | |
Damian Mooyman | dbf10488ee | |
Daniel Hensby | 978a5a19ce | |
Damian Mooyman | 24cf40beaf | |
Daniel Hensby | 4aad42c084 | |
Damian Mooyman | acaaf95d22 | |
Daniel Hensby | c00a11cf7e | |
Daniel Hensby | 536ada309e | |
Damian Mooyman | 8d25343c41 | |
Ingo Schommer | eba3c2c746 | |
Daniel Hensby | 4e854b3fd2 | |
Loz Calver | 0a646577fe | |
Damian Mooyman | 47d47ab2a8 | |
Loz Calver | 149d1708b6 | |
Daniel Hensby | ea1d504617 | |
Damian Mooyman | 65cd866f42 |
|
@ -0,0 +1,11 @@
|
||||||
|
name: CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
pull_request:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
ci:
|
||||||
|
name: CI
|
||||||
|
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
|
|
@ -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
|
|
@ -0,0 +1,17 @@
|
||||||
|
name: Keepalive
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
# The 15th of every month at 3:50pm UTC
|
||||||
|
schedule:
|
||||||
|
- cron: '50 15 15 * *'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
keepalive:
|
||||||
|
name: Keepalive
|
||||||
|
# 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: Keepalive
|
||||||
|
uses: silverstripe/gha-keepalive@v1
|
|
@ -1,69 +0,0 @@
|
||||||
inherit: true
|
|
||||||
|
|
||||||
checks:
|
|
||||||
php:
|
|
||||||
verify_property_names: true
|
|
||||||
verify_argument_usable_as_reference: true
|
|
||||||
verify_access_scope_valid: true
|
|
||||||
useless_calls: true
|
|
||||||
use_statement_alias_conflict: true
|
|
||||||
variable_existence: true
|
|
||||||
unused_variables: true
|
|
||||||
unused_properties: true
|
|
||||||
unused_parameters: true
|
|
||||||
unused_methods: true
|
|
||||||
unreachable_code: true
|
|
||||||
too_many_arguments: true
|
|
||||||
sql_injection_vulnerabilities: true
|
|
||||||
simplify_boolean_return: true
|
|
||||||
side_effects_or_types: true
|
|
||||||
security_vulnerabilities: true
|
|
||||||
return_doc_comments: true
|
|
||||||
return_doc_comment_if_not_inferrable: true
|
|
||||||
require_scope_for_properties: true
|
|
||||||
require_scope_for_methods: true
|
|
||||||
require_php_tag_first: true
|
|
||||||
psr2_switch_declaration: true
|
|
||||||
psr2_class_declaration: true
|
|
||||||
property_assignments: true
|
|
||||||
prefer_while_loop_over_for_loop: true
|
|
||||||
precedence_mistakes: true
|
|
||||||
precedence_in_conditions: true
|
|
||||||
phpunit_assertions: true
|
|
||||||
php5_style_constructor: true
|
|
||||||
parse_doc_comments: true
|
|
||||||
parameter_non_unique: true
|
|
||||||
parameter_doc_comments: true
|
|
||||||
param_doc_comment_if_not_inferrable: true
|
|
||||||
optional_parameters_at_the_end: true
|
|
||||||
one_class_per_file: true
|
|
||||||
no_unnecessary_if: true
|
|
||||||
no_trailing_whitespace: true
|
|
||||||
no_property_on_interface: true
|
|
||||||
no_non_implemented_abstract_methods: true
|
|
||||||
no_error_suppression: true
|
|
||||||
no_duplicate_arguments: true
|
|
||||||
no_commented_out_code: true
|
|
||||||
newline_at_end_of_file: true
|
|
||||||
missing_arguments: true
|
|
||||||
method_calls_on_non_object: true
|
|
||||||
instanceof_class_exists: true
|
|
||||||
foreach_traversable: true
|
|
||||||
fix_line_ending: true
|
|
||||||
fix_doc_comments: true
|
|
||||||
duplication: true
|
|
||||||
deprecated_code_usage: true
|
|
||||||
deadlock_detection_in_loops: true
|
|
||||||
code_rating: true
|
|
||||||
closure_use_not_conflicting: true
|
|
||||||
catch_class_exists: true
|
|
||||||
blank_line_after_namespace_declaration: false
|
|
||||||
avoid_multiple_statements_on_same_line: true
|
|
||||||
avoid_duplicate_types: true
|
|
||||||
avoid_conflicting_incrementers: true
|
|
||||||
avoid_closing_tag: true
|
|
||||||
assignment_of_null_return: true
|
|
||||||
argument_type_checks: true
|
|
||||||
|
|
||||||
filter:
|
|
||||||
paths: [code/*, tests/*]
|
|
30
.travis.yml
30
.travis.yml
|
@ -1,30 +0,0 @@
|
||||||
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
|
|
||||||
|
|
||||||
sudo: false
|
|
||||||
|
|
||||||
language: php
|
|
||||||
|
|
||||||
php:
|
|
||||||
- 5.5
|
|
||||||
- 5.6
|
|
||||||
- 7.0
|
|
||||||
|
|
||||||
env:
|
|
||||||
- DB=SQLITE CORE_RELEASE=master PDO=1
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- php: 5.6
|
|
||||||
env: DB=SQLITE CORE_RELEASE=master PDO=0
|
|
||||||
allow_failures:
|
|
||||||
- php: 7.0
|
|
||||||
|
|
||||||
before_script:
|
|
||||||
- composer self-update || true
|
|
||||||
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
|
|
||||||
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
|
|
||||||
- cd ~/builds/ss
|
|
||||||
- composer install
|
|
||||||
|
|
||||||
script:
|
|
||||||
- vendor/bin/phpunit framework/tests
|
|
|
@ -1,6 +1,7 @@
|
||||||
# SQLite3 Module
|
# SQLite3 Module
|
||||||
|
|
||||||
[![Build Status](https://travis-ci.org/silverstripe-labs/silverstripe-sqlite3.png?branch=master)](https://travis-ci.org/silverstripe-labs/silverstripe-sqlite3)
|
[![CI](https://github.com/silverstripe/silverstripe-sqlite3/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-sqlite3/actions/workflows/ci.yml)
|
||||||
|
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
|
||||||
|
|
||||||
## Maintainer Contact
|
## Maintainer Contact
|
||||||
|
|
||||||
|
@ -9,7 +10,7 @@ Andreas Piening (Nickname: apiening)
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
* SilverStripe 4.0 or newer
|
* Silverstripe 4.0 or newer
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
@ -26,7 +27,6 @@ Either use the installer to automatically install SQLite or add this to your _co
|
||||||
Make sure the webserver has sufficient privileges to write to that folder and that it is protected from
|
Make sure the webserver has sufficient privileges to write to that folder and that it is protected from
|
||||||
external access.
|
external access.
|
||||||
|
|
||||||
|
|
||||||
### Sample mysite/_config.php
|
### Sample mysite/_config.php
|
||||||
|
|
||||||
```php
|
```php
|
||||||
|
|
|
@ -1,5 +1 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
use SilverStripe\Dev\Deprecation;
|
|
||||||
|
|
||||||
Deprecation::notification_version('1.4.0', 'sqlite3');
|
|
||||||
|
|
|
@ -5,28 +5,28 @@ SilverStripe\Core\Injector\Injector:
|
||||||
SQLite3PDODatabase:
|
SQLite3PDODatabase:
|
||||||
class: SilverStripe\SQLite\SQLite3Database
|
class: SilverStripe\SQLite\SQLite3Database
|
||||||
properties:
|
properties:
|
||||||
connector: %$PDOConnector
|
connector: '%$PDOConnector'
|
||||||
schemaManager: %$SQLite3SchemaManager
|
schemaManager: '%$SQLite3SchemaManager'
|
||||||
queryBuilder: %$SQLite3QueryBuilder
|
queryBuilder: '%$SQLite3QueryBuilder'
|
||||||
SQLite3Database:
|
SQLite3Database:
|
||||||
class: SilverStripe\SQLite\SQLite3Database
|
class: SilverStripe\SQLite\SQLite3Database
|
||||||
properties:
|
properties:
|
||||||
connector: %$SQLite3Connector
|
connector: '%$SQLite3Connector'
|
||||||
schemaManager: %$SQLite3SchemaManager
|
schemaManager: '%$SQLite3SchemaManager'
|
||||||
queryBuilder: %$SQLite3QueryBuilder
|
queryBuilder: '%$SQLite3QueryBuilder'
|
||||||
# Legacy connector names
|
# Legacy connector names
|
||||||
SQLiteDatabase:
|
SQLiteDatabase:
|
||||||
class: SilverStripe\SQLite\SQLite3Database
|
class: SilverStripe\SQLite\SQLite3Database
|
||||||
properties:
|
properties:
|
||||||
connector: %$SQLite3Connector
|
connector: '%$SQLite3Connector'
|
||||||
schemaManager: %$SQLite3SchemaManager
|
schemaManager: '%$SQLite3SchemaManager'
|
||||||
queryBuilder: %$SQLite3QueryBuilder
|
queryBuilder: '%$SQLite3QueryBuilder'
|
||||||
SQLitePDODatabase:
|
SQLitePDODatabase:
|
||||||
class: SilverStripe\SQLite\SQLite3Database
|
class: SilverStripe\SQLite\SQLite3Database
|
||||||
properties:
|
properties:
|
||||||
connector: %$SQLite3Connector
|
connector: '%$SQLite3Connector'
|
||||||
schemaManager: %$SQLite3SchemaManager
|
schemaManager: '%$SQLite3SchemaManager'
|
||||||
queryBuilder: %$SQLite3QueryBuilder
|
queryBuilder: '%$SQLite3QueryBuilder'
|
||||||
SQLite3Connector:
|
SQLite3Connector:
|
||||||
class: SilverStripe\SQLite\SQLite3Connector
|
class: SilverStripe\SQLite\SQLite3Connector
|
||||||
type: prototype
|
type: prototype
|
||||||
|
|
|
@ -1,14 +1,25 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
// Script called from ConfigureFromEnv.php
|
// Called from DatabaseAdapterRegistry::autoconfigure($config)
|
||||||
global $databaseConfig;
|
use SilverStripe\Core\Environment;
|
||||||
if(strpos($databaseConfig['type'], 'SQLite') === 0) {
|
use SilverStripe\SQLite\SQLite3Database;
|
||||||
|
|
||||||
if(defined('SS_SQLITE_DATABASE_PATH')) {
|
if (!isset($databaseConfig)) {
|
||||||
$databaseConfig['path'] = SS_SQLITE_DATABASE_PATH;
|
global $databaseConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(defined('SS_SQLITE_DATABASE_KEY')) {
|
// Get path
|
||||||
$databaseConfig['key'] = SS_SQLITE_DATABASE_KEY;
|
$path = Environment::getEnv(SQLite3Database::ENV_PATH);
|
||||||
}
|
if ($path) {
|
||||||
|
$databaseConfig['path'] = $path;
|
||||||
|
} elseif (defined(SQLite3Database::ENV_PATH)) {
|
||||||
|
$databaseConfig['path'] = constant(SQLite3Database::ENV_PATH);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get key
|
||||||
|
$key = Environment::getEnv(SQLite3Database::ENV_KEY);
|
||||||
|
if ($key) {
|
||||||
|
$databaseConfig['key'] = $key;
|
||||||
|
} elseif (defined(SQLite3Database::ENV_KEY)) {
|
||||||
|
$databaseConfig['key'] = constant(SQLite3Database::ENV_KEY);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,51 +4,51 @@ use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
|
||||||
use SilverStripe\SQLite\SQLiteDatabaseConfigurationHelper;
|
use SilverStripe\SQLite\SQLiteDatabaseConfigurationHelper;
|
||||||
|
|
||||||
$sqliteDatabaseAdapterRegistryFields = array(
|
$sqliteDatabaseAdapterRegistryFields = array(
|
||||||
'path' => array(
|
'path' => array(
|
||||||
'title' => 'Directory path<br /><small>Absolute path to directory, writeable by the webserver user.<br />'
|
'title' => 'Directory path<br /><small>Absolute path to directory, writeable by the webserver user.<br />'
|
||||||
. 'Recommended to be outside of your webroot</small>',
|
. 'Recommended to be outside of your webroot</small>',
|
||||||
'default' => dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . '.sqlitedb'
|
'default' => dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . '.sqlitedb'
|
||||||
),
|
),
|
||||||
'database' => array(
|
'database' => array(
|
||||||
'title' => 'Database filename (extension .sqlite)',
|
'title' => 'Database filename (extension .sqlite)',
|
||||||
'default' => 'database.sqlite'
|
'default' => 'database.sqlite'
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
// Basic SQLLite3 Database
|
// Basic SQLLite3 Database
|
||||||
/** @skipUpgrade */
|
/** @skipUpgrade */
|
||||||
DatabaseAdapterRegistry::register(
|
DatabaseAdapterRegistry::register(
|
||||||
array(
|
array(
|
||||||
'class' => 'SQLite3Database',
|
'class' => 'SQLite3Database',
|
||||||
'module' => 'sqlite3',
|
'module' => 'sqlite3',
|
||||||
'title' => 'SQLite 3.3+ (using SQLite3)',
|
'title' => 'SQLite 3.3+ (using SQLite3)',
|
||||||
'helperPath' => __DIR__.'/code/SQLiteDatabaseConfigurationHelper.php',
|
'helperPath' => __DIR__.'/code/SQLiteDatabaseConfigurationHelper.php',
|
||||||
'helperClass' => SQLiteDatabaseConfigurationHelper::class,
|
'helperClass' => SQLiteDatabaseConfigurationHelper::class,
|
||||||
'supported' => class_exists('SQLite3'),
|
'supported' => class_exists('SQLite3'),
|
||||||
'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a>
|
'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a>
|
||||||
PHP Extension is not available. Please install or enable it of them and refresh this page.',
|
PHP Extension is not available. Please install or enable it of them and refresh this page.',
|
||||||
'fields' => array_merge($sqliteDatabaseAdapterRegistryFields, array('key' => array(
|
'fields' => array_merge($sqliteDatabaseAdapterRegistryFields, array('key' => array(
|
||||||
'title' => 'Encryption key<br><small>This function is experimental and requires configuration of an '
|
'title' => 'Encryption key<br><small>This function is experimental and requires configuration of an '
|
||||||
. 'encryption module</small>',
|
. 'encryption module</small>',
|
||||||
'default' => ''
|
'default' => ''
|
||||||
)))
|
)))
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
// PDO database
|
// PDO database
|
||||||
/** @skipUpgrade */
|
/** @skipUpgrade */
|
||||||
DatabaseAdapterRegistry::register(
|
DatabaseAdapterRegistry::register(
|
||||||
array(
|
array(
|
||||||
'class' => 'SQLite3PDODatabase',
|
'class' => 'SQLite3PDODatabase',
|
||||||
'module' => 'sqlite3',
|
'module' => 'sqlite3',
|
||||||
'title' => 'SQLite 3.3+ (using PDO)',
|
'title' => 'SQLite 3.3+ (using PDO)',
|
||||||
'helperPath' => __DIR__.'/code/SQLiteDatabaseConfigurationHelper.php',
|
'helperPath' => __DIR__.'/code/SQLiteDatabaseConfigurationHelper.php',
|
||||||
'helperClass' => SQLiteDatabaseConfigurationHelper::class,
|
'helperClass' => SQLiteDatabaseConfigurationHelper::class,
|
||||||
'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())),
|
'supported' => (class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers())),
|
||||||
'missingExtensionText' =>
|
'missingExtensionText' =>
|
||||||
'Either the <a href="http://php.net/manual/en/book.pdo.php">PDO Extension</a> or the
|
'Either the <a href="http://php.net/manual/en/book.pdo.php">PDO Extension</a> or the
|
||||||
<a href="http://php.net/manual/en/book.sqlite3.php">SQLite3 PDO Driver</a>
|
<a href="http://php.net/manual/en/book.sqlite3.php">SQLite3 PDO Driver</a>
|
||||||
are unavailable. Please install or enable these and refresh this page.',
|
are unavailable. Please install or enable these and refresh this page.',
|
||||||
'fields' => $sqliteDatabaseAdapterRegistryFields
|
'fields' => $sqliteDatabaseAdapterRegistryFields
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
|
@ -111,7 +111,7 @@ class SQLite3Connector extends DBConnector
|
||||||
case 'array':
|
case 'array':
|
||||||
case 'unknown type':
|
case 'unknown type':
|
||||||
default:
|
default:
|
||||||
user_error("Cannot bind parameter \"$value\" as it is an unsupported type ($phpType)", E_USER_ERROR);
|
$this->databaseError("Cannot bind parameter \"$value\" as it is an unsupported type ($phpType)");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$values[] = array(
|
$values[] = array(
|
||||||
|
@ -170,13 +170,13 @@ class SQLite3Connector extends DBConnector
|
||||||
|
|
||||||
public function escapeString($value)
|
public function escapeString($value)
|
||||||
{
|
{
|
||||||
return $this->dbConn->escapeString($value);
|
return $this->dbConn->escapeString($value ?? '');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function selectDatabase($name)
|
public function selectDatabase($name)
|
||||||
{
|
{
|
||||||
if ($name !== $this->databaseName) {
|
if ($name !== $this->databaseName) {
|
||||||
user_error("SQLite3Connector can't change databases. Please create a new database connection", E_USER_ERROR);
|
$this->databaseError("SQLite3Connector can't change databases. Please create a new database connection");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,16 @@ class SQLite3Database extends Database
|
||||||
{
|
{
|
||||||
use Configurable;
|
use Configurable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Global environment config for setting 'path'
|
||||||
|
*/
|
||||||
|
const ENV_PATH = 'SS_SQLITE_DATABASE_PATH';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Global environment config for setting 'key'
|
||||||
|
*/
|
||||||
|
const ENV_KEY = 'SS_SQLITE_DATABASE_KEY';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extension added to every database name
|
* Extension added to every database name
|
||||||
*
|
*
|
||||||
|
@ -50,6 +60,16 @@ class SQLite3Database extends Database
|
||||||
*/
|
*/
|
||||||
protected $livesInMemory = false;
|
protected $livesInMemory = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var bool
|
||||||
|
*/
|
||||||
|
protected $transactionNesting = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $transactionSavepoints = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of default pragma values
|
* List of default pragma values
|
||||||
*
|
*
|
||||||
|
@ -178,7 +198,8 @@ class SQLite3Database extends Database
|
||||||
*
|
*
|
||||||
* @return string|null
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
public function getPath() {
|
public function getPath()
|
||||||
|
{
|
||||||
if ($this->getLivesInMemory()) {
|
if ($this->getLivesInMemory()) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -278,14 +299,24 @@ class SQLite3Database extends Database
|
||||||
* @param bool $invertedMatch
|
* @param bool $invertedMatch
|
||||||
* @return PaginatedList DataObjectSet of result pages
|
* @return PaginatedList DataObjectSet of result pages
|
||||||
*/
|
*/
|
||||||
public function searchEngine($classesToSearch, $keywords, $start, $pageLength, $sortBy = "Relevance DESC",
|
public function searchEngine(
|
||||||
$extraFilter = "", $booleanSearch = false, $alternativeFileFilter = "", $invertedMatch = false
|
$classesToSearch,
|
||||||
|
$keywords,
|
||||||
|
$start,
|
||||||
|
$pageLength,
|
||||||
|
$sortBy = "Relevance DESC",
|
||||||
|
$extraFilter = "",
|
||||||
|
$booleanSearch = false,
|
||||||
|
$alternativeFileFilter = "",
|
||||||
|
$invertedMatch = false
|
||||||
) {
|
) {
|
||||||
|
$start = (int)$start;
|
||||||
|
$pageLength = (int)$pageLength;
|
||||||
$keywords = $this->escapeString(str_replace(array('*', '+', '-', '"', '\''), '', $keywords));
|
$keywords = $this->escapeString(str_replace(array('*', '+', '-', '"', '\''), '', $keywords));
|
||||||
$htmlEntityKeywords = htmlentities(utf8_decode($keywords));
|
$htmlEntityKeywords = htmlentities(utf8_decode($keywords));
|
||||||
|
|
||||||
$pageClass = 'SilverStripe\\CMS\\Model\\SiteTree';
|
$pageClass = 'SilverStripe\\CMS\\Model\\SiteTree';
|
||||||
$fileClass = 'SilverStripe\\Assets\\File';
|
$fileClass = 'SilverStripe\\Assets\\File';
|
||||||
|
|
||||||
$extraFilters = array($pageClass => '', $fileClass => '');
|
$extraFilters = array($pageClass => '', $fileClass => '');
|
||||||
|
|
||||||
|
@ -307,21 +338,28 @@ class SQLite3Database extends Database
|
||||||
$extraFilters[$fileClass] .= " AND ShowInSearch <> 0";
|
$extraFilters[$fileClass] .= " AND ShowInSearch <> 0";
|
||||||
}
|
}
|
||||||
|
|
||||||
$limit = $start . ", " . (int) $pageLength;
|
$limit = $start . ", " . $pageLength;
|
||||||
|
|
||||||
$notMatch = $invertedMatch ? "NOT " : "";
|
$notMatch = $invertedMatch ? "NOT " : "";
|
||||||
if ($keywords) {
|
if ($keywords) {
|
||||||
$match[$pageClass] = "
|
$match[$pageClass] =
|
||||||
(Title LIKE '%$keywords%' OR MenuTitle LIKE '%$keywords%' OR Content LIKE '%$keywords%' OR MetaDescription LIKE '%$keywords%' OR
|
"(Title LIKE '%$keywords%' OR MenuTitle LIKE '%$keywords%' OR Content LIKE '%$keywords%'"
|
||||||
Title LIKE '%$htmlEntityKeywords%' OR MenuTitle LIKE '%$htmlEntityKeywords%' OR Content LIKE '%$htmlEntityKeywords%' OR MetaDescription LIKE '%$htmlEntityKeywords%')
|
. " OR MetaDescription LIKE '%$keywords%' OR Title LIKE '%$htmlEntityKeywords%'"
|
||||||
";
|
. " OR MenuTitle LIKE '%$htmlEntityKeywords%' OR Content LIKE '%$htmlEntityKeywords%'"
|
||||||
|
. " OR MetaDescription LIKE '%$htmlEntityKeywords%')";
|
||||||
$fileClassSQL = Convert::raw2sql($fileClass);
|
$fileClassSQL = Convert::raw2sql($fileClass);
|
||||||
$match[$fileClass] = "(Name LIKE '%$keywords%' OR Title LIKE '%$keywords%') AND ClassName = '$fileClassSQL'";
|
$match[$fileClass] =
|
||||||
|
"(Name LIKE '%$keywords%' OR Title LIKE '%$keywords%') AND ClassName = '$fileClassSQL'";
|
||||||
|
|
||||||
// We make the relevance search by converting a boolean mode search into a normal one
|
// We make the relevance search by converting a boolean mode search into a normal one
|
||||||
$relevanceKeywords = $keywords;
|
$relevanceKeywords = $keywords;
|
||||||
$htmlEntityRelevanceKeywords = $htmlEntityKeywords;
|
$htmlEntityRelevanceKeywords = $htmlEntityKeywords;
|
||||||
$relevance[$pageClass] = "(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 MetaDescription LIKE '%$htmlEntityRelevanceKeywords%')";
|
$relevance[$pageClass] =
|
||||||
|
"(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 MetaDescription "
|
||||||
|
. " LIKE '%$htmlEntityRelevanceKeywords%')";
|
||||||
$relevance[$fileClass] = "(Name LIKE '%$relevanceKeywords%' OR Title LIKE '%$relevanceKeywords%')";
|
$relevance[$fileClass] = "(Name LIKE '%$relevanceKeywords%' OR Title LIKE '%$relevanceKeywords%')";
|
||||||
} else {
|
} else {
|
||||||
$relevance[$pageClass] = $relevance[$fileClass] = 1;
|
$relevance[$pageClass] = $relevance[$fileClass] = 1;
|
||||||
|
@ -373,7 +411,7 @@ class SQLite3Database extends Database
|
||||||
$queries[$class]->setFrom('"'.DataObject::getSchema()->baseDataTable($class).'"');
|
$queries[$class]->setFrom('"'.DataObject::getSchema()->baseDataTable($class).'"');
|
||||||
$queries[$class]->setSelect(array());
|
$queries[$class]->setSelect(array());
|
||||||
foreach ($select[$class] as $clause) {
|
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]);
|
$queries[$class]->selectField($matches[1], $matches[2]);
|
||||||
} else {
|
} else {
|
||||||
$queries[$class]->selectField(str_replace('"', '', $clause));
|
$queries[$class]->selectField(str_replace('"', '', $clause));
|
||||||
|
@ -422,6 +460,19 @@ class SQLite3Database extends Database
|
||||||
return version_compare($this->getVersion(), '3.6', '>=');
|
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'))
|
public function supportsExtensions($extensions = array('partitions', 'tablespaces', 'clustering'))
|
||||||
{
|
{
|
||||||
if (isset($extensions['partitions'])) {
|
if (isset($extensions['partitions'])) {
|
||||||
|
@ -437,26 +488,148 @@ class SQLite3Database extends Database
|
||||||
|
|
||||||
public function transactionStart($transaction_mode = false, $session_characteristics = false)
|
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)
|
public function transactionSavepoint($savepoint)
|
||||||
{
|
{
|
||||||
$this->query("SAVEPOINT \"$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)
|
public function transactionRollback($savepoint = false)
|
||||||
{
|
{
|
||||||
|
// Named transaction
|
||||||
if ($savepoint) {
|
if ($savepoint) {
|
||||||
$this->query("ROLLBACK TO $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 {
|
} else {
|
||||||
$this->query('ROLLBACK;');
|
$this->query('ROLLBACK;');
|
||||||
|
$this->transactionDepthDecrease();
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function transactionDepth()
|
||||||
|
{
|
||||||
|
return $this->transactionNesting;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactionEnd($chain = false)
|
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)
|
public function clearTable($table)
|
||||||
|
@ -464,7 +637,12 @@ class SQLite3Database extends Database
|
||||||
$this->query("DELETE FROM \"$table\"");
|
$this->query("DELETE FROM \"$table\"");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function comparisonClause($field, $value, $exact = false, $negate = false, $caseSensitive = null,
|
public function comparisonClause(
|
||||||
|
$field,
|
||||||
|
$value,
|
||||||
|
$exact = false,
|
||||||
|
$negate = false,
|
||||||
|
$caseSensitive = null,
|
||||||
$parameterised = false
|
$parameterised = false
|
||||||
) {
|
) {
|
||||||
if ($exact && !$caseSensitive) {
|
if ($exact && !$caseSensitive) {
|
||||||
|
@ -494,7 +672,7 @@ class SQLite3Database extends Database
|
||||||
|
|
||||||
public function formattedDatetimeClause($date, $format)
|
public function formattedDatetimeClause($date, $format)
|
||||||
{
|
{
|
||||||
preg_match_all('/%(.)/', $format, $matches);
|
preg_match_all('/%(.)/', $format ?? '', $matches);
|
||||||
foreach ($matches[1] as $match) {
|
foreach ($matches[1] as $match) {
|
||||||
if (array_search($match, array('Y', 'm', 'd', 'H', 'i', 's', 'U')) === false) {
|
if (array_search($match, array('Y', 'm', 'd', 'H', 'i', 's', 'U')) === false) {
|
||||||
user_error('formattedDatetimeClause(): unsupported format character %' . $match, E_USER_WARNING);
|
user_error('formattedDatetimeClause(): unsupported format character %' . $match, E_USER_WARNING);
|
||||||
|
@ -516,9 +694,9 @@ class SQLite3Database extends Database
|
||||||
$modifiers[] = 'localtime';
|
$modifiers[] = 'localtime';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (preg_match('/^now$/i', $date)) {
|
if (preg_match('/^now$/i', $date ?? '')) {
|
||||||
$date = "'now'";
|
$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'";
|
$date = "'$date'";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -533,9 +711,9 @@ class SQLite3Database extends Database
|
||||||
$modifiers[] = 'localtime';
|
$modifiers[] = 'localtime';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (preg_match('/^now$/i', $date)) {
|
if (preg_match('/^now$/i', $date ?? '')) {
|
||||||
$date = "'now'";
|
$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'";
|
$date = "'$date'";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -555,15 +733,15 @@ class SQLite3Database extends Database
|
||||||
$modifiers2[] = 'localtime';
|
$modifiers2[] = 'localtime';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (preg_match('/^now$/i', $date1)) {
|
if (preg_match('/^now$/i', $date1 ?? '')) {
|
||||||
$date1 = "'now'";
|
$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'";
|
$date1 = "'$date1'";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (preg_match('/^now$/i', $date2)) {
|
if (preg_match('/^now$/i', $date2 ?? '')) {
|
||||||
$date2 = "'now'";
|
$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'";
|
$date2 = "'$date2'";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,10 +47,10 @@ class SQLite3Query extends Query
|
||||||
{
|
{
|
||||||
$this->handle->reset();
|
$this->handle->reset();
|
||||||
$i=0;
|
$i=0;
|
||||||
while ($i < $row && $row = @$this->handle->fetchArray()) {
|
while ($i <= $row && $result = @$this->handle->fetchArray(SQLITE3_ASSOC)) {
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
return true;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -58,6 +58,12 @@ class SQLite3Query extends Query
|
||||||
*/
|
*/
|
||||||
public function numRecords()
|
public function numRecords()
|
||||||
{
|
{
|
||||||
|
// Some queries are not iterable using fetchArray like CREATE statement
|
||||||
|
if (!$this->handle->numColumns()) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->handle->reset();
|
||||||
$c=0;
|
$c=0;
|
||||||
while ($this->handle->fetchArray()) {
|
while ($this->handle->fetchArray()) {
|
||||||
$c++;
|
$c++;
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
namespace SilverStripe\SQLite;
|
namespace SilverStripe\SQLite;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
use SilverStripe\Control\Director;
|
use SilverStripe\Control\Director;
|
||||||
use SilverStripe\Dev\Debug;
|
use SilverStripe\Dev\Debug;
|
||||||
use SilverStripe\Dev\SapphireTest;
|
|
||||||
use SilverStripe\ORM\Connect\DBSchemaManager;
|
use SilverStripe\ORM\Connect\DBSchemaManager;
|
||||||
use Exception;
|
use SQLite3;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SQLite schema manager class
|
* SQLite schema manager class
|
||||||
|
@ -74,7 +74,6 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
$databases = array();
|
$databases = array();
|
||||||
if ($files !== false) {
|
if ($files !== false) {
|
||||||
foreach ($files as $file) {
|
foreach ($files as $file) {
|
||||||
|
|
||||||
// Filter non-files
|
// Filter non-files
|
||||||
if (!is_file("$directory/$file")) {
|
if (!is_file("$directory/$file")) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -173,8 +172,14 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
return $table;
|
return $table;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function alterTable($tableName, $newFields = null, $newIndexes = null, $alteredFields = null,
|
public function alterTable(
|
||||||
$alteredIndexes = null, $alteredOptions = null, $advancedOptions = null
|
$tableName,
|
||||||
|
$newFields = null,
|
||||||
|
$newIndexes = null,
|
||||||
|
$alteredFields = null,
|
||||||
|
$alteredIndexes = null,
|
||||||
|
$alteredOptions = null,
|
||||||
|
$advancedOptions = null
|
||||||
) {
|
) {
|
||||||
if ($newFields) {
|
if ($newFields) {
|
||||||
foreach ($newFields as $fieldName => $fieldSpec) {
|
foreach ($newFields as $fieldName => $fieldSpec) {
|
||||||
|
@ -210,7 +215,7 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
{
|
{
|
||||||
$ok = true;
|
$ok = true;
|
||||||
|
|
||||||
if (!SapphireTest::using_temp_db() && !self::$checked_and_repaired) {
|
if (!self::$checked_and_repaired) {
|
||||||
$this->alterationMessage("Checking database integrity", "repaired");
|
$this->alterationMessage("Checking database integrity", "repaired");
|
||||||
|
|
||||||
// Check for any tables with failed integrity
|
// Check for any tables with failed integrity
|
||||||
|
@ -227,7 +232,7 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
if (self::$vacuum) {
|
if (self::$vacuum) {
|
||||||
$this->query('VACUUM', E_USER_NOTICE);
|
$this->query('VACUUM', E_USER_NOTICE);
|
||||||
$message = $this->database->getConnector()->getLastError();
|
$message = $this->database->getConnector()->getLastError();
|
||||||
if (preg_match('/authoriz/', $message)) {
|
if (preg_match('/authoriz/', $message ?? '')) {
|
||||||
$this->alterationMessage("VACUUM | $message", "error");
|
$this->alterationMessage("VACUUM | $message", "error");
|
||||||
} else {
|
} else {
|
||||||
$this->alterationMessage("VACUUMing", "repaired");
|
$this->alterationMessage("VACUUMing", "repaired");
|
||||||
|
@ -271,21 +276,22 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
}
|
}
|
||||||
|
|
||||||
$queries = array(
|
$queries = array(
|
||||||
"BEGIN TRANSACTION",
|
|
||||||
"CREATE TABLE \"{$tableName}_alterfield_{$fieldName}\"(" . implode(',', $newColsSpec) . ")",
|
"CREATE TABLE \"{$tableName}_alterfield_{$fieldName}\"(" . implode(',', $newColsSpec) . ")",
|
||||||
"INSERT INTO \"{$tableName}_alterfield_{$fieldName}\" SELECT {$fieldNameList} FROM \"$tableName\"",
|
"INSERT INTO \"{$tableName}_alterfield_{$fieldName}\" SELECT {$fieldNameList} FROM \"$tableName\"",
|
||||||
"DROP TABLE \"$tableName\"",
|
"DROP TABLE \"$tableName\"",
|
||||||
"ALTER TABLE \"{$tableName}_alterfield_{$fieldName}\" RENAME TO \"$tableName\"",
|
"ALTER TABLE \"{$tableName}_alterfield_{$fieldName}\" RENAME TO \"$tableName\"",
|
||||||
"COMMIT"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// Remember original indexes
|
// Remember original indexes
|
||||||
$indexList = $this->indexList($tableName);
|
$indexList = $this->indexList($tableName);
|
||||||
|
|
||||||
// Then alter the table column
|
// Then alter the table column
|
||||||
foreach ($queries as $query) {
|
$database = $this->database;
|
||||||
$this->query($query.';');
|
$database->withTransaction(function () use ($database, $queries, $indexList) {
|
||||||
}
|
foreach ($queries as $query) {
|
||||||
|
$database->query($query . ';');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Recreate the indexes
|
// Recreate the indexes
|
||||||
foreach ($indexList as $indexName => $indexSpec) {
|
foreach ($indexList as $indexName => $indexSpec) {
|
||||||
|
@ -311,28 +317,46 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
}
|
}
|
||||||
|
|
||||||
// SQLite doesn't support direct renames through ALTER TABLE
|
// SQLite doesn't support direct renames through ALTER TABLE
|
||||||
|
$oldColsStr = implode(',', $oldCols);
|
||||||
|
$newColsSpecStr = implode(',', $newColsSpec);
|
||||||
$queries = array(
|
$queries = array(
|
||||||
"BEGIN TRANSACTION",
|
"CREATE TABLE \"{$tableName}_renamefield_{$oldName}\" ({$newColsSpecStr})",
|
||||||
"CREATE TABLE \"{$tableName}_renamefield_{$oldName}\" (" . implode(',', $newColsSpec) . ")",
|
"INSERT INTO \"{$tableName}_renamefield_{$oldName}\" SELECT {$oldColsStr} FROM \"$tableName\"",
|
||||||
"INSERT INTO \"{$tableName}_renamefield_{$oldName}\" SELECT " . implode(',', $oldCols) . " FROM \"$tableName\"",
|
|
||||||
"DROP TABLE \"$tableName\"",
|
"DROP TABLE \"$tableName\"",
|
||||||
"ALTER TABLE \"{$tableName}_renamefield_{$oldName}\" RENAME TO \"$tableName\"",
|
"ALTER TABLE \"{$tableName}_renamefield_{$oldName}\" RENAME TO \"$tableName\"",
|
||||||
"COMMIT"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// Remember original indexes
|
// Remember original indexes
|
||||||
$oldIndexList = $this->indexList($tableName);
|
$oldIndexList = $this->indexList($tableName);
|
||||||
|
|
||||||
// Then alter the table column
|
// Then alter the table column
|
||||||
foreach ($queries as $query) {
|
$database = $this->database;
|
||||||
$this->query($query.';');
|
$database->withTransaction(function () use ($database, $queries) {
|
||||||
}
|
foreach ($queries as $query) {
|
||||||
|
$database->query($query . ';');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Recreate the indexes
|
// Recreate the indexes
|
||||||
foreach ($oldIndexList as $indexName => $indexSpec) {
|
foreach ($oldIndexList as $indexName => $indexSpec) {
|
||||||
// Rename columns to new columns
|
// Map index columns
|
||||||
$indexSpec['value'] = preg_replace("/\"$oldName\"/i", "\"$newName\"", $indexSpec['value']);
|
$columns = array_filter(array_map(function ($column) use ($newName, $oldName) {
|
||||||
$this->createIndex($tableName, $indexName, $indexSpec);
|
// Unchanged
|
||||||
|
if ($column !== $oldName) {
|
||||||
|
return $column;
|
||||||
|
}
|
||||||
|
// Skip obsolete fields
|
||||||
|
if (stripos($newName, '_obsolete_') === 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return $newName;
|
||||||
|
}, $indexSpec['columns']));
|
||||||
|
|
||||||
|
// Create index if column count unchanged
|
||||||
|
if (count($columns) === count($indexSpec['columns'])) {
|
||||||
|
$indexSpec['columns'] = $columns;
|
||||||
|
$this->createIndex($tableName, $indexName, $indexSpec);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -345,8 +369,10 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
|
|
||||||
$fieldList = array();
|
$fieldList = array();
|
||||||
if ($sqlCreate && $sqlCreate['sql']) {
|
if ($sqlCreate && $sqlCreate['sql']) {
|
||||||
preg_match('/^[\s]*CREATE[\s]+TABLE[\s]+[\'"]?[a-zA-Z0-9_\\\]+[\'"]?[\s]*\((.+)\)[\s]*$/ims',
|
preg_match(
|
||||||
$sqlCreate['sql'], $matches
|
'/^[\s]*CREATE[\s]+TABLE[\s]+[\'"]?[a-zA-Z0-9_\\\]+[\'"]?[\s]*\((.+)\)[\s]*$/ims',
|
||||||
|
$sqlCreate['sql'] ?? '',
|
||||||
|
$matches
|
||||||
);
|
);
|
||||||
$fields = isset($matches[1])
|
$fields = isset($matches[1])
|
||||||
? preg_split('/,(?=(?:[^\'"]*$)|(?:[^\'"]*[\'"][^\'"]*[\'"][^\'"]*)*$)/x', $matches[1])
|
? preg_split('/,(?=(?:[^\'"]*$)|(?:[^\'"]*[\'"][^\'"]*[\'"][^\'"]*)*$)/x', $matches[1])
|
||||||
|
@ -370,10 +396,9 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
*/
|
*/
|
||||||
public function createIndex($tableName, $indexName, $indexSpec)
|
public function createIndex($tableName, $indexName, $indexSpec)
|
||||||
{
|
{
|
||||||
$parsedSpec = $this->parseIndexSpec($indexName, $indexSpec);
|
|
||||||
$sqliteName = $this->buildSQLiteIndexName($tableName, $indexName);
|
$sqliteName = $this->buildSQLiteIndexName($tableName, $indexName);
|
||||||
$columns = $parsedSpec['value'];
|
$columns = $this->implodeColumnList($indexSpec['columns']);
|
||||||
$unique = ($parsedSpec['type'] == 'unique') ? 'UNIQUE' : '';
|
$unique = ($indexSpec['type'] == 'unique') ? 'UNIQUE' : '';
|
||||||
$this->query("CREATE $unique INDEX IF NOT EXISTS \"$sqliteName\" ON \"$tableName\" ($columns)");
|
$this->query("CREATE $unique INDEX IF NOT EXISTS \"$sqliteName\" ON \"$tableName\" ($columns)");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -402,30 +427,26 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
return "{$tableName}_{$indexName}";
|
return "{$tableName}_{$indexName}";
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function parseIndexSpec($name, $spec)
|
|
||||||
{
|
|
||||||
$spec = parent::parseIndexSpec($name, $spec);
|
|
||||||
|
|
||||||
// Only allow index / unique index types
|
|
||||||
if (!in_array($spec['type'], array('index', 'unique'))) {
|
|
||||||
$spec['type'] = 'index';
|
|
||||||
}
|
|
||||||
|
|
||||||
return $spec;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function indexKey($table, $index, $spec)
|
public function indexKey($table, $index, $spec)
|
||||||
{
|
{
|
||||||
return $this->buildSQLiteIndexName($table, $index);
|
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)
|
public function indexList($table)
|
||||||
{
|
{
|
||||||
$indexList = array();
|
$indexList = array();
|
||||||
|
|
||||||
// Enumerate each index and related fields
|
// Enumerate each index and related fields
|
||||||
foreach ($this->query("PRAGMA index_list(\"$table\")") as $index) {
|
foreach ($this->query("PRAGMA index_list(\"$table\")") as $index) {
|
||||||
|
|
||||||
// The SQLite internal index name, not the actual Silverstripe name
|
// The SQLite internal index name, not the actual Silverstripe name
|
||||||
$indexName = $index["name"];
|
$indexName = $index["name"];
|
||||||
$indexType = $index['unique'] ? 'unique' : 'index';
|
$indexType = $index['unique'] ? 'unique' : 'index';
|
||||||
|
@ -437,11 +458,11 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
}
|
}
|
||||||
|
|
||||||
// Safely encode this spec
|
// Safely encode this spec
|
||||||
$indexList[$indexName] = $this->parseIndexSpec($indexName, array(
|
$indexList[$indexName] = array(
|
||||||
'name' => $indexName,
|
'name' => $indexName,
|
||||||
'value' => $this->implodeColumnList($list),
|
'columns' => $list,
|
||||||
'type' => $indexType
|
'type' => $indexType,
|
||||||
));
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $indexList;
|
return $indexList;
|
||||||
|
@ -515,7 +536,9 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
|
|
||||||
// Ensure the cache table exists
|
// Ensure the cache table exists
|
||||||
if (empty($this->enum_map)) {
|
if (empty($this->enum_map)) {
|
||||||
$this->query("CREATE TABLE IF NOT EXISTS \"SQLiteEnums\" (\"TableColumn\" TEXT PRIMARY KEY, \"EnumList\" TEXT)");
|
$this->query(
|
||||||
|
"CREATE TABLE IF NOT EXISTS \"SQLiteEnums\" (\"TableColumn\" TEXT PRIMARY KEY, \"EnumList\" TEXT)"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure the table row exists
|
// Ensure the table row exists
|
||||||
|
@ -529,7 +552,18 @@ class SQLite3SchemaManager extends DBSchemaManager
|
||||||
|
|
||||||
// Set default
|
// Set default
|
||||||
if (!empty($values['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'";
|
return "TEXT DEFAULT '$default'";
|
||||||
} else {
|
} else {
|
||||||
return 'TEXT';
|
return 'TEXT';
|
||||||
|
|
|
@ -41,7 +41,11 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper
|
||||||
if (empty($databaseConfig['key'])) {
|
if (empty($databaseConfig['key'])) {
|
||||||
$conn = @new SQLite3($file, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE);
|
$conn = @new SQLite3($file, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE);
|
||||||
} else {
|
} else {
|
||||||
$conn = @new SQLite3($file, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $databaseConfig['key']);
|
$conn = @new SQLite3(
|
||||||
|
$file,
|
||||||
|
SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE,
|
||||||
|
$databaseConfig['key']
|
||||||
|
);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'SQLite3PDODatabase':
|
case 'SQLite3PDODatabase':
|
||||||
|
@ -106,15 +110,15 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper
|
||||||
// Do additional validation around file paths
|
// Do additional validation around file paths
|
||||||
if (empty($databaseConfig['path'])) {
|
if (empty($databaseConfig['path'])) {
|
||||||
return array(
|
return array(
|
||||||
'success' => false,
|
'success' => false,
|
||||||
'error' => "Missing directory path"
|
'error' => "Missing directory path"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (empty($databaseConfig['database'])) {
|
if (empty($databaseConfig['database'])) {
|
||||||
return array(
|
return array(
|
||||||
'success' => false,
|
'success' => false,
|
||||||
'error' => "Missing database filename"
|
'error' => "Missing database filename"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create and secure db directory
|
// Create and secure db directory
|
||||||
|
@ -122,16 +126,16 @@ class SQLiteDatabaseConfigurationHelper implements DatabaseConfigurationHelper
|
||||||
$dirCreated = self::create_db_dir($path);
|
$dirCreated = self::create_db_dir($path);
|
||||||
if (!$dirCreated) {
|
if (!$dirCreated) {
|
||||||
return array(
|
return array(
|
||||||
'success' => false,
|
'success' => false,
|
||||||
'error' => sprintf('Cannot create path: "%s"', $path)
|
'error' => sprintf('Cannot create path: "%s"', $path)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$dirSecured = self::secure_db_dir($path);
|
$dirSecured = self::secure_db_dir($path);
|
||||||
if (!$dirSecured) {
|
if (!$dirSecured) {
|
||||||
return array(
|
return array(
|
||||||
'success' => false,
|
'success' => false,
|
||||||
'error' => sprintf('Cannot secure path through .htaccess: "%s"', $path)
|
'error' => sprintf('Cannot secure path through .htaccess: "%s"', $path)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$conn = $this->createConnection($databaseConfig, $error);
|
$conn = $this->createConnection($databaseConfig, $error);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "silverstripe/sqlite3",
|
"name": "silverstripe/sqlite3",
|
||||||
"description": "Adds SQLite3 support to SilverStripe",
|
"description": "Adds SQLite3 support to SilverStripe",
|
||||||
"type": "silverstripe-module",
|
"type": "silverstripe-vendormodule",
|
||||||
"keywords": ["silverstripe", "sqlite3", "database"],
|
"keywords": ["silverstripe", "sqlite3", "database"],
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
@ -14,21 +14,21 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"silverstripe/framework": "~4.0"
|
"silverstripe/framework": "~4.0",
|
||||||
|
"silverstripe/vendor-plugin": "^1.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "~4.8"
|
"squizlabs/php_codesniffer": "^3"
|
||||||
},
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "2.0.x-dev"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"SilverStripe\\SQLite\\": "code/"
|
"SilverStripe\\SQLite\\": "code/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"scripts": {
|
||||||
|
"lint": "phpcs code/ *.php",
|
||||||
|
"lint-clean": "phpcbf code/ *.php"
|
||||||
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"prefer-stable": true
|
"prefer-stable": true
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ruleset name="SilverStripe">
|
||||||
|
<description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
|
||||||
|
|
||||||
|
<file>code</file>
|
||||||
|
|
||||||
|
<!-- base rules are PSR-2 -->
|
||||||
|
<rule ref="PSR2" >
|
||||||
|
<!-- Current exclusions -->
|
||||||
|
<exclude name="PSR1.Methods.CamelCapsMethodName" />
|
||||||
|
</rule>
|
||||||
|
</ruleset>
|
Loading…
Reference in New Issue