From be28ea50bc11901765046f104272c62f71a3fb31 Mon Sep 17 00:00:00 2001 From: ndm2 Date: Sun, 17 Jan 2021 03:34:09 +0100 Subject: [PATCH 1/2] Add missing comparisons. #45 added a missing test for a fix, but only added a comparison for compression, the missing comparisons in the other files will cause newly added comparisons to fail, as they will be compared to the wrong SQL. --- tests/clihighlight.html | 6 ++++++ tests/format-highlight.html | 6 ++++++ tests/format.html | 6 ++++++ tests/highlight.html | 4 ++++ 4 files changed, 22 insertions(+) diff --git a/tests/clihighlight.html b/tests/clihighlight.html index 926a16d..a116ff6 100755 --- a/tests/clihighlight.html +++ b/tests/clihighlight.html @@ -818,3 +818,9 @@ [sqlserver] FROM [escap[e]]d style]; +--- +SELECT + a +FROM + b + LEFT OUTER JOIN c on (d = f); diff --git a/tests/format-highlight.html b/tests/format-highlight.html index d305bf8..cc86e7b 100755 --- a/tests/format-highlight.html +++ b/tests/format-highlight.html @@ -818,3 +818,9 @@ [sqlserver] FROM [escap[e]]d style]; +--- +
SELECT
+  a
+FROM
+  b
+  LEFT OUTER JOIN c on (d = f);
diff --git a/tests/format.html b/tests/format.html index 831a24c..375a844 100755 --- a/tests/format.html +++ b/tests/format.html @@ -816,3 +816,9 @@ [sqlserver] FROM [escap[e]]d style]; +--- +SELECT + a +FROM + b + LEFT OUTER JOIN c on (d = f); diff --git a/tests/highlight.html b/tests/highlight.html index 9592c40..39d9a04 100755 --- a/tests/highlight.html +++ b/tests/highlight.html @@ -268,3 +268,7 @@
SELECT "no closing quote
---
SELECT [sqlserver] FROM [escap[e]]d style];
+--- +
SELECT a FROM b LEFT
+OUTER
+JOIN c on (d=f);
From 0f0cf8ef75aca87255249633c469c09e896d8ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Thu, 25 Mar 2021 23:09:26 +0100 Subject: [PATCH 2/2] Warn when the data provider is invalid --- tests/SqlFormatterTest.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/SqlFormatterTest.php b/tests/SqlFormatterTest.php index e7fc659..68d90cd 100644 --- a/tests/SqlFormatterTest.php +++ b/tests/SqlFormatterTest.php @@ -10,12 +10,15 @@ use Doctrine\SqlFormatter\SqlFormatter; use Generator; use PHPUnit\Framework\TestCase; +use UnexpectedValueException; use function assert; +use function count; use function defined; use function explode; use function file_get_contents; use function pack; +use function sprintf; use function trim; /** @@ -124,6 +127,14 @@ private function fileDataProvider(string $file): Generator assert($contents !== false); $formatHighlightData = explode("\n---\n", $contents); $sqlData = $this->sqlData(); + if (count($formatHighlightData) !== count($sqlData)) { + throw new UnexpectedValueException(sprintf( + '"%s" (%d sections) and sql.sql (%d sections) should have the same number of sections', + $file, + count($formatHighlightData), + count($sqlData) + )); + } foreach ($formatHighlightData as $i => $data) { yield [$sqlData[$i], $data];