The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(studio): support pg_cron $ syntax for last day of month in schedule parsing (#42340)
Jonathan Fulton34d847250010
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.constants.ts b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.constants.tsindex ddbdf55928b..c187b76162e 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.constants.ts+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.constants.ts@@ -6,9 +6,10 @@ import { httpEndpointUrlSchema } from '@/lib/validation/http-url'const convertCronToString = (schedule: string) => {// pg_cron can also use "30 seconds" format for schedule. Cronstrue doesn't understand that format so just use the- // original schedule when cronstrue throws+ // original schedule when cronstrue throws.+ // pg_cron uses '$' for "last day of month"; cronstrue uses 'L' — normalize before parsing.try {- return CronToString(schedule)+ return CronToString(schedule.replace(/\$/g, 'L'))} catch (error) {return schedule}diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobPage.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobPage.tsxindex 6e8cc1d0d06..2875af6a5ca 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobPage.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobPage.tsx@@ -70,7 +70,7 @@ export const CronJobPage = () => {<span className="cursor-pointer underline decoration-dotted lowercase">{isSecondsFormat(job.schedule)? job.schedule.toLowerCase()- : CronToString(job.schedule.toLowerCase())}+ : CronToString(job.schedule.toLowerCase().replace(/\$/g, 'L'))}</span></TooltipTrigger><TooltipContent side="bottom" align="center">diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobTableCell.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobTableCell.tsxindex 82e0d02d711..0fbfcd134d3 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobTableCell.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobTableCell.tsx@@ -46,9 +46,12 @@ const getNextRun = (schedule: string, lastRun?: string) => {// cron-parser can only deal with the traditional cron syntax but technically users can also// use strings like "30 seconds" now, For the latter case, we try our best to parse the next run// (can't guarantee as scope is quite big)- if (schedule.includes('*')) {+ if (schedule.includes('*') || schedule.includes('$')) {try {- const interval = parser.parseExpression(schedule, { tz: 'UTC' })+ // pg_cron uses '$' for "last day of month", but cron-parser uses 'L'+ // Convert pg_cron syntax to cron-parser syntax before parsing+ const normalizedSchedule = schedule.replace(/\$/g, 'L')+ const interval = parser.parseExpression(normalizedSchedule, { tz: 'UTC' })return interval.next().getTime()} catch (error) {return undefined@@ -89,7 +92,6 @@ export const CronJobTableCell = ({const [showToggleModal, setShowToggleModal] = useState(false)const value = row?.[col.id]- const hasValue = col.id in rowconst { jobid, schedule, latest_run, status, active, jobname } = rowconst formattedValue =@@ -103,6 +105,8 @@ export const CronJobTableCell = ({? getNextRun(schedule, latest_run): value+ const hasValue = col.id === 'next_run' ? !!formattedValue : col.id in row+const { mutate: runCronJob, isPending: isRunning } = useDatabaseCronJobRunCommandMutation({onSuccess: () => {toast.success(`Command from "${jobname}" ran successfully`)diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.constants.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.constants.tsxindex 9def10fbcf7..05a304ba900 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.constants.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.constants.tsx@@ -1,8 +1,11 @@import { EdgeFunctions, RESTApi, SqlEditor } from 'icons'import { ScrollText } from 'lucide-react'-export const cronPattern =- /^(\*|(\d+|\*\/\d+)|\d+\/\d+|\d+-\d+|\d+(,\d+)*)(\s+(\*|(\d+|\*\/\d+)|\d+\/\d+|\d+-\d+|\d+(,\d+)*)){4}$/+const cronField = /(\*|(\d+|\*\/\d+)|\d+\/\d+|\d+-\d+|\d+(,\d+)*)/+const cronDayOfMonth = /(\*|\$|(\d+|\*\/\d+)|\d+\/\d+|\d+-\d+|\d+(,\d+)*)/+export const cronPattern = new RegExp(+ `^${cronField.source}\\s+${cronField.source}\\s+${cronDayOfMonth.source}\\s+${cronField.source}\\s+${cronField.source}$`+)// detect seconds like "10 seconds" or normal cron syntax like "*/5 * * * *"export const secondsPattern = /^\d+\s+seconds*$/diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.utils.test.ts b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.utils.test.tsindex 143b76de9de..48d58231924 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.utils.test.ts+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.utils.test.ts@@ -270,8 +270,23 @@ describe('parseCronJobCommand', () => {{ description: 'every weekend at 10 AM', command: '0 10 * * 0,6' },{ description: 'every quarter hour', command: '*/15 * * * *' },{ description: 'twice daily at 8 AM and 8 PM', command: '0 8,20 * * *' },+ { description: 'last day of every month at midnight (pg_cron $ syntax)', command: '0 0 $ * *' },+ { description: 'last day of every month at noon (pg_cron $ syntax)', command: '0 12 $ * *' },]+ const cronPatternRejectTests = [+ { description: '$ in minute field', command: '$ * * * *' },+ { description: '$ in hour field', command: '* $ * * *' },+ { description: '$ in month field', command: '* * * $ *' },+ { description: '$ in day-of-week field', command: '* * * * $' },+ ]++ cronPatternRejectTests.forEach(({ description, command }) => {+ it(`should not match the regex for a cronPattern with "${description}"`, () => {+ expect(command).not.toMatch(cronPattern)+ })+ })+// Replace the single cronPattern test with forEachcronPatternTests.forEach(({ description, command }) => {it(`should match the regex for a cronPattern with "${description}"`, () => {