nodebb-plugin-dbsearch 6.3.0 → 6.3.2

package/lib/postgres.js

@@ -13,12 +13,12 @@ pubsub.on('dbsearch-language-changed', (e) => {
 });
 
 async function initDB() {
-	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchtopic" ( "id" TEXT NOT NULL PRIMARY KEY, "content" TEXT, "uid" TEXT, "cid" BIGINT )');
+	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchtopic" ( "id" TEXT NOT NULL PRIMARY KEY, "content" TEXT, "uid" TEXT, "cid" TEXT )');
 	await db.pool.query(`CREATE INDEX IF NOT EXISTS "idx__searchtopic__content" ON "searchtopic" USING GIN (to_tsvector('${searchLanguage}', "content"))`);
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchtopic__uid" ON "searchtopic"("uid")');
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchtopic__cid" ON "searchtopic"("cid")');
 
-	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchpost" ( "id" TEXT NOT NULL PRIMARY KEY, "content" TEXT, "uid" TEXT, "cid" BIGINT )');
+	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchpost" ( "id" TEXT NOT NULL PRIMARY KEY, "content" TEXT, "uid" TEXT, "cid" TEXT )');
 	await db.pool.query(`CREATE INDEX IF NOT EXISTS "idx__searchpost__content" ON "searchpost" USING GIN (to_tsvector('${searchLanguage}', "content"))`);
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchpost__uid" ON "searchpost"("uid")');
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchpost__cid" ON "searchpost"("cid")');
@@ -68,7 +68,7 @@ exports.searchIndex = async function (key, data, ids) {
 	try {
 		await db.pool.query({
 			name: `dbsearch-searchIndex-${key}`,
-			text: `INSERT INTO "search${key}" SELECT d."id", d."data"->>'content' "content", (d."data"->>'uid')::text "uid", (d."data"->>'cid')::bigint "cid" FROM UNNEST($1::text[], $2::jsonb[]) d("id", "data") ON CONFLICT ("id") DO UPDATE SET "content" = COALESCE(EXCLUDED."content", "search${key}"."content"), "uid" = COALESCE(EXCLUDED."uid", "search${key}"."uid"), "cid" = COALESCE(EXCLUDED."cid", "search${key}"."cid")`,
+			text: `INSERT INTO "search${key}" SELECT d."id", d."data"->>'content' "content", (d."data"->>'uid')::text "uid", (d."data"->>'cid')::text "cid" FROM UNNEST($1::text[], $2::jsonb[]) d("id", "data") ON CONFLICT ("id") DO UPDATE SET "content" = COALESCE(EXCLUDED."content", "search${key}"."content"), "uid" = COALESCE(EXCLUDED."uid", "search${key}"."uid"), "cid" = COALESCE(EXCLUDED."cid", "search${key}"."cid")`,
 			values: [ids, data],
 		});
 	} catch (err) {
@@ -93,7 +93,7 @@ exports.search = async function (key, data, limit) {
 	try {
 		const res = await db.pool.query({
 			name: `dbsearch-search-${key}`,
-			text: `SELECT ARRAY(SELECT s."id" FROM "search${key}" s WHERE ($1::text IS NULL OR to_tsvector($5::regconfig, "content") @@ plainto_tsquery($5::regconfig, $1::text)) AND ($2::text[] IS NULL OR "uid" = ANY($2::text[])) AND ($3::bigint[] IS NULL OR "cid" = ANY($3::bigint[])) ORDER BY ts_rank_cd(to_tsvector($5::regconfig, "content"), plainto_tsquery($5::regconfig, $1::text)) DESC, s."id" ASC LIMIT $4::integer) r`,
+			text: `SELECT ARRAY(SELECT s."id" FROM "search${key}" s WHERE ($1::text IS NULL OR to_tsvector($5::regconfig, "content") @@ plainto_tsquery($5::regconfig, $1::text)) AND ($2::text[] IS NULL OR "uid" = ANY($2::text[])) AND ($3::text[] IS NULL OR "cid" = ANY($3::text[])) ORDER BY ts_rank_cd(to_tsvector($5::regconfig, "content"), plainto_tsquery($5::regconfig, $1::text)) DESC, s."id" ASC LIMIT $4::integer) r`,
 			values: [data.content, data.uid, data.cid, parseInt(limit, 10), searchLanguage],
 		});
 		return res.rows[0].r;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-dbsearch",
-  "version": "6.3.0",
+  "version": "6.3.2",
   "description": "A Plugin that lets users search posts and topics",
   "main": "index.js",
   "repository": {

package/plugin.json

@@ -7,7 +7,8 @@
     "upgrades": [
         "upgrades/dbsearch_change_mongodb_schema.js",
         "upgrades/dbsearch_change_integer_index.js",
-        "upgrades/dbsearch_mongodb_ts_index.js"
+        "upgrades/dbsearch_mongodb_ts_index.js",
+        "upgrades/dbsearch_psql_cid_text_index.js"
     ],
     "hooks": [
         { "hook": "static:app.load", "method": "init" },

package/upgrades/dbsearch_psql_cid_text_index.js

@@ -0,0 +1,23 @@
+'use strict';
+
+
+const db = module.parent.require('./database');
+
+module.exports = {
+	name: 'Changing integer cid index to text for psql',
+	timestamp: Date.UTC(2025, 6, 8),
+	method: async function () {
+		const nconf = require.main.require('nconf');
+		const mainDB = nconf.get('database');
+		if (mainDB !== 'postgres') {
+			return;
+		}
+
+		try {
+			await db.client.query('ALTER TABLE searchtopic ALTER COLUMN cid TYPE text USING cid::bigint');
+			await db.client.query('ALTER TABLE searchpost ALTER COLUMN cid TYPE text USING cid::bigint');
+		} catch (err) {
+			console.error(err.stack);
+		}
+	},
+};