From d904e7ecefe725fb755c3ce8251d7c8bd184ce7b Mon Sep 17 00:00:00 2001
From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Wed, 1 Sep 2021 10:44:40 +0200
Subject: [PATCH] Fix remaining psalm errors

---
 src/FakePdoStatementTrait.php                  | 2 +-
 src/Processor/Expression/FunctionEvaluator.php | 2 +-
 src/Schema/TableDefinition.php                 | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/FakePdoStatementTrait.php b/src/FakePdoStatementTrait.php
index e8d2967c..a1424c2f 100644
--- a/src/FakePdoStatementTrait.php
+++ b/src/FakePdoStatementTrait.php
@@ -393,7 +393,7 @@ public function fetch(
      */
     public function fetchColumn($column = 0)
     {
-        /** @var array|false $row */
+        /** @var array<int, scalar>|false $row */
         $row = $this->fetch(\PDO::FETCH_NUM);
         if ($row === false) {
             return $row;
diff --git a/src/Processor/Expression/FunctionEvaluator.php b/src/Processor/Expression/FunctionEvaluator.php
index c8723adc..ba584014 100644
--- a/src/Processor/Expression/FunctionEvaluator.php
+++ b/src/Processor/Expression/FunctionEvaluator.php
@@ -587,7 +587,7 @@ private static function sqlSubstringIndex(
         $delim = (string) Evaluator::evaluate($conn, $scope, $delimiter, $row, $result);
         $pos = $args[2];
 
-        if ($pos !== null) {
+        if ($pos !== null && $delim !== '') {
             $count = (int) Evaluator::evaluate($conn, $scope, $pos, $row, $result);
             $parts = \explode($delim, $string);
 
diff --git a/src/Schema/TableDefinition.php b/src/Schema/TableDefinition.php
index 9f0cc033..4f1725b0 100644
--- a/src/Schema/TableDefinition.php
+++ b/src/Schema/TableDefinition.php
@@ -29,7 +29,7 @@ class TableDefinition
     public $columns;
 
     /**
-     * @var array
+     * @var array<string>
      */
     public $primaryKeyColumns;
 
@@ -46,6 +46,7 @@ class TableDefinition
     /**
      * @param array<string, Column> $columns
      * @param array<string, Index> $indexes
+     * @param array<string> $primaryKeyColumns
      */
     public function __construct(
         string $name,