FIX Handle missing tables in postgres on flush

emteknetnz · Jul 6, 2022 · 78749eb · 78749eb
1 parent 608c8d8
commit 78749eb
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/Controller.php b/src/Controller.php
@@ -109,7 +109,7 @@ public function index(HTTPRequest $request)
                 Versioned::set_stage($stage);
             }
         }
-        
+
         // Check for a possible CORS preflight request and handle if necessary
         // Refer issue 66:  https://github.com/silverstripe/silverstripe-graphql/issues/66
         if ($request->httpMethod() === 'OPTIONS') {
@@ -524,13 +524,9 @@ public static function flush()
                     }
                 } catch (DatabaseException $e) {
                     // Allow failures on table doesn't exist or no database selected as we're flushing in first DB build
-                    $messageByLine = explode(PHP_EOL, $e->getMessage());
-
-                    // Get the last line
-                    $last = array_pop($messageByLine);
-
-                    if (strpos($last, 'No database selected') === false
-                        && !preg_match('/\s*(table|relation) .* does(n\'t| not) exist/i', $last)
+                    $message = $e->getMessage();
+                    if (strpos($message, 'No database selected') === false
+                        && !preg_match('/\s*(table|relation) .* does(n\'t| not) exist/i', $message)
                     ) {
                         throw $e;
                     }