Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions src/util/builders/common.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
and,
asc,
count,
desc,
eq,
getTableColumns,
Expand Down Expand Up @@ -693,3 +694,28 @@ export const extractRelationsParams = (

return extractRelationsParamsInner(relationMap, tables, tableName, typeName, info, true);
};

export const executeCountQuery = async <TDb extends { select: Function; $count?: Function }>(
db: TDb,
table: Table,
where?: SQL,
): Promise<number> => {
// Try to use the modern db.$count utility if available
if (db.$count && typeof db.$count === 'function') {
try {
const result = where
? await db.$count(table, where)
: await db.$count(table);
return Number(result) || 0;
} catch (e) {
// Fall back to manual count if $count fails
}
}

// Fall back to manual count query
const query = db.select({ count: count() }).from(table);
const result = await (where ? query.where(where) : query);
const value = result[0]?.count || 0;

return Number(value);
};
47 changes: 47 additions & 0 deletions src/util/builders/mysql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
extractOrderBy,
extractRelationsParams,
extractSelectedColumnsFromTree,
executeCountQuery,
generateTableTypes,
} from '@/util/builders/common';
import { capitalize, uncapitalize } from '@/util/case-ops';
Expand Down Expand Up @@ -179,6 +180,41 @@ const generateSelectSingle = (
};
};

const generateSelectCount = (
db: MySqlDatabase<any, any, any, any>,
tableName: string,
tables: Record<string, Table>,
filterArgs: GraphQLInputObjectType,
): CreatedResolver => {
const queryName = `${uncapitalize(tableName)}Count`;
const table = tables[tableName]!;

const queryArgs = {
where: {
type: filterArgs,
},
} as GraphQLFieldConfigArgumentMap;

return {
name: queryName,
resolver: async (source, args: { where?: Filters<Table> }, context, info) => {
try {
const { where } = args;

const whereClause = where ? extractFilters(table, tableName, where) : undefined;
return await executeCountQuery(db, table, whereClause);
} catch (e) {
if (typeof e === 'object' && typeof (<any> e).message === 'string') {
throw new GraphQLError((<any> e).message);
}

throw e;
}
},
args: queryArgs,
};
};

const generateInsertArray = (
db: MySqlDatabase<any, any, any, any>,
tableName: string,
Expand Down Expand Up @@ -433,6 +469,12 @@ export const generateSchemaData = <
tableOrder,
tableFilters,
);
const selectCountGenerated = generateSelectCount(
db,
tableName,
tables,
tableFilters,
);
const insertArrGenerated = generateInsertArray(db, tableName, schema[tableName] as MySqlTable, insertInput);
const insertSingleGenerated = generateInsertSingle(db, tableName, schema[tableName] as MySqlTable, insertInput);
const updateGenerated = generateUpdate(
Expand All @@ -454,6 +496,11 @@ export const generateSchemaData = <
args: selectSingleGenerated.args,
resolve: selectSingleGenerated.resolver,
};
queries[selectCountGenerated.name] = {
type: GraphQLInt,
args: selectCountGenerated.args,
resolve: selectCountGenerated.resolver,
};
mutations[insertArrGenerated.name] = {
type: mutationReturnType,
args: insertArrGenerated.args,
Expand Down
47 changes: 47 additions & 0 deletions src/util/builders/pg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
extractRelationsParams,
extractSelectedColumnsFromTree,
extractSelectedColumnsFromTreeSQLFormat,
executeCountQuery,
generateTableTypes,
} from '@/util/builders/common';
import { capitalize, uncapitalize } from '@/util/case-ops';
Expand Down Expand Up @@ -179,6 +180,41 @@ const generateSelectSingle = (
};
};

const generateSelectCount = (
db: PgDatabase<any, any, any>,
tableName: string,
tables: Record<string, Table>,
filterArgs: GraphQLInputObjectType,
): CreatedResolver => {
const queryName = `${uncapitalize(tableName)}Count`;
const table = tables[tableName]!;

const queryArgs = {
where: {
type: filterArgs,
},
} as GraphQLFieldConfigArgumentMap;

return {
name: queryName,
resolver: async (source, args: { where?: Filters<Table> }, context, info) => {
try {
const { where } = args;

const whereClause = where ? extractFilters(table, tableName, where) : undefined;
return await executeCountQuery(db, table, whereClause);
} catch (e) {
if (typeof e === 'object' && typeof (<any> e).message === 'string') {
throw new GraphQLError((<any> e).message);
}

throw e;
}
},
args: queryArgs,
};
};

const generateInsertArray = (
db: PgDatabase<any, any, any>,
tableName: string,
Expand Down Expand Up @@ -473,6 +509,12 @@ export const generateSchemaData = <
tableOrder,
tableFilters,
);
const selectCountGenerated = generateSelectCount(
db,
tableName,
tables,
tableFilters,
);
const insertArrGenerated = generateInsertArray(db, tableName, schema[tableName] as PgTable, insertInput);
const insertSingleGenerated = generateInsertSingle(db, tableName, schema[tableName] as PgTable, insertInput);
const updateGenerated = generateUpdate(db, tableName, schema[tableName] as PgTable, updateInput, tableFilters);
Expand All @@ -488,6 +530,11 @@ export const generateSchemaData = <
args: selectSingleGenerated.args,
resolve: selectSingleGenerated.resolver,
};
queries[selectCountGenerated.name] = {
type: GraphQLInt,
args: selectCountGenerated.args,
resolve: selectCountGenerated.resolver,
};
mutations[insertArrGenerated.name] = {
type: arrTableItemOutput,
args: insertArrGenerated.args,
Expand Down
47 changes: 47 additions & 0 deletions src/util/builders/sqlite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
extractRelationsParams,
extractSelectedColumnsFromTree,
extractSelectedColumnsFromTreeSQLFormat,
executeCountQuery,
generateTableTypes,
} from '@/util/builders/common';
import { capitalize, uncapitalize } from '@/util/case-ops';
Expand Down Expand Up @@ -179,6 +180,41 @@ const generateSelectSingle = (
};
};

