feat: setting for pgsql preferred search config

framework/core/js/src/admin/AdminApplication.tsx

@@ -38,6 +38,12 @@ export type Extension = {
   require?: Record<string, string>;
 };
 
+export enum DatabaseDriver {
+  MySQL = 'MySQL',
+  PostgreSQL = 'PostgreSQL',
+  SQLite = 'SQLite',
+}
+
 export interface AdminApplicationData extends ApplicationData {
   extensions: Record<string, Extension>;
   settings: Record<string, string>;
@@ -50,8 +56,9 @@ export interface AdminApplicationData extends ApplicationData {
   safeModeExtensions?: string[] | null;
   safeModeExtensionsConfig?: string[] | null;
 
-  dbDriver: string;
+  dbDriver: DatabaseDriver;
   dbVersion: string;
+  dbOptions: Record<string, string>;
   phpVersion: string;
   queueDriver: string;
   schedulerStatus: string;

framework/core/js/src/admin/components/AdvancedPage.tsx

@@ -11,6 +11,7 @@ import { MaintenanceMode } from '../../common/Application';
 import Button from '../../common/components/Button';
 import classList from '../../common/utils/classList';
 import ExtensionBisect from './ExtensionBisect';
+import { DatabaseDriver } from '../AdminApplication';
 
 export default class AdvancedPage<CustomAttrs extends IPageAttrs = IPageAttrs> extends AdminPage<CustomAttrs> {
   searchDriverOptions: Record<string, Record<string, string>> = {};
@@ -68,6 +69,10 @@ export default class AdvancedPage<CustomAttrs extends IPageAttrs = IPageAttrs> e
 
     items.add('maintenance', this.maintenance(), 90);
 
+    if (app.data.dbDriver === DatabaseDriver.PostgreSQL) {
+      items.add(DatabaseDriver.PostgreSQL, this.pgsqlSettings(), 80);
+    }
+
     return items;
   }
 
@@ -187,4 +192,19 @@ export default class AdvancedPage<CustomAttrs extends IPageAttrs = IPageAttrs> e
       </FormSection>
     );
   }
+
+  pgsqlSettings() {
+    return (
+      <FormSection label={DatabaseDriver.PostgreSQL}>
+        <Form>
+          {this.buildSettingComponent({
+            type: 'select',
+            setting: 'pgsql_search_configuration',
+            options: app.data.dbOptions.search_configurations,
+            label: app.translator.trans('core.admin.advanced.pgsql.search_configuration'),
+          })}
+        </Form>
+      </FormSection>
+    );
+  }
 }

framework/core/locale/core.yml

@@ -45,6 +45,8 @@ core:
         safe_mode_extensions: Extensions allowed to boot during safe mode
         safe_mode_extensions_override_help: "This setting is overridden by the <code>safe_mode_extensions</code> key in your <code>config.php</code> file. (<b>{extensions}</b>)"
         section_label: Maintenance
+      pgsql:
+        search_configuration: Search configuration to use
       search:
         section_label: Search Drivers
         driver_heading: "Search Driver: {model}"

framework/core/src/Admin/Content/AdminPayload.php

@@ -62,6 +62,7 @@ public function __invoke(Document $document, Request $request): void
         $document->payload['phpVersion'] = $this->appInfo->identifyPHPVersion();
         $document->payload['dbDriver'] = $this->appInfo->identifyDatabaseDriver();
         $document->payload['dbVersion'] = $this->appInfo->identifyDatabaseVersion();
+        $document->payload['dbOptions'] = $this->appInfo->identifyDatabaseOptions();
         $document->payload['debugEnabled'] = Arr::get($this->config, 'debug');
 
         if ($this->appInfo->scheduledTasksRegistered()) {

framework/core/src/Discussion/Search/FulltextFilter.php

@@ -14,6 +14,7 @@
 use Flarum\Search\AbstractFulltextFilter;
 use Flarum\Search\Database\DatabaseSearchState;
 use Flarum\Search\SearchState;
+use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\Query\Expression;
@@ -24,6 +25,11 @@
  */
 class FulltextFilter extends AbstractFulltextFilter
 {
+    public function __construct(
+        protected SettingsRepositoryInterface $settings
+    ) {
+    }
+
     public function search(SearchState $state, string $value): void
     {
         match ($state->getQuery()->getConnection()->getDriverName()) {
@@ -111,15 +117,17 @@ protected function mysql(SearchState $state, string $value): void
 
     protected function pgsql(SearchState $state, string $value): void
     {
+        $searchConfig = $this->settings->get('pgsql_search_configuration');
+
         /** @var Builder $query */
         $query = $state->getQuery();
 
         $grammar = $query->getGrammar();
 
-        $matchCondition = "to_tsvector('english', ".$grammar->wrap('posts.content').") @@ plainto_tsquery('english', ?)";
-        $matchScore = "ts_rank(to_tsvector('english', ".$grammar->wrap('posts.content')."), plainto_tsquery('english', ?))";
-        $matchTitleCondition = "to_tsvector('english', ".$grammar->wrap('discussions.title').") @@ plainto_tsquery('english', ?)";
-        $matchTitleScore = "ts_rank(to_tsvector('english', ".$grammar->wrap('discussions.title')."), plainto_tsquery('english', ?))";
+        $matchCondition = "to_tsvector('$searchConfig', ".$grammar->wrap('posts.content').") @@ plainto_tsquery('$searchConfig', ?)";
+        $matchScore = "ts_rank(to_tsvector('$searchConfig', ".$grammar->wrap('posts.content')."), plainto_tsquery('$searchConfig', ?))";
+        $matchTitleCondition = "to_tsvector('$searchConfig', ".$grammar->wrap('discussions.title').") @@ plainto_tsquery('$searchConfig', ?)";
+        $matchTitleScore = "ts_rank(to_tsvector('$searchConfig', ".$grammar->wrap('discussions.title')."), plainto_tsquery('$searchConfig', ?))";
         $mostRelevantPostId = 'CAST(SPLIT_PART(STRING_AGG(CAST('.$grammar->wrap('posts.id')." AS VARCHAR), ',' ORDER BY ".$matchScore.' DESC, '.$grammar->wrap('posts.number')."), ',', 1) AS INTEGER) as most_relevant_post_id";
 
         $discussionSubquery = Discussion::select('id')

framework/core/src/Foundation/ApplicationInfoProvider.php

@@ -87,6 +87,20 @@ public function identifyDatabaseDriver(): string
         };
     }
 
+    public function identifyDatabaseOptions(): array
+    {
+        if ($this->config['database.driver'] === 'pgsql') {
+            return [
+                'search_configurations' => collect($this->db->select('SELECT * FROM pg_ts_config'))
+                    ->pluck('cfgname')
+                    ->mapWithKeys(fn (string $cfgname) => [$cfgname => $cfgname])
+                    ->toArray(),
+            ];
+        }
+
+        return [];
+    }
+
     /**
      * Reports on the session driver in use based on three scenarios:
      *  1. If the configured session driver is valid and in use, it will be returned.

framework/core/src/Settings/SettingsServiceProvider.php

@@ -30,6 +30,7 @@ public function register(): void
                 'search_driver_Flarum\Group\Group' => 'default',
                 'search_driver_Flarum\Post\Post' => 'default',
                 'search_driver_Flarum\Http\AccessToken' => 'default',
+                'pgsql_search_configuration' => 'english',
             ]);
         });