diff --git a/src/lib/types.ts b/src/lib/types.ts index 4b00a5f8..137f14b2 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -20,7 +20,7 @@ export const postgresColumnSchema = Type.Object({ table_id: Type.Integer(), schema: Type.String(), table: Type.String(), - id: Type.RegEx(/^(\d+)\.(\d+)$/), + id: Type.RegExp(/^(\d+)\.(\d+)$/), ordinal_position: Type.Integer(), name: Type.String(), default_value: Type.Unknown(), @@ -508,7 +508,7 @@ export const postgresTablePrivilegesRevokeSchema = Type.Object({ export type PostgresTablePrivilegesRevoke = Static export const postgresColumnPrivilegesSchema = Type.Object({ - column_id: Type.RegEx(/^(\d+)\.(\d+)$/), + column_id: Type.RegExp(/^(\d+)\.(\d+)$/), relation_schema: Type.String(), relation_name: Type.String(), column_name: Type.String(), @@ -529,7 +529,7 @@ export const postgresColumnPrivilegesSchema = Type.Object({ export type PostgresColumnPrivileges = Static export const postgresColumnPrivilegesGrantSchema = Type.Object({ - column_id: Type.RegEx(/^(\d+)\.(\d+)$/), + column_id: Type.RegExp(/^(\d+)\.(\d+)$/), grantee: Type.String(), privilege_type: Type.Union([ Type.Literal('ALL'), @@ -543,7 +543,7 @@ export const postgresColumnPrivilegesGrantSchema = Type.Object({ export type PostgresColumnPrivilegesGrant = Static export const postgresColumnPrivilegesRevokeSchema = Type.Object({ - column_id: Type.RegEx(/^(\d+)\.(\d+)$/), + column_id: Type.RegExp(/^(\d+)\.(\d+)$/), grantee: Type.String(), privilege_type: Type.Union([ Type.Literal('ALL'), diff --git a/src/server/routes/roles.ts b/src/server/routes/roles.ts index 79a8d4be..f9d125db 100644 --- a/src/server/routes/roles.ts +++ b/src/server/routes/roles.ts @@ -74,7 +74,7 @@ export default async (fastify: FastifyInstance) => { pg: Type.String(), }), params: Type.Object({ - id: Type.RegEx(/\d+/), + id: Type.RegExp(/\d+/), }), response: { 200: postgresRoleSchema, @@ -150,7 +150,7 @@ export default async (fastify: FastifyInstance) => { pg: Type.String(), }), params: Type.Object({ - id: Type.RegEx(/\d+/), + id: Type.RegExp(/\d+/), }), body: postgresRoleUpdateSchema, response: { @@ -195,7 +195,7 @@ export default async (fastify: FastifyInstance) => { pg: Type.String(), }), params: Type.Object({ - id: Type.RegEx(/\d+/), + id: Type.RegExp(/\d+/), }), querystring: Type.Object({ cascade: Type.Optional(Type.String()),