From 94051a099169fdc50001b0cf78049bf996e97116 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Fri, 31 Mar 2023 15:34:57 +0530 Subject: [PATCH] Fix failing RE-SQL test cases for pgAgent. --- .../tests/pg/default/alter_seq_props_msql.sql | 2 +- .../ppas/default/alter_seq_props_msql.sql | 2 +- .../templates/macros/pga_exception.macros | 2 +- .../alter_batch_job_schedule_all_options.sql | 12 +- ...er_batch_job_schedule_all_options_msql.sql | 10 +- .../alter_batch_job_step_all_options.sql | 2 +- .../alter_job_schedule_all_options.sql | 16 +- .../alter_job_schedule_all_options_msql.sql | 14 +- ...ter_job_schedule_remote_db_all_options.sql | 12 +- ...ob_schedule_remote_db_all_options_msql.sql | 10 +- .../default/alter_job_step_all_options.sql | 2 +- .../alter_job_step_remote_db_all_options.sql | 2 +- .../default/alter_sql_job_all_options.sql | 2 +- .../alter_sql_job_all_options_msql.sql | 2 +- .../create_batch_job_with_all_options.sql | 12 +- ...create_batch_job_with_all_options_msql.sql | 12 +- .../default/create_batch_job_with_step.sql | 2 +- .../create_batch_job_with_step_msql.sql | 2 +- ...eate_sql_job_local_db_with_all_options.sql | 16 +- ...sql_job_local_db_with_all_options_msql.sql | 16 +- ...ate_sql_job_remote_db_with_all_options.sql | 12 +- ...ql_job_remote_db_with_all_options_msql.sql | 12 +- .../default/create_sql_job_step_remote_db.sql | 2 +- .../create_sql_job_step_remote_db_msql.sql | 2 +- .../create_sql_job_with_step_local_db.sql | 2 +- ...create_sql_job_with_step_local_db_msql.sql | 2 +- web/pgadmin/utils/driver/psycopg3/__init__.py | 2 +- web/regression/re_sql/tests/test_resql.py | 158 +++++++++--------- 28 files changed, 175 insertions(+), 167 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props_msql.sql index 0893a1f28..a94db5b3a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props_msql.sql @@ -1,4 +1,4 @@ -SELECT setval( E'public."Seq1_$%{}[]()&*^!@""''`\\/#"', 7, true); +SELECT setval(E'public."Seq1_$%{}[]()&*^!@""''`\\/#"', 7, true); ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" INCREMENT 12 diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props_msql.sql index 0893a1f28..a94db5b3a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props_msql.sql @@ -1,4 +1,4 @@ -SELECT setval( E'public."Seq1_$%{}[]()&*^!@""''`\\/#"', 7, true); +SELECT setval(E'public."Seq1_$%{}[]()&*^!@""''`\\/#"', 7, true); ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" INCREMENT 12 diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/templates/macros/pga_exception.macros b/web/pgadmin/browser/server_groups/servers/pgagent/templates/macros/pga_exception.macros index 4dc128ea5..8d2bacaf8 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/templates/macros/pga_exception.macros +++ b/web/pgadmin/browser/server_groups/servers/pgagent/templates/macros/pga_exception.macros @@ -2,7 +2,7 @@ {# This will be specific macro for pga_exception. #} {##################################################} {% macro INSERT(jscid, data, conn) -%} --- Inserting a schedule exception {% if jscid %}(schedule: {{ jscid|qtLiteral(conn)}}){% endif %} +-- Inserting a schedule exception{% if jscid %} (schedule: {{ jscid|qtLiteral(conn)}}){% endif %} INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_schedule_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_schedule_all_options.sql index 7c2665c6b..c42d076f4 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_schedule_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_schedule_all_options.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_batch_job_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_batch_job_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps @@ -40,15 +40,15 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_2'::text, 'test schedule_2 comment'::text, true, ''::timestamp with time zone, ''::timestamp with time zone, -- Minutes - ARRAY[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[true,true,false,false,false,false,false]::boolean[], + '{t,t,f,f,f,f,f}'::bool[]::boolean[], -- Month days - ARRAY[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[true,true,false,false,false,false,false,false,false,false,false,false]::boolean[] + '{t,t,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[] ) RETURNING jscid INTO scid; END $$; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_schedule_all_options_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_schedule_all_options_msql.sql index b4a4e7deb..61ef40cae 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_schedule_all_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_schedule_all_options_msql.sql @@ -12,14 +12,14 @@ INSERT INTO pgagent.pga_schedule( , 'schedule_2'::text, 'test schedule_2 comment'::text, true, '2020-04-15 05:11:31 -07:00'::timestamp with time zone, '2020-04-16 05:11:34 -07:00'::timestamp with time zone, -- Minutes - ARRAY[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[true,true,false,false,false,false,false]::boolean[], + '{t,t,f,f,f,f,f}'::bool[]::boolean[], -- Month days - ARRAY[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[true,true,false,false,false,false,false,false,false,false,false,false]::boolean[] + '{t,t,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[] ) RETURNING jscid INTO scid;END $$; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_step_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_step_all_options.sql index e186d7bad..8fbddcf37 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_step_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_batch_job_step_all_options.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_batch_job_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_batch_job_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_all_options.sql index 791e3a744..e5607a1db 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_all_options.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 4::integer, 'test_sql_job_local_db_updated_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description updated'::text, 'test_host_updated'::text, false + 4::integer, E'test_sql_job_local_db_updated_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description updated'::text, 'test_host_updated'::text, false ) RETURNING jobid INTO jid; -- Steps @@ -40,23 +40,23 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_2'::text, 'test schedule_2 comment'::text, false, ''::timestamp with time zone, ''::timestamp with time zone, -- Minutes - ARRAY[false,false,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[false,false,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false]::boolean[], + '{f,f,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[false,false,true,true,true,true,true]::boolean[], + '{f,f,t,t,t,t,t}'::bool[]::boolean[], -- Month days - ARRAY[false,false,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[false,false,true,true,true,true,true,true,true,true,true,true]::boolean[] + '{f,f,t,t,t,t,t,t,t,t,t,t}'::bool[]::boolean[] ) RETURNING jscid INTO scid; --- Inserting a schedule exception +-- Inserting a schedule exception INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime ) VALUES ( scid, to_date('2020-04-22', 'YYYY-MM-DD')::date, '01:22:00'::time without time zone ); --- Inserting a schedule exception +-- Inserting a schedule exception INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime ) VALUES ( diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_all_options_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_all_options_msql.sql index ff7983372..3fe129a0e 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_all_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_all_options_msql.sql @@ -12,23 +12,23 @@ INSERT INTO pgagent.pga_schedule( , 'schedule_2'::text, 'test schedule_2 comment'::text, false, '2020-04-14 05:11:31 -07:00'::timestamp with time zone, '2020-04-15 05:11:34 -07:00'::timestamp with time zone, -- Minutes - ARRAY[false,false,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[false,false,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false]::boolean[], + '{f,f,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[false,false,true,true,true,true,true]::boolean[], + '{f,f,t,t,t,t,t}'::bool[]::boolean[], -- Month days - ARRAY[false,false,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[false,false,true,true,true,true,true,true,true,true,true,true]::boolean[] + '{f,f,t,t,t,t,t,t,t,t,t,t}'::bool[]::boolean[] ) RETURNING jscid INTO scid; --- Inserting a schedule exception +-- Inserting a schedule exception INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime ) VALUES ( scid, to_date('2020-04-22', 'YYYY-MM-DD')::date, '01:22:00'::time without time zone ); --- Inserting a schedule exception +-- Inserting a schedule exception INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime ) VALUES ( diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_remote_db_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_remote_db_all_options.sql index ac3730ac0..b6d0744c0 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_remote_db_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_remote_db_all_options.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_remote_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_remote_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps @@ -40,15 +40,15 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_2'::text, 'test schedule_2 comment'::text, true, ''::timestamp with time zone, ''::timestamp with time zone, -- Minutes - ARRAY[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[false,false,false,false,false,false,false]::boolean[], + '{f,f,f,f,f,f,f}'::bool[]::boolean[], -- Month days - ARRAY[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[false,false,false,false,false,false,false,false,false,false,false,false]::boolean[] + '{f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[] ) RETURNING jscid INTO scid; END $$; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_remote_db_all_options_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_remote_db_all_options_msql.sql index 458450cb3..1334c288c 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_remote_db_all_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_schedule_remote_db_all_options_msql.sql @@ -12,14 +12,14 @@ INSERT INTO pgagent.pga_schedule( , 'schedule_2'::text, 'test schedule_2 comment'::text, true, '2020-04-15 05:11:31 -07:00'::timestamp with time zone, '2020-04-16 05:11:34 -07:00'::timestamp with time zone, -- Minutes - ARRAY[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[false,false,false,false,false,false,false]::boolean[], + '{f,f,f,f,f,f,f}'::bool[]::boolean[], -- Month days - ARRAY[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[false,false,false,false,false,false,false,false,false,false,false,false]::boolean[] + '{f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[] ) RETURNING jscid INTO scid;END $$; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_step_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_step_all_options.sql index df33c8fa7..57797b6d0 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_step_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_step_all_options.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 4::integer, 'test_sql_job_local_db_updated_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description updated'::text, 'test_host_updated'::text, false + 4::integer, E'test_sql_job_local_db_updated_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description updated'::text, 'test_host_updated'::text, false ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_step_remote_db_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_step_remote_db_all_options.sql index 3c1b24bc1..248b7740c 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_step_remote_db_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_job_step_remote_db_all_options.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_remote_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_remote_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_sql_job_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_sql_job_all_options.sql index 7a941f261..09cd8bf8a 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_sql_job_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_sql_job_all_options.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 4::integer, 'test_sql_job_local_db_updated_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description updated'::text, 'test_host_updated'::text, false + 4::integer, E'test_sql_job_local_db_updated_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description updated'::text, 'test_host_updated'::text, false ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_sql_job_all_options_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_sql_job_all_options_msql.sql index f28a52947..09e861b5c 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_sql_job_all_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/alter_sql_job_all_options_msql.sql @@ -1,3 +1,3 @@ UPDATE pgagent.pga_job -SET jobjclid=4::integer, jobname='test_sql_job_local_db_updated_$%{}[]()&*^!@""''`\/#'::text, jobdesc='test_job_step_schedule description updated'::text, jobhostagent='test_host_updated'::text, jobenabled=false +SET jobjclid=4::integer, jobname=E'test_sql_job_local_db_updated_$%{}[]()&*^!@""''`\\/#'::text, jobdesc='test_job_step_schedule description updated'::text, jobhostagent='test_host_updated'::text, jobenabled=false WHERE jobid = ; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_all_options.sql index e901cca4b..006c5a083 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_all_options.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_batch_job_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_batch_job_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps @@ -31,15 +31,15 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_1'::text, 'test schedule comment'::text, true, ''::timestamp with time zone, ''::timestamp with time zone, -- Minutes - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[true,true,true,true,true,true,true]::boolean[], + '{t,t,t,t,t,t,t}'::bool[]::boolean[], -- Month days - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true]::boolean[] + '{t,t,t,t,t,t,t,t,t,t,t,t}'::bool[]::boolean[] ) RETURNING jscid INTO scid; END $$; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_all_options_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_all_options_msql.sql index 4f9815a86..e95cf520b 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_all_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_all_options_msql.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_batch_job_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_batch_job_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps @@ -31,15 +31,15 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_1'::text, 'test schedule comment'::text, true, '2020-04-14 01:11:31 -07:00'::timestamp with time zone, '2020-04-15 01:11:34 -07:00'::timestamp with time zone, -- Minutes - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[true,true,true,true,true,true,true]::boolean[], + '{t,t,t,t,t,t,t}'::bool[]::boolean[], -- Month days - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true]::boolean[] + '{t,t,t,t,t,t,t,t,t,t,t,t}'::bool[]::boolean[] ) RETURNING jscid INTO scid; END $$; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_step.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_step.sql index 454c9330b..0e92ec875 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_step.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_step.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_batch_job_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_batch_job_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_step_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_step_msql.sql index 454c9330b..0e92ec875 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_step_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_batch_job_with_step_msql.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_batch_job_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_batch_job_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_local_db_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_local_db_with_all_options.sql index 1a8af3f6f..a3a23c37b 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_local_db_with_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_local_db_with_all_options.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_local_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_local_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps @@ -31,23 +31,23 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_1'::text, 'test schedule comment'::text, true, ''::timestamp with time zone, ''::timestamp with time zone, -- Minutes - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[true,true,true,true,true,true,true]::boolean[], + '{t,t,t,t,t,t,t}'::bool[]::boolean[], -- Month days - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true]::boolean[] + '{t,t,t,t,t,t,t,t,t,t,t,t}'::bool[]::boolean[] ) RETURNING jscid INTO scid; --- Inserting a schedule exception +-- Inserting a schedule exception INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime ) VALUES ( scid, to_date('2020-04-18', 'YYYY-MM-DD')::date, '01:18:00'::time without time zone ); --- Inserting a schedule exception +-- Inserting a schedule exception INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime ) VALUES ( diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_local_db_with_all_options_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_local_db_with_all_options_msql.sql index 7fa76008b..41020f647 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_local_db_with_all_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_local_db_with_all_options_msql.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_local_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_local_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps @@ -31,23 +31,23 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_1'::text, 'test schedule comment'::text, true, '2020-04-14 01:11:31 -07:00'::timestamp with time zone, '2020-04-15 01:11:34 -07:00'::timestamp with time zone, -- Minutes - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[true,true,true,true,true,true,true]::boolean[], + '{t,t,t,t,t,t,t}'::bool[]::boolean[], -- Month days - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true]::boolean[] + '{t,t,t,t,t,t,t,t,t,t,t,t}'::bool[]::boolean[] ) RETURNING jscid INTO scid; --- Inserting a schedule exception +-- Inserting a schedule exception INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime ) VALUES ( scid, to_date('2020-04-18', 'YYYY-MM-DD')::date, '01:18:00'::time without time zone ); --- Inserting a schedule exception +-- Inserting a schedule exception INSERT INTO pgagent.pga_exception ( jexscid, jexdate, jextime ) VALUES ( diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_remote_db_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_remote_db_with_all_options.sql index 2dba4730c..9e0388979 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_remote_db_with_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_remote_db_with_all_options.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_remote_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_remote_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps @@ -31,15 +31,15 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_1'::text, 'test schedule comment'::text, true, ''::timestamp with time zone, ''::timestamp with time zone, -- Minutes - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[true,true,true,true,true,true,true]::boolean[], + '{t,t,t,t,t,t,t}'::bool[]::boolean[], -- Month days - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true]::boolean[] + '{t,t,t,t,t,t,t,t,t,t,t,t}'::bool[]::boolean[] ) RETURNING jscid INTO scid; END $$; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_remote_db_with_all_options_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_remote_db_with_all_options_msql.sql index e8e6a71df..18b7dc6ba 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_remote_db_with_all_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_remote_db_with_all_options_msql.sql @@ -7,7 +7,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_remote_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_remote_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps @@ -31,15 +31,15 @@ INSERT INTO pgagent.pga_schedule( jid, 'schedule_1'::text, 'test schedule comment'::text, true, '2020-04-14 01:11:31 -07:00'::timestamp with time zone, '2020-04-15 01:11:34 -07:00'::timestamp with time zone, -- Minutes - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Hours - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f}'::bool[]::boolean[], -- Week days - ARRAY[true,true,true,true,true,true,true]::boolean[], + '{t,t,t,t,t,t,t}'::bool[]::boolean[], -- Month days - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false]::boolean[], + '{t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,f,f,f,f,f,f,f,f,f,f,f,f}'::bool[]::boolean[], -- Months - ARRAY[true,true,true,true,true,true,true,true,true,true,true,true]::boolean[] + '{t,t,t,t,t,t,t,t,t,t,t,t}'::bool[]::boolean[] ) RETURNING jscid INTO scid; END $$; diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_step_remote_db.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_step_remote_db.sql index 819c7ba6d..4282d21ab 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_step_remote_db.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_step_remote_db.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_remote_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_remote_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_step_remote_db_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_step_remote_db_msql.sql index 819c7ba6d..4282d21ab 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_step_remote_db_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_step_remote_db_msql.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_remote_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_remote_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_with_step_local_db.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_with_step_local_db.sql index 3a6556e2e..f3db43187 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_with_step_local_db.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_with_step_local_db.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_local_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_local_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_with_step_local_db_msql.sql b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_with_step_local_db_msql.sql index 3a6556e2e..f3db43187 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_with_step_local_db_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/default/create_sql_job_with_step_local_db_msql.sql @@ -6,7 +6,7 @@ BEGIN INSERT INTO pgagent.pga_job( jobjclid, jobname, jobdesc, jobhostagent, jobenabled ) VALUES ( - 1::integer, 'test_sql_job_local_db_$%{}[]()&*^!@""''`\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true + 1::integer, E'test_sql_job_local_db_$%{}[]()&*^!@""''`\\/#'::text, 'test_job_step_schedule description'::text, 'test_host'::text, true ) RETURNING jobid INTO jid; -- Steps diff --git a/web/pgadmin/utils/driver/psycopg3/__init__.py b/web/pgadmin/utils/driver/psycopg3/__init__.py index 5431c831f..4eb9ebaf2 100644 --- a/web/pgadmin/utils/driver/psycopg3/__init__.py +++ b/web/pgadmin/utils/driver/psycopg3/__init__.py @@ -281,7 +281,7 @@ class Driver(BaseDriver): try: if type(conn) != psycopg.Connection: conn = conn.conn - res = psycopg.sql.Literal(value).as_string(conn) + res = psycopg.sql.Literal(value).as_string(conn).strip() except Exception: print("Exception", value) diff --git a/web/regression/re_sql/tests/test_resql.py b/web/regression/re_sql/tests/test_resql.py index 056c353a6..260f064f2 100644 --- a/web/regression/re_sql/tests/test_resql.py +++ b/web/regression/re_sql/tests/test_resql.py @@ -266,91 +266,99 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): else: print(scenario['name'] + " (MSQL) ... ok") - if 'type' in scenario and scenario['type'] == 'create': - # Get the url and create the specific node. + try: + if 'type' in scenario and scenario['type'] == 'create': + # Get the url and create the specific node. - create_url = self.get_url(scenario['endpoint']) - response = self.tester.post(create_url, - data=json.dumps(scenario['data']), - content_type='html/json') - try: - self.assertEqual(response.status_code, 200) - except Exception as e: - response = self.tester.post(create_url, - data=json.dumps( - scenario['data']), - content_type='html/json') - self.final_test_status = False - print(scenario['name'] + "... FAIL") - traceback.print_exc() - continue + create_url = self.get_url(scenario['endpoint']) + response = self.tester.post( + create_url, data=json.dumps(scenario['data']), + content_type='html/json') + try: + self.assertEqual(response.status_code, 200) + except Exception as e: + response = self.tester.post(create_url, + data=json.dumps( + scenario['data']), + content_type='html/json') + self.final_test_status = False + print(scenario['name'] + "... FAIL") + traceback.print_exc() + continue - resp_data = json.loads(response.data.decode('utf8')) - object_id = resp_data['node']['_id'] + resp_data = json.loads(response.data.decode('utf8')) + print('object_id set', object_id) + object_id = resp_data['node']['_id'] - # Store the object id based on endpoints - if 'store_object_id' in scenario: - self.store_object_ids(object_id, - scenario['data'], - scenario['endpoint']) + # Store the object id based on endpoints + if 'store_object_id' in scenario: + self.store_object_ids(object_id, + scenario['data'], + scenario['endpoint']) - # Compare the reverse engineering SQL - if not self.check_re_sql(scenario, object_id): - print(scenario['name'] + "... FAIL") + # Compare the reverse engineering SQL + if not self.check_re_sql(scenario, object_id): + print(scenario['name'] + "... FAIL") - if 'expected_sql_file' in scenario: - print_msg = " - Expected SQL File: " + \ - os.path.join(self.test_folder, - scenario['expected_sql_file']) - print(print_msg) - continue - elif 'type' in scenario and scenario['type'] == 'alter': - # Get the url and create the specific node. + if 'expected_sql_file' in scenario: + print_msg = " - Expected SQL File: " + \ + os.path.join( + self.test_folder, + scenario['expected_sql_file']) + print(print_msg) + continue + elif 'type' in scenario and scenario['type'] == 'alter': + # Get the url and create the specific node. - alter_url = self.get_url(scenario['endpoint'], object_id) - response = self.tester.put(alter_url, - data=json.dumps(scenario['data']), - follow_redirects=True) - try: - self.assertEqual(response.status_code, 200) - except Exception as e: - self.final_test_status = False alter_url = self.get_url(scenario['endpoint'], object_id) - response = self.tester.put(alter_url, - data=json.dumps( - scenario['data']), - follow_redirects=True) - print(scenario['name'] + "... FAIL") - traceback.print_exc() - continue + response = self.tester.put( + alter_url, data=json.dumps(scenario['data']), + follow_redirects=True) + try: + self.assertEqual(response.status_code, 200) + except Exception as e: + self.final_test_status = False + alter_url = self.get_url( + scenario['endpoint'], object_id) + response = self.tester.put(alter_url, + data=json.dumps( + scenario['data']), + follow_redirects=True) + print(scenario['name'] + "... FAIL") + traceback.print_exc() + continue - resp_data = json.loads(response.data.decode('utf8')) - object_id = resp_data['node']['_id'] + resp_data = json.loads(response.data.decode('utf8')) + object_id = resp_data['node']['_id'] - # Compare the reverse engineering SQL - if not self.check_re_sql(scenario, object_id): - print_msg = scenario['name'] - if 'expected_sql_file' in scenario: - print_msg = print_msg + " Expected SQL File:" + \ - scenario['expected_sql_file'] - print_msg = print_msg + "... FAIL" - print(print_msg) - continue - elif 'type' in scenario and scenario['type'] == 'delete': - # Get the delete url and delete the object created above. - delete_url = self.get_url(scenario['endpoint'], object_id) - delete_response = self.tester.delete( - delete_url, data=json.dumps(scenario.get('data', {})), - follow_redirects=True) - try: - self.assertEqual(delete_response.status_code, 200) - except Exception as e: - self.final_test_status = False - print(scenario['name'] + "... FAIL") - traceback.print_exc() - continue + # Compare the reverse engineering SQL + if not self.check_re_sql(scenario, object_id): + print_msg = scenario['name'] + if 'expected_sql_file' in scenario: + print_msg = \ + print_msg + " Expected SQL File:" + \ + scenario['expected_sql_file'] + print_msg = print_msg + "... FAIL" + print(print_msg) + continue + elif 'type' in scenario and scenario['type'] == 'delete': + # Get the delete url and delete the object created above. + delete_url = self.get_url(scenario['endpoint'], object_id) + delete_response = self.tester.delete( + delete_url, data=json.dumps(scenario.get('data', {})), + follow_redirects=True) + try: + self.assertEqual(delete_response.status_code, 200) + except Exception as e: + self.final_test_status = False + print(scenario['name'] + "... FAIL") + traceback.print_exc() + continue - print(scenario['name'] + "... ok") + print(scenario['name'] + "... ok") + except Exception as _: + print(scenario['name'] + "... FAIL") + raise def get_test_folder(self, module_path): """