Merge pull request #134 from socialblue/fix-empty-traces-issue-in-hor…

…izon-jobs fix: don't break dump on broken query.
socialblue · Apr 8, 2023 · 1b7bc06 · 1b7bc06
2 parents 8dc3637 + 0535281
commit 1b7bc06
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/Helper/QueryBuilderHelper.php b/src/Helper/QueryBuilderHelper.php
@@ -97,20 +97,28 @@ public static function analyzeByBuilder($builder)
  */
  public static function analyze($rawSql, $bindings)
  {
+ $queryData = '';
+ $sqlOptimized = '';
+ $errorMessage = '';
  $query = [
  'sql' => $rawSql,
  'bindings' => $bindings,
  ];
- $queryData = DB::connection()->select('EXPLAIN ' . $rawSql, $bindings);
 
- DB::connection()->getPdo()->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true);
- $showWarnings = DB::connection()->getPdo()->query("SHOW WARNINGS");
- $sqlOptimized = $showWarnings->fetchColumn(2);
- DB::connection()->getPdo()->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
+ try {
+ $queryData = DB::connection()->select('EXPLAIN ' . $rawSql, $bindings);
+ DB::connection()->getPdo()->setAttribute(\PDO::ATTR_EMULATE_PREPARES, true);
+ $showWarnings = DB::connection()->getPdo()->query("SHOW WARNINGS");
+ $sqlOptimized = $showWarnings->fetchColumn(2);
+ DB::connection()->getPdo()->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
+ } catch (\Exception $e) {
+ $errorMessage = $e->getMessage();
+ }
 
  return [
  'queryParts' => $queryData,
  'query' => $query,
+ 'error' => $errorMessage,
  'optimized' => $sqlOptimized,
  ];
  }