performance improvement
This commit is contained in:
Maurits van der Schee
parent
4f5380e581
commit
a95d699246
2 changed files with 10 additions and 56 deletions
63
api.php
63
api.php
|
|
@ -6091,51 +6091,6 @@ namespace Tqdev\PhpCrudApi\Database {
|
|||
$this->typeConverter = new TypeConverter($driver);
|
||||
}
|
||||
|
||||
private function updateSqlLiteReflectionTables() /*: void */
|
||||
{
|
||||
$reflection = $this->query('SELECT "name" FROM "sqlite_master" WHERE "type" = \'table\' and name like \'sys/%\';', []);
|
||||
if (count($reflection) == 0) {
|
||||
//create reflection tables
|
||||
$this->query('CREATE table "sys/version" ("version" integer);', []);
|
||||
$this->query('CREATE table "sys/tables" ("name" text, "type" text);', []);
|
||||
$this->query('CREATE table "sys/columns" ("self" text,"cid" integer,"name" text,"type" integer,"notnull" integer,"dflt_value" integer,"pk" integer);', []);
|
||||
$this->query('CREATE table "sys/foreign_keys" ("self" text,"id" integer,"seq" integer,"table" text,"from" text,"to" text,"on_update" text,"on_delete" text,"match" text);', []);
|
||||
}
|
||||
$version = $this->query('pragma schema_version;', [])[0]["schema_version"];
|
||||
$current = $this->query('SELECT "version" from "sys/version";', []);
|
||||
if (!$current || count($current) == 0 || !isset($current[0]["schema_version"]) || $version != $current[0]["schema_version"]) {
|
||||
// reflection may take a while
|
||||
set_time_limit(3600);
|
||||
// update version data
|
||||
$this->query('DELETE FROM "sys/version";', []);
|
||||
$this->query('INSERT into "sys/version" ("version") VALUES (?);', [$version]);
|
||||
|
||||
// update tables data
|
||||
$this->query('DELETE FROM "sys/tables";', []);
|
||||
$result = $this->query('SELECT "name", "type" FROM sqlite_master WHERE ("type" = \'table\' or "type" = \'view\') and name not like "sys/%" and name<>"sqlite_sequence";', []);
|
||||
$tables = array();
|
||||
foreach ($result as $row) {
|
||||
$tables[] = $row['name'];
|
||||
$this->query('INSERT into "sys/tables" ("name", "type") VALUES (?, ?);', [$row['name'], $row['type']]);
|
||||
}
|
||||
// update columns and foreign_keys data
|
||||
$this->query('DELETE FROM "sys/columns";', []);
|
||||
$this->query('DELETE FROM "sys/foreign_keys";', []);
|
||||
foreach ($tables as $table) {
|
||||
$result = $this->query("pragma table_info(`$table`);", []);
|
||||
foreach ($result as $row) {
|
||||
array_unshift($row, $table);
|
||||
$this->query('INSERT into "sys/columns" ("self","cid","name","type","notnull","dflt_value","pk") VALUES (?,?,?,?,?,?,?);', array_values($row));
|
||||
}
|
||||
$result = $this->query("pragma foreign_key_list(`$table`);", []);
|
||||
foreach ($result as $row) {
|
||||
array_unshift($row, $table);
|
||||
$this->query('INSERT into "sys/foreign_keys" ("self","id","seq","table","from","to","on_update","on_delete","match") VALUES (?,?,?,?,?,?,?,?,?);', array_values($row));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function getIgnoredTables(): array
|
||||
{
|
||||
switch ($this->driver) {
|
||||
|
|
@ -6146,7 +6101,7 @@ namespace Tqdev\PhpCrudApi\Database {
|
|||
case 'sqlsrv':
|
||||
return [];
|
||||
case 'sqlite':
|
||||
return ['sys/version', 'sys/tables', 'sys/columns', 'sys/foreign_keys'];
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6160,8 +6115,7 @@ namespace Tqdev\PhpCrudApi\Database {
|
|||
case 'sqlsrv':
|
||||
return 'SELECT o.name as "TABLE_NAME", o.xtype as "TABLE_TYPE" FROM sysobjects o WHERE o.xtype IN (\'U\', \'V\') ORDER BY "TABLE_NAME"';
|
||||
case 'sqlite':
|
||||
$this->updateSqlLiteReflectionTables();
|
||||
return 'SELECT t.name as "TABLE_NAME", t.type as "TABLE_TYPE" FROM "sys/tables" t WHERE t.type IN (\'table\', \'view\') AND \'\' <> ? ORDER BY "TABLE_NAME"';
|
||||
return 'SELECT t.name as "TABLE_NAME", t.type as "TABLE_TYPE" FROM sqlite_master t WHERE t.type IN (\'table\', \'view\') AND \'\' <> ? ORDER BY "TABLE_NAME"';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6175,8 +6129,7 @@ namespace Tqdev\PhpCrudApi\Database {
|
|||
case 'sqlsrv':
|
||||
return 'SELECT c.name AS "COLUMN_NAME", c.is_nullable AS "IS_NULLABLE", t.Name AS "DATA_TYPE", (c.max_length/2) AS "CHARACTER_MAXIMUM_LENGTH", c.precision AS "NUMERIC_PRECISION", c.scale AS "NUMERIC_SCALE", \'\' AS "COLUMN_TYPE" FROM sys.columns c INNER JOIN sys.types t ON c.user_type_id = t.user_type_id WHERE c.object_id = OBJECT_ID(?) AND \'\' <> ?';
|
||||
case 'sqlite':
|
||||
$this->updateSqlLiteReflectionTables();
|
||||
return 'SELECT "name" AS "COLUMN_NAME", case when "notnull"==1 then \'no\' else \'yes\' end as "IS_NULLABLE", "type" AS "DATA_TYPE", 2147483647 AS "CHARACTER_MAXIMUM_LENGTH", 0 AS "NUMERIC_PRECISION", 0 AS "NUMERIC_SCALE", \'\' AS "COLUMN_TYPE" FROM "sys/columns" WHERE "self" = ? AND \'\' <> ?';
|
||||
return 'SELECT "name" AS "COLUMN_NAME", case when "notnull"==1 then \'no\' else \'yes\' end as "IS_NULLABLE", lower("type") AS "DATA_TYPE", 2147483647 AS "CHARACTER_MAXIMUM_LENGTH", 0 AS "NUMERIC_PRECISION", 0 AS "NUMERIC_SCALE", \'\' AS "COLUMN_TYPE" FROM pragma_table_info(?) WHERE \'\' <> ?';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6190,7 +6143,7 @@ namespace Tqdev\PhpCrudApi\Database {
|
|||
case 'sqlsrv':
|
||||
return 'SELECT c.NAME as "COLUMN_NAME" FROM sys.key_constraints kc inner join sys.objects t on t.object_id = kc.parent_object_id INNER JOIN sys.index_columns ic ON kc.parent_object_id = ic.object_id and kc.unique_index_id = ic.index_id INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id WHERE kc.type = \'PK\' and t.object_id = OBJECT_ID(?) and \'\' <> ?';
|
||||
case 'sqlite':
|
||||
return 'SELECT "name" as "COLUMN_NAME" FROM "sys/columns" WHERE "pk"=1 AND "self"=? AND \'\' <> ?';
|
||||
return 'SELECT "name" as "COLUMN_NAME" FROM pragma_table_info(?) WHERE "pk"=1 AND \'\' <> ?';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6204,7 +6157,7 @@ namespace Tqdev\PhpCrudApi\Database {
|
|||
case 'sqlsrv':
|
||||
return 'SELECT COL_NAME(fc.parent_object_id, fc.parent_column_id) AS "COLUMN_NAME", OBJECT_NAME (f.referenced_object_id) AS "REFERENCED_TABLE_NAME" FROM sys.foreign_keys AS f INNER JOIN sys.foreign_key_columns AS fc ON f.OBJECT_ID = fc.constraint_object_id WHERE f.parent_object_id = OBJECT_ID(?) and \'\' <> ?';
|
||||
case 'sqlite':
|
||||
return 'SELECT "from" AS "COLUMN_NAME", "table" AS "REFERENCED_TABLE_NAME" FROM "sys/foreign_keys" WHERE "self" = ? AND \'\' <> ?';
|
||||
return 'SELECT "from" AS "COLUMN_NAME", "table" AS "REFERENCED_TABLE_NAME" FROM pragma_foreign_key_list(?) WHERE \'\' <> ?';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6268,8 +6221,8 @@ namespace Tqdev\PhpCrudApi\Database {
|
|||
}
|
||||
if ($this->driver == 'sqlite') {
|
||||
foreach ($results as &$result) {
|
||||
// mysql does not properly reflect display width of types
|
||||
preg_match('|([a-zA-Z]+)(\(([0-9]+)(,([0-9]+))?\))?|', $result['DATA_TYPE'], $matches);
|
||||
// sqlite does not properly reflect display width of types
|
||||
preg_match('|([a-z]+)(\(([0-9]+)(,([0-9]+))?\))?|', $result['DATA_TYPE'], $matches);
|
||||
if (isset($matches[1])) {
|
||||
$result['DATA_TYPE'] = $matches[1];
|
||||
} else {
|
||||
|
|
@ -6316,7 +6269,7 @@ namespace Tqdev\PhpCrudApi\Database {
|
|||
private function query(string $sql, array $parameters): array
|
||||
{
|
||||
$stmt = $this->pdo->prepare($sql);
|
||||
// echo "- $sql -- " . json_encode($parameters, JSON_UNESCAPED_UNICODE) . "\n";
|
||||
//echo "- $sql -- " . json_encode($parameters, JSON_UNESCAPED_UNICODE) . "\n";
|
||||
$stmt->execute($parameters);
|
||||
return $stmt->fetchAll();
|
||||
}
|
||||
|
|
|
|||
3
composer.lock
generated
3
composer.lock
generated
|
|
@ -391,5 +391,6 @@
|
|||
"ext-json": "*",
|
||||
"ext-pdo": "*"
|
||||
},
|
||||
"platform-dev": []
|
||||
"platform-dev": [],
|
||||
"plugin-api-version": "1.1.0"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue