Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2025-12-03 10:11:21 +01:00
parent 3346486b6b
commit 77fca5e47c
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/package-shared/functions/dsql/sql/sql-generator.js vendored
View File

@ -101,7 +101,7 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
}
let fullTextMatchStr = (genObject === null || genObject === void 0 ? void 0 : genObject.fullTextSearch)
? ` MATCH(${genObject.fullTextSearch.fields
.map((f) => (genObject.join ? `${tableName}.${f}` : `${f}`))
.map((f) => genObject.join ? `${tableName}.${String(f)}` : `${String(f)}`)
.join(",")}) AGAINST (?)`
: undefined;
const fullTextSearchStr = (genObject === null || genObject === void 0 ? void 0 : genObject.fullTextSearch)

10
dist/package-shared/types/index.d.ts vendored
View File

@ -828,11 +828,15 @@ export type ServerQueryParam<T extends {
join?: ServerQueryParamsJoin<K>[];
group?: (keyof T)[];
countSubQueries?: ServerQueryParamsCount[];
fullTextSearch?: ServerQueryParamFullTextSearch;
fullTextSearch?: ServerQueryParamFullTextSearch<T>;
[key: string]: any;
};
export type ServerQueryParamFullTextSearch = {
fields: string[];
export type ServerQueryParamFullTextSearch<T extends {
[k: string]: any;
} = {
[k: string]: any;
}> = {
fields: (keyof T)[];
searchTerm: string;
/** Field Name to user to Rank the Score of Search Results */
scoreAlias: string;

4
package-shared/functions/dsql/sql/sql-generator.ts
View File

@ -154,7 +154,9 @@ export default function sqlGenerator<
let fullTextMatchStr = genObject?.fullTextSearch
? ` MATCH(${genObject.fullTextSearch.fields
.map((f) => (genObject.join ? `${tableName}.${f}` : `${f}`))
.map((f) =>
genObject.join ? `${tableName}.${String(f)}` : `${String(f)}`
)
.join(",")}) AGAINST (?)`
: undefined;

8
package-shared/types/index.ts
View File

@ -1013,12 +1013,14 @@ export type ServerQueryParam<
join?: ServerQueryParamsJoin<K>[];
group?: (keyof T)[];
countSubQueries?: ServerQueryParamsCount[];
fullTextSearch?: ServerQueryParamFullTextSearch;
fullTextSearch?: ServerQueryParamFullTextSearch<T>;
[key: string]: any;
};
export type ServerQueryParamFullTextSearch = {
fields: string[];
export type ServerQueryParamFullTextSearch<
T extends { [k: string]: any } = { [k: string]: any }
> = {
fields: (keyof T)[];
searchTerm: string;
/** Field Name to user to Rank the Score of Search Results */
scoreAlias: string;

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@moduletrace/datasquirel",
"version": "5.4.6",
"version": "5.4.7",
"description": "Cloud-based SQL data management tool",
"main": "dist/index.js",
"bin": {