tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #402 from creative-commoners/pulls/2.2/subsites-is-off-the-table-or-maybe-its-on-it-now-idk 

FIX Catching situation where database has no tables but it exists
This commit is contained in:
Dylan Wagstaff 2018-11-08 12:26:59 +13:00 committed by GitHub
parent a0ecbdf4b6 59f6685e2a
commit ce9dd1a856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Middleware/InitStateMiddleware.php
View File

@ -44,8 +44,10 @@ class InitStateMiddleware implements HTTPMiddleware
return $delegate($request);
} catch (DatabaseException $ex) {
$message = $ex->getMessage();
if (strpos($message, 'No database selected') !== false) {
// Database is not ready, ignore and continue
if (strpos($message, 'No database selected') !== false
|| preg_match('/\s*(table|relation) .* does(n\'t| not) exist/i', $message)
) {
// Database is not ready, ignore and continue. Either it doesn't exist or it has no tables
return $delegate($request);
}
throw $ex;