1
0
Fork 0
mirror of synced 2024-10-02 10:16:27 +13:00
This commit is contained in:
Jake Barnby 2024-03-06 21:14:55 +01:00
parent 1b7ce8fc61
commit 3312ed1c5d
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
6 changed files with 1540 additions and 20 deletions

View file

@ -105,7 +105,6 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$database = $databases[$databaseName];
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
\var_dump('Using shared tables');
$database
->setShareTables(true)
->setTenant($project->getInternalId())
@ -130,7 +129,6 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$databases[$databaseName] = $database;
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
\var_dump('Using shared tables');
$database
->setShareTables(true)
->setTenant($project->getInternalId())

View file

@ -1135,18 +1135,17 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
->setMetadata('project', $project->getId())
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
\var_dump('Using shared tables');
//if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
return $database;
}, ['pools', 'dbForConsole', 'cache', 'project']);
@ -1185,7 +1184,6 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
\var_dump('Using shared tables');
$database
->setShareTables(true)
->setTenant($project->getInternalId())

View file

@ -76,7 +76,6 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
->setMetadata('project', $project->getId());
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
\var_dump('Using shared tables');
$database
->setShareTables(true)
->setTenant($project->getInternalId())
@ -116,7 +115,6 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
$database = $databases[$databaseName];
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
\var_dump('Using shared tables');
$database
->setShareTables(true)
->setTenant($project->getInternalId())
@ -141,7 +139,6 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
$databases[$databaseName] = $database;
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
\var_dump('Using shared tables');
$database
->setShareTables(true)
->setTenant($project->getInternalId())

12
composer.lock generated
View file

@ -2764,16 +2764,16 @@
},
{
"name": "nikic/php-parser",
"version": "v5.0.1",
"version": "v5.0.2",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "2218c2252c874a4624ab2f613d86ac32d227bc69"
"reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69",
"reference": "2218c2252c874a4624ab2f613d86ac32d227bc69",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
"reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
"shasum": ""
},
"require": {
@ -2816,9 +2816,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1"
"source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
},
"time": "2024-02-21T19:24:10+00:00"
"time": "2024-03-05T20:51:40+00:00"
},
{
"name": "phar-io/manifest",

1527
names2.json Normal file

File diff suppressed because it is too large Load diff

0
test.php Normal file
View file