fix resubmit at null

Author: Vladimir Ershov

src/scheduler_job.c

@@ -588,10 +588,34 @@ int set_at_job_done(job_t *job, char *error, int64 resubmit, char **set_error)
 	spi_response_t *r2;
 	spi_response_t *r3;
 
-	const char *get_sql = "select * from at_jobs_process where id = $1";
-	const char *insert_sql = "insert into at_jobs_done values($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21)";
+
+
+
+	const char *get_sql = "\
+		select \
+			id, node, name, comments, at, do_sql, params, depends_on, \
+			executor, owner, last_start_available, attempt, resubmit_limit, \
+			postpone,  max_run_time, canceled, submit_time, start_time \
+		from at_jobs_process where id = $1";
+
+	const char *insert_sql = "\
+		insert into at_jobs_done \
+			(id, node, name, comments, at, do_sql, params, depends_on, \
+			 executor, owner, last_start_available, attempt, resubmit_limit, \
+			 postpone,  max_run_time, canceled, submit_time, start_time, \
+			 status, reason, done_time) \
+		values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, \
+			$15, $16, $17, $18, $19, $20, $21)";
 	const char *delete_sql = "delete from at_jobs_process where id = $1";
-	const char *resubmit_sql = "insert into at_jobs_submitted values($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)";
+
+	const char *resubmit_sql = "\
+		insert into at_jobs_submitted \
+			(id, node, name, comments, at, do_sql, params, depends_on, \
+			 executor, owner, last_start_available, attempt, resubmit_limit, \
+			 postpone,  max_run_time, canceled, submit_time) \
+		values \
+			($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, \
+			$15, $16, $17)";
 
 	oldpath = set_schema(NULL, true);
 
@@ -636,7 +660,7 @@ int set_at_job_done(job_t *job, char *error, int64 resubmit, char **set_error)
 	{
 		if(canceled)
 		{
-			this_error = _mcopy_string(CurrentMemoryContext, "job was canceled while processing: cannot resubmit");
+			this_error = _mcopy_string(CurrentMemoryContext, "job was cancelled while processing: cannot resubmit");
 			sql = insert_sql;
 			n = 21;
 
@@ -649,6 +673,7 @@ int set_at_job_done(job_t *job, char *error, int64 resubmit, char **set_error)
 			sql = resubmit_sql;
 			values[4] = TimestampTzGetDatum(timestamp_add_seconds(0, resubmit));
 			values[11] = Int64GetDatum(job->attempt + 1);
+			nulls[4] = nulls[11] = ' ';
 			n = 17;
 		}
 		else