feat: resolve a few issues with tests and integration with tooling

Author: samrose

nix/checks.nix

@@ -13,7 +13,6 @@
         psql_15 = self'.packages."psql_15/bin";
         psql_17 = self'.packages."psql_17/bin";
         psql_orioledb-17 = self'.packages."psql_orioledb-17/bin";
-        pgroonga = self'.packages."psql_15/exts/pgroonga";
         inherit (self.supabase) defaults;
       };
     in
@@ -68,9 +67,36 @@
                 '';
               };
 
+              # Get the major version for filtering
+              majorVersion =
+                let
+                  version = builtins.trace "pgpkg.version is: ${pgpkg.version}" pgpkg.version;
+                  isOrioledbMatch = builtins.match "^17_[0-9]+$" version != null;
+                  isSeventeenMatch = builtins.match "^17[.][0-9]+$" version != null;
+                  result =
+                    if isOrioledbMatch then
+                      "orioledb-17"
+                    else if isSeventeenMatch then
+                      "17"
+                    else
+                      "15";
+                in
+                builtins.trace "Major version result: ${result}" result;
+
+              # Select the appropriate pgroonga package for this PostgreSQL version
+              pgroonga = self'.packages."psql_${majorVersion}/exts/pgroonga-all";
+
+              pgPort =
+                if (majorVersion == "17") then
+                  "5535"
+                else if (majorVersion == "15") then
+                  "5536"
+                else
+                  "5537";
+
               # Use the shared setup but with a test-specific name
               start-postgres-server-bin = pkgs-lib.makePostgresDevSetup {
-                inherit pkgs;
+                inherit pkgs pgroonga;
                 name = "start-postgres-server-test";
                 extraSubstitutions = {
                   PGSODIUM_GETKEY = "${getkey-script}/bin/pgsodium-getkey";
@@ -116,33 +142,9 @@
                 in
                 pkgs.lib.filterAttrs (name: _: isValidFile name) files;
 
-              # Get the major version for filtering
-              majorVersion =
-                let
-                  version = builtins.trace "pgpkg.version is: ${pgpkg.version}" pgpkg.version;
-                  isOrioledbMatch = builtins.match "^17_[0-9]+$" version != null;
-                  isSeventeenMatch = builtins.match "^17[.][0-9]+$" version != null;
-                  result =
-                    if isOrioledbMatch then
-                      "orioledb-17"
-                    else if isSeventeenMatch then
-                      "17"
-                    else
-                      "15";
-                in
-                builtins.trace "Major version result: ${result}" result; # Trace the result                                             # For "15.8"
-
               # Filter SQL test files
               filteredSqlTests = filterTestFiles majorVersion ./tests/sql;
 
-              pgPort =
-                if (majorVersion == "17") then
-                  "5535"
-                else if (majorVersion == "15") then
-                  "5536"
-                else
-                  "5537";
-
               # Convert filtered tests to a sorted list of basenames (without extension)
               testList = pkgs.lib.mapAttrsToList (
                 name: _: builtins.substring 0 (pkgs.lib.stringLength name - 4) name

nix/ext/postgis.nix

@@ -19,7 +19,7 @@
 }:
 
 let
-  sfcgal = callPackage ./sfcgal/sfcgal.nix { };
+  sfcgal = callPackage ../packages/sfcgal.nix { };
   gdal = callPackage ./gdal.nix { inherit postgresql; };
   pname = "postgis";
 

nix/ext/tests/pgroonga.nix

@@ -107,7 +107,6 @@ self.inputs.nixpkgs.lib.nixos.runTest {
           requires = [ "postgresql-migrate.service" ];
         };
       };
-
     };
   testScript =
     { nodes, ... }:

nix/packages/default.nix

@@ -23,7 +23,6 @@
         psql_15 = self'.packages."psql_15/bin";
         psql_17 = self'.packages."psql_17/bin";
         psql_orioledb-17 = self'.packages."psql_orioledb-17/bin";
-        pgroonga = self'.packages."psql_15/exts/pgroonga";
         inherit (self.supabase) defaults;
       };
     in
@@ -60,6 +59,7 @@
           start-server = pkgs-lib.makePostgresDevSetup {
             inherit pkgs;
             name = "start-postgres-server";
+            pgroonga = self'.packages."psql_${activeVersion}/exts/pgroonga-all";
           };
           switch-ext-version = pkgs.callPackage ./switch-ext-version.nix {
             inherit (self'.packages) overlayfs-on-package;

nix/packages/lib.nix

@@ -5,13 +5,13 @@
   defaults,
   supabase-groonga,
   system,
-  pgroonga,
 }:
 {
   makePostgresDevSetup =
     {
       pkgs,
       name,
+      pgroonga,
       extraSubstitutions ? { },
     }:
     let

nix/tests/expected/pgroonga.out

@@ -0,0 +1,76 @@
+create schema v;
+create table v.roon(
+  id serial primary key,
+  content text
+);
+with tokenizers as (
+  select
+    x
+  from
+    jsonb_array_elements(
+      (select pgroonga_command('tokenizer_list'))::jsonb
+    ) x(val)
+  limit
+    1
+  offset
+    1 -- first record is unrelated and not stable
+)
+select
+  t.x::jsonb ->> 'name'
+from
+  jsonb_array_elements((select * from tokenizers)) t(x)
+order by
+  t.x::jsonb ->> 'name';
+                  ?column?                   
+---------------------------------------------
+ TokenBigram
+ TokenBigramIgnoreBlank
+ TokenBigramIgnoreBlankSplitSymbol
+ TokenBigramIgnoreBlankSplitSymbolAlpha
+ TokenBigramIgnoreBlankSplitSymbolAlphaDigit
+ TokenBigramSplitSymbol
+ TokenBigramSplitSymbolAlpha
+ TokenBigramSplitSymbolAlphaDigit
+ TokenDelimit
+ TokenDelimitNull
+ TokenDocumentVectorBM25
+ TokenDocumentVectorTFIDF
+ TokenMecab
+ TokenNgram
+ TokenPattern
+ TokenRegexp
+ TokenTable
+ TokenTrigram
+ TokenUnigram
+(19 rows)
+
+insert into v.roon (content)
+values
+  ('Hello World'),
+  ('PostgreSQL with PGroonga is a thing'),
+  ('This is a full-text search test'),
+  ('PGroonga supports various languages');
+-- Create default index
+create index pgroonga_index on v.roon using pgroonga (content);
+-- Create mecab tokenizer index since we had a bug with this one once
+create index pgroonga_index_mecab on v.roon using pgroonga (content) with (tokenizer='TokenMecab');
+-- Run some queries to test the index
+select * from v.roon where content &@~ 'Hello';
+ id |   content   
+----+-------------
+  1 | Hello World
+(1 row)
+
+select * from v.roon where content &@~ 'powerful';
+ id | content 
+----+---------
+(0 rows)
+
+select * from v.roon where content &@~ 'supports';
+ id |               content               
+----+-------------------------------------
+  4 | PGroonga supports various languages
+(1 row)
+
+drop schema v cascade;
+NOTICE:  drop cascades to table v.roon