Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-02-24 22:05:56 -05:00
Code Issues Activity

refactor(core): add manyRows() for queries (#665)

Browse source
This commit is contained in:
Gao Sun 2022-04-26 17:26:50 +08:00 • committed by GitHub
parent 2715383ca2
commit 0fbca8be4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/core/src/database/utils.ts
View file

@ -1,7 +1,7 @@
import { SchemaValuePrimitive, SchemaValue } from '@logto/schemas';
import { Falsy, notFalsy } from '@silverhand/essentials';
import dayjs from 'dayjs';
import { sql, SqlSqlToken, SqlToken } from 'slonik';
import { sql, SqlSqlToken, SqlToken, QueryResult } from 'slonik';
import { FieldIdentifiers, Table } from './types';
@ -68,3 +68,9 @@ export const convertToIdentifiers = <T extends Table>(
});
export const convertToTimestamp = (time = dayjs()) => sql`to_timestamp(${time.valueOf() / 1000})`;
export const manyRows = async <T>(query: Promise<QueryResult<T>>): Promise<readonly T[]> => {
const { rows } = await query;
return rows;
};

23
packages/core/src/queries/application.ts
View file

@ -4,7 +4,12 @@ import { sql } from 'slonik';
import { buildInsertInto } from '@/database/insert-into';
import { getTotalRowCount } from '@/database/row-count';
import { buildUpdateWhere } from '@/database/update-where';
import { convertToIdentifiers, OmitAutoSetFields, conditionalSql } from '@/database/utils';
import {
convertToIdentifiers,
OmitAutoSetFields,
conditionalSql,
manyRows,
} from '@/database/utils';
import envSet from '@/env-set';
import { DeletionError } from '@/errors/SlonikError';
@ -13,13 +18,15 @@ const { table, fields } = convertToIdentifiers(Applications);
export const findTotalNumberOfApplications = async () => getTotalRowCount(table);
export const findAllApplications = async (limit: number, offset: number) =>
envSet.pool.many<Application>(sql`
select ${sql.join(Object.values(fields), sql`, `)}
from ${table}
order by ${fields.createdAt} desc
${conditionalSql(limit, (limit) => sql`limit ${limit}`)}
${conditionalSql(offset, (offset) => sql`offset ${offset}`)}
`);
manyRows(
envSet.pool.query<Application>(sql`
select ${sql.join(Object.values(fields), sql`, `)}
from ${table}
order by ${fields.createdAt} desc
${conditionalSql(limit, (limit) => sql`limit ${limit}`)}
${conditionalSql(offset, (offset) => sql`offset ${offset}`)}
`)
);
export const findApplicationById = async (id: string) =>
envSet.pool.one<Application>(sql`

14
packages/core/src/queries/connector.ts
View file

@ -3,17 +3,19 @@ import { sql } from 'slonik';
import { buildInsertInto } from '@/database/insert-into';
import { buildUpdateWhere } from '@/database/update-where';
import { convertToIdentifiers } from '@/database/utils';
import { convertToIdentifiers, manyRows } from '@/database/utils';
import envSet from '@/env-set';
const { table, fields } = convertToIdentifiers(Connectors);
export const findAllConnectors = async () =>
envSet.pool.many<Connector>(sql`
select ${sql.join(Object.values(fields), sql`, `)}
from ${table}
order by ${fields.enabled} desc, ${fields.id} asc
`);
manyRows(
envSet.pool.query<Connector>(sql`
select ${sql.join(Object.values(fields), sql`, `)}
from ${table}
order by ${fields.enabled} desc, ${fields.id} asc
`)
);
export const findConnectorById = async (id: string) =>
envSet.pool.one<Connector>(sql`

21
packages/core/src/queries/resource.ts
View file

@ -4,7 +4,12 @@ import { sql } from 'slonik';
import { buildInsertInto } from '@/database/insert-into';
import { getTotalRowCount } from '@/database/row-count';
import { buildUpdateWhere } from '@/database/update-where';
import { convertToIdentifiers, OmitAutoSetFields, conditionalSql } from '@/database/utils';
import {
convertToIdentifiers,
OmitAutoSetFields,
conditionalSql,
manyRows,
} from '@/database/utils';
import envSet from '@/env-set';
import { DeletionError } from '@/errors/SlonikError';
@ -13,12 +18,14 @@ const { table, fields } = convertToIdentifiers(Resources);
export const findTotalNumberOfResources = async () => getTotalRowCount(table);
export const findAllResources = async (limit: number, offset: number) =>
envSet.pool.many<Resource>(sql`
select ${sql.join(Object.values(fields), sql`, `)}
from ${table}
${conditionalSql(limit, (limit) => sql`limit ${limit}`)}
${conditionalSql(offset, (offset) => sql`offset ${offset}`)}
`);
manyRows(
envSet.pool.query<Resource>(sql`
select ${sql.join(Object.values(fields), sql`, `)}
from ${table}
${conditionalSql(limit, (limit) => sql`limit ${limit}`)}
${conditionalSql(offset, (offset) => sql`offset ${offset}`)}
`)
);
export const findResourceByIndicator = async (indicator: string) =>
envSet.pool.maybeOne<Resource>(sql`