8000 fix (nocodb): multi user replace for order by fendy3002 · Pull Request #11370 · nocodb/nocodb · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix (nocodb): multi user replace for order #11370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 15, 2025
Merged

fix (nocodb): multi user replace for order #11370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d2ad78
handle replace for pg
fendy3002 May 14, 2025
c84f336
handle sqlite3 multiple users
fendy3002 May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 31 additions & 15 deletions packages/nocodb/src/db/BaseModelSqlv2/group-by.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { Logger } from '@nestjs/common';
import type { Knex } from 'knex';
import type { IBaseModelSqlV2 } from '~/db/IBaseModelSqlV2';
import type { BarcodeColumn, QrCodeColumn, RollupColumn, View } from '~/models';
import { replaceDelimitedWithKeyValuePg } from '~/db/aggregations/pg';
import { sanitize } from '~/helpers/sqlSanitize';
import conditionV2 from '~/db/conditionV2';
import generateLookupSelectQuery from '~/db/generateLookupSelectQuery';
Expand All @@ -16,6 +17,7 @@ import {
} from '~/helpers/dbHelpers';
import { BaseUser, Column, Filter, Sort } from '~/models';
import { getAliasGenerator } from '~/utils';
import { replaceDelimitedWithKeyValueSqlite3 } from '~/db/aggregations/sqlite3';

export const groupBy = (baseModel: IBaseModelSqlV2, logger: Logger) => {
const list = async (args: {
Expand Down Expand Up @@ -301,21 +303,35 @@ export const groupBy = (baseModel: IBaseModelSqlV2, logger: Logger) => {
base_id: column.base_id,
});

// create union replace statement for each user
const mapUnion = baseUsers
.map((user) => {
return baseModel.dbDriver
.raw(`select ? as nc_u_id, ? as nc_u_name`, [
user.id,
user.display_name || user.email,
])
.toQuery();
})
.join(' UNION ALL ');
const finalStatement = `(select nc_u_name from (${mapUnion}) where nc_u_id = ${baseModel.dbDriver
.raw('??', [columnName])
.toQuery()})`;

let finalStatement = '';
if (baseModel.dbDriver.clientType() === 'pg') {
finalStatement = `(${replaceDelimitedWithKeyValuePg({
knex: baseModel.dbDriver,
needleColumn: columnName,
stack: baseUsers.map((user) => ({
key: user.id,
value: user.display_name || user.email,
})),
})})`;
} else if (baseModel.dbDriver.clientType() === 'sqlite3') {
finalStatement = `(${replaceDelimitedWithKeyValueSqlite3({
knex: baseModel.dbDriver,
needleColumn: columnName,
stack: baseUsers.map((user) => ({
key: user.id,
value: user.display_name || user.email,
})),
})})`;
} else {
// use the original replace
finalStatement = baseUsers.reduce((acc, user) => {
const qb = baseModel.dbDriver.raw(`REPLACE(${acc}, ?, ?)`, [
user.id,
user.display_name || user.email,
]);
return qb.toQuery();
}, baseModel.dbDriver.raw(`??`, [columnName]).toQuery());
}
if (!['asc', 'desc'].includes(sort.direction)) {
qb.orderBy(
8000 'count',
Expand Down
43 changes: 43 additions & 0 deletions packages/nocodb/src/db/aggregations/pg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
NumericalAggregations,
UITypes,
} from 'nocodb-sdk';
import type CustomKnex from '~/db/CustomKnex';
import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2';
import type { Knex } from 'knex';
import type { Column } from '~/models';
Expand Down Expand Up @@ -408,3 +409,45 @@ export function genPgAggregateQuery({

return aggregationSql?.toQuery();
}

export function replaceDelimitedWithKeyValuePg(params: {
knex: CustomKnex;
stack: { key: string; value: string }[];
needleColumn: string;
delimiter?: string;
}) {
const delimiter = params.delimiter ?? ',';
const knex = params.knex;

// create union replace statement for each user
const mapUnion = params.stack
.map((row) => {
return knex
.raw(`select ? as nc_p_key, ? as nc_p_value`, [row.key, row.value])
.toQuery();
})
.join(' UNION ALL ');

const needleAsRows = knex
.raw(
`select ?? as nc_raw_needle, trim(unnest(string_to_array(??, '${delimiter}'))) as nc_p_needle`,
[params.needleColumn, params.needleColumn],
)
.toQuery();

const result = knex
.raw(
[
`select nc_p_result from (`,
` select nc_t_needle.nc_raw_needle, string_agg(coalesce(nc_t_stack.nc_p_value, nc_t_stack.nc_p_key), '${delimiter}') as nc_p_result`,
` from (${needleAsRows}) nc_t_needle`,
` left join (${mapUnion}) nc_t_stack`,
` on nc_t_needle.nc_p_needle = nc_t_stack.nc_p_key`,
` group by nc_t_needle.nc_raw_needle`,
`)`,
].join(' '),
)
.toQuery();

return result;
}
43 changes: 43 additions & 0 deletions packages/nocodb/src/db/aggregations/sqlite3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
import type { Column } from '~/models';
import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2';
import type { Knex } from 'knex';
import type CustomKnex from '~/db/CustomKnex';

export function genSqlite3AggregateQuery({
column,
Expand Down Expand Up @@ -421,3 +422,45 @@ export function genSqlite3AggregateQuery({

return aggregationSql?.toQuery();
}

export function replaceDelimitedWithKeyValueSqlite3(params: {
knex: CustomKnex;
stack: { key: string; value: string }[];
needleColumn: string;
delimiter?: string;
}) {
const delimiter = params.delimiter ?? ',';
const knex = params.knex;

// create union replace statement for each user
const mapUnion = params.stack
.map((row) => {
return knex
.raw(`select ? as nc_p_key, ? as nc_p_value`, [row.key, row.value])
.toQuery();
})
.join(' UNION ALL ');

const needleAsRows = knex
.raw(
`select ?? as nc_raw_needle, nc_t_stack_1.value as nc_p_needle from (json_each('["' || replace(??, '${delimiter}', ?) || '"]')) nc_t_stack_1`,
[params.needleColumn, params.needleColumn, `"${delimiter}"`],
)
.toQuery();

const result = knex
.raw(
[
`select nc_p_result from (`,
` select nc_t_needle.nc_raw_needle, GROUP_CONCAT(coalesce(nc_t_stack.nc_p_value, nc_t_stack.nc_p_key), '${delimiter}') as nc_p_result`,
` from (${needleAsRows}) nc_t_needle`,
` left join (${mapUnion}) nc_t_stack`,
` on nc_t_needle.nc_p_needle = nc_t_stack.nc_p_key`,
` group by nc_t_needle.nc_raw_needle`,
`)`,
].join(' '),
)
.toQuery();

return result;
}
Loading
0