fix: ci/cd workflow

Author: norberttech

.github/workflows/job-pg-query-extension.yml

@@ -35,19 +35,11 @@ jobs:
           brew install autoconf automake libtool protobuf protobuf-c
 
       - name: Build libpg_query and extension
-        working-directory: src/extension/pg-query-parser
+        working-directory: src/extension/pg-query-ext
         run: |
           make clean || true
           make build
 
       - name: Run extension tests
-        working-directory: src/extension/pg-query-parser
+        working-directory: src/extension/pg-query-ext
         run: make test
-
-      - name: Install composer dependencies
-        working-directory: src/extension/pg-query-parser
-        run: composer install --no-interaction
-
-      - name: Run PHP tests
-        working-directory: src/extension/pg-query-parser
-        run: php -d extension=./ext/modules/pg_query.so vendor/bin/phpunit

src/extension/pg-query-ext/README.md

@@ -81,8 +81,8 @@ make install
 From the Flow PHP monorepo root:
 
 ```bash
-# Enter Nix shell with build tools
-nix-shell --arg with-pg-query-build-tools true
+# Enter Nix shell with pg_query extension loaded and build tools available
+nix-shell --arg with-pg-query-ext true
 
 # Navigate to extension directory
 cd src/extension/pg-query-ext

src/extension/pg-query-ext/ext/pg_query.c

@@ -71,7 +71,7 @@ PHP_MINFO_FUNCTION(pg_query)
     php_info_print_table_start();
     php_info_print_table_header(2, "pg_query support", "enabled");
     php_info_print_table_row(2, "Version", PHP_PG_QUERY_VERSION);
-    php_info_print_table_row(2, "libpg_query version", "16-5.1.0");
+    php_info_print_table_row(2, "libpg_query version", "17-6.1.0");
     php_info_print_table_end();
 }
 

src/lib/pg-query/src/Flow/PgQuery/Parser.php

@@ -35,7 +35,7 @@ public function parse(string $sql) : ParseResult
         try {
             $json = pg_query_parse($sql);
         } catch (\RuntimeException $e) {
-            throw new ParserException($e->getMessage());
+            throw new ParserException($e->getMessage(), $e->getCode() ?: null);
         }
 
         $result = new ParseResult();

src/lib/pg-query/tests/Flow/PgQuery/Tests/Unit/ParserTest.php

@@ -55,6 +55,32 @@ public function test_normalize_multiple_values() : void
         self::assertStringContainsString('$2', $normalized);
     }
 
+    public function test_parse_exception_contains_cursor_position() : void
+    {
+        $parser = new Parser();
+
+        try {
+            $parser->parse('SELECT * FROM');
+        } catch (\Flow\PgQuery\Exception\ParserException $e) {
+            self::assertNotNull($e->cursorPosition);
+            self::assertGreaterThan(0, $e->cursorPosition);
+
+            return;
+        }
+
+        self::fail('Expected ParserException was not thrown');
+    }
+
+    public function test_parse_invalid_sql_throws_exception() : void
+    {
+        $parser = new Parser();
+
+        $this->expectException(\Flow\PgQuery\Exception\ParserException::class);
+        $this->expectExceptionMessage('syntax error');
+
+        $parser->parse('SELECT FROM WHERE');
+    }
+
     public function test_parse_multiple_statements() : void
     {
         $parser = new Parser();