const generateSelectCount = (
db: BaseSQLiteDatabase<any, any, any, any>,
tableName: string,
tables: Record<string, Table>,
filterArgs: GraphQLInputObjectType,
): CreatedResolver => {
const queryName = `${uncapitalize(tableName)}Count`;
const table = tables[tableName]!;

const queryArgs = {
where: {
type: filterArgs,
},
} as GraphQLFieldConfigArgumentMap;

return {
name: queryName,
resolver: async (source, args: { where?: Filters<Table> }, context, info) => {
try {
const { where } = args;

const whereClause = where ? extractFilters(table, tableName, where) : undefined;
return await executeCountQuery(db, table, whereClause);
} catch (e) {
if (typeof e === 'object' && typeof (<any> e).message === 'string') {
throw new GraphQLError((<any> e).message);
}

throw e;
}
},
args: queryArgs,
};
};

const generateInsertArray = (
db: BaseSQLiteDatabase<any, any, any, any>,
tableName: string,
Expand Down Expand Up @@ -474,6 +510,12 @@ export const generateSchemaData = <
tableOrder,
tableFilters,
);
const selectCountGenerated = generateSelectCount(
db,
tableName,
tables,
tableFilters,
);
const insertArrGenerated = generateInsertArray(db, tableName, schema[tableName] as SQLiteTable, insertInput);
const insertSingleGenerated = generateInsertSingle(db, tableName, schema[tableName] as SQLiteTable, insertInput);
const updateGenerated = generateUpdate(
Expand All @@ -495,6 +537,11 @@ export const generateSchemaData = <
args: selectSingleGenerated.args,
resolve: selectSingleGenerated.resolver,
};
queries[selectCountGenerated.name] = {
type: GraphQLInt,
args: selectCountGenerated.args,
resolve: selectCountGenerated.resolver,
};
mutations[insertArrGenerated.name] = {
type: arrTableItemOutput,
args: insertArrGenerated.args,
Expand Down
45 changes: 43 additions & 2 deletions tests/mysql-custom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ describe.sequential('Query tests', async () => {
...PostsFrag
}
}

fragment UsersFrag on UsersSelectItem {
id
name
Expand Down Expand Up @@ -1107,7 +1107,7 @@ describe.sequential('Query tests', async () => {
...PostsFrag
}
}

fragment UsersFrag on UsersSelectItem {
id
name
Expand Down Expand Up @@ -2006,4 +2006,45 @@ describe.sequential('Arguments tests', async () => {
},
});
});

it('Count queries', async () => {
// Test basic count
const countRes = await ctx.gql.queryGql(/* GraphQL */ `
{
customUsersCount
}
`);

expect(countRes).toStrictEqual({
data: {
customUsersCount: 2,
},
});

// Test count with filters
const filteredCountRes = await ctx.gql.queryGql(/* GraphQL */ `
{
customUsersCount(where: { role: { eq: "admin" } })
}
`);

expect(filteredCountRes).toStrictEqual({
data: {
customUsersCount: 1,
},
});

// Test posts count
const postsCountRes = await ctx.gql.queryGql(/* GraphQL */ `
{
customPostsCount
}
`);

expect(postsCountRes).toStrictEqual({
data: {
customPostsCount: 6,
},
});
});
});
45 changes: 43 additions & 2 deletions tests/mysql.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ describe.sequential('Query tests', async () => {
...PostsFrag
}
}

fragment UsersFrag on UsersSelectItem {
id
name
Expand Down Expand Up @@ -1092,7 +1092,7 @@ describe.sequential('Query tests', async () => {
...PostsFrag
}
}

fragment UsersFrag on UsersSelectItem {
id
name
Expand Down Expand Up @@ -4597,4 +4597,45 @@ describe.sequential('__typename with data tests', async () => {

expect(data).toStrictEqual([]);
});

it('Count queries', async () => {
// Test basic count
const countRes = await ctx.gql.queryGql(/* GraphQL */ `
{
usersCount
}
`);

expect(countRes).toStrictEqual({
data: {
usersCount: 2,
},
});

// Test count with filters
const filteredCountRes = await ctx.gql.queryGql(/* GraphQL */ `
{
usersCount(where: { role: { eq: "admin" } })
}
`);

expect(filteredCountRes).toStrictEqual({
data: {
usersCount: 1,
},
});

// Test posts count
const postsCountRes = await ctx.gql.queryGql(/* GraphQL */ `
{
postsCount
}
`);

expect(postsCountRes).toStrictEqual({
data: {
postsCount: 6,
},
});
});
});
Loading