diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/create.sql index 691ff5760..b5eb704fb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/create.sql @@ -13,7 +13,6 @@ CREATE FOREIGN TABLE{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ c {% if loop.first %} OPTIONS ({% endif %}{% if not loop.first %}, {% endif %}{{o.option}} {{o.value|qtLiteral(conn)}}{% if loop.last %}){% endif %}{% endif %} {% endfor %}{% endif %} {% if c.attnotnull %} NOT NULL{% endif %} -{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %} {% if c.colconstype == 'g' and c.genexpr and c.genexpr != '' %} GENERATED ALWAYS AS {{c.genexpr}} STORED{% endif %} {% if c.collname %} COLLATE {{c.collname}}{% endif %} @@ -80,27 +79,33 @@ COMMENT ON COLUMN {{conn|qtIdent(data.basensp, data.name, c.name)}} {#===========================================#} {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} +{### Alter SQL for adding sequence to column ###} +{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} +ALTER FOREIGN TABLE IF EXISTS ONLY {{conn|qtIdent(data.basensp, data.name)}} + ALTER COLUMN {{conn|qtIdent(c.name)}} SET DEFAULT {{c.defval}}; +{% endif %} {% if c.description %} -COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}} +COMMENT ON COLUMN {{conn|qtIdent(data.basensp, data.name, c.name)}} IS {{c.description|qtLiteral(conn)}}; {% endif %} {### Add variables to column ###} {% if c.attoptions and c.attoptions|length > 0 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} +ALTER FOREIGN TABLE IF EXISTS {{conn|qtIdent(data.basensp, data.name)}} {{ VARIABLE.SET(conn, 'COLUMN', c.name, c.attoptions) }} {% endif %} {### Alter column statistics value ###} {% if c.attstattarget is defined and c.attstattarget > -1 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} +ALTER FOREIGN TABLE IF EXISTS {{conn|qtIdent(data.basensp, data.name)}} ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET STATISTICS {{c.attstattarget}}; {% endif %} {### Alter column storage value ###} {% if c.attstorage is defined and c.attstorage != c.defaultstorage %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + +ALTER FOREIGN TABLE IF EXISTS {{conn|qtIdent(data.basensp, data.name)}} ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET STORAGE {%if c.attstorage == 'p' %} PLAIN{% elif c.attstorage == 'm'%}MAIN{% elif c.attstorage == 'e'%} EXTERNAL{% elif c.attstorage == 'x'%}EXTENDED{% endif %}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/default/alter_col_opts.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/default/alter_col_opts.sql index 30c4c3e4d..86db65567 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/default/alter_col_opts.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/default/alter_col_opts.sql @@ -22,5 +22,5 @@ GRANT SELECT ON TABLE public."FT1_$%{}[]()&*^!@""'`\/#" TO PUBLIC; GRANT ALL ON TABLE public."FT1_$%{}[]()&*^!@""'`\/#" TO postgres; -ALTER TABLE IF EXISTS "FT1_$%{}[]()&*^!@""'`\/#" +ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#" ALTER COLUMN col1 SET STATISTICS 10; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/default/alter_remove_opts_priv_cons.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/default/alter_remove_opts_priv_cons.sql index 25051edb0..77d17e5ff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/default/alter_remove_opts_priv_cons.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/default/alter_remove_opts_priv_cons.sql @@ -17,5 +17,5 @@ COMMENT ON FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#" GRANT ALL ON TABLE public."FT1_$%{}[]()&*^!@""'`\/#" TO postgres; -ALTER TABLE IF EXISTS "FT1_$%{}[]()&*^!@""'`\/#" +ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#" ALTER COLUMN col1 SET STATISTICS 10; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/default/alter_col_opts.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/default/alter_col_opts.sql index 35136f2dd..b1dd8e524 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/default/alter_col_opts.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/default/alter_col_opts.sql @@ -22,5 +22,5 @@ GRANT SELECT ON TABLE public."FT1_$%{}[]()&*^!@""'`\/#" TO PUBLIC; GRANT ALL ON TABLE public."FT1_$%{}[]()&*^!@""'`\/#" TO enterprisedb; -ALTER TABLE IF EXISTS "FT1_$%{}[]()&*^!@""'`\/#" +ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#" ALTER COLUMN col1 SET STATISTICS 10; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/default/alter_remove_opts_priv_cons.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/default/alter_remove_opts_priv_cons.sql index 128d70c83..37b2bdb75 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/default/alter_remove_opts_priv_cons.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/default/alter_remove_opts_priv_cons.sql @@ -17,5 +17,5 @@ COMMENT ON FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#" GRANT ALL ON TABLE public."FT1_$%{}[]()&*^!@""'`\/#" TO enterprisedb; -ALTER TABLE IF EXISTS "FT1_$%{}[]()&*^!@""'`\/#" +ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#" ALTER COLUMN col1 SET STATISTICS 10; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/15_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/15_plus/create.sql index a58122936..fd9d406f5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/15_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/15_plus/create.sql @@ -12,7 +12,10 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}SEQUENCE{% if add_not_exi MAXVALUE {{data.maximum|int}}{% endif %}{% if data.cache is defined and data.cache|int(-1) > -1%} - CACHE {{data.cache|int}}{% endif %}{% if data.owned_table is defined and data.owned_table != None and data.owned_column is defined and data.owned_column != None %} - - OWNED BY {{ conn|qtIdent(data.schema) }}.{{ conn|qtIdent(data.owned_table) }}.{{ conn|qtIdent(data.owned_column) }}{% endif %}; + CACHE {{data.cache|int}}{% endif %}; +{### Alter SQL for adding OWNED BY to sequence ###} +{% if data.owned_table is defined and data.owned_table != None and data.owned_column is defined and data.owned_column != None %} +ALTER SEQUENCE {{ conn|qtIdent(data.schema, data.name) }} + OWNED BY {{ conn|qtIdent(data.schema) }}.{{ conn|qtIdent(data.owned_table) }}.{{ conn|qtIdent(data.owned_column) }}; +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/15_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/15_plus/update.sql index af6d6b554..891645fc6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/15_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/15_plus/update.sql @@ -11,12 +11,12 @@ ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }} OWNER TO {{ conn|qtIdent(data.seqowner) }}; {% endif %} -{% if (data.owned_table == None) and (data.owned_column == None) %} +{% if (data.owned_table == None and data.owned_column == None) or (data.owned_table == '' and data.owned_column == '')%} ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }} OWNED BY NONE; {% elif (data.owned_table is defined or data.owned_column is defined) and (data.owned_table != o_data.owned_table or data.owned_column != o_data.owned_column) %} ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }} - OWNED BY {% if data.owned_table is defined %}{{ conn|qtIdent(data.owned_table) }}{% else %}{{ conn|qtIdent(o_data.owned_table) }}{% endif %}.{% if data.owned_column is defined %}{{ conn|qtIdent(data.owned_column) }}{% else %}{{ conn|qtIdent(o_data.owned_column) }}{% endif %}; + OWNED BY {{ conn|qtIdent(o_data.schema) }}.{% if data.owned_table is defined %}{{ conn|qtIdent(data.owned_table) }}{% else %}{{ conn|qtIdent(o_data.owned_table) }}{% endif %}.{% if data.owned_column is defined %}{{ conn|qtIdent(data.owned_column) }}{% else %}{{ conn|qtIdent(o_data.owned_column) }}{% endif %}; {% endif %} {% if data.current_value is defined %} {% set seqname = conn|qtIdent(o_data.schema, data.name) %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/create.sql index 9575d1841..992eb6b6e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/create.sql @@ -12,7 +12,10 @@ CREATE SEQUENCE{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|q MAXVALUE {{data.maximum|int}}{% endif %}{% if data.cache is defined and data.cache|int(-1) > -1%} - CACHE {{data.cache|int}}{% endif %}{% if data.owned_table is defined and data.owned_table != None and data.owned_column is defined and data.owned_column != None %} - - OWNED BY {{ conn|qtIdent(data.schema) }}.{{ conn|qtIdent(data.owned_table) }}.{{ conn|qtIdent(data.owned_column) }}{% endif %}; + CACHE {{data.cache|int}}{% endif %}; +{### Alter SQL for adding OWNED BY to sequence ###} +{% if data.owned_table is defined and data.owned_table != None and data.owned_column is defined and data.owned_column != None %} +ALTER SEQUENCE {{ conn|qtIdent(data.schema, data.name) }} + OWNED BY {{ conn|qtIdent(data.schema) }}.{{ conn|qtIdent(data.owned_table) }}.{{ conn|qtIdent(data.owned_column) }}; +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql index dd797fd4e..4dee0445b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql @@ -11,12 +11,12 @@ ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }} OWNER TO {{ conn|qtIdent(data.seqowner) }}; {% endif %} -{% if (data.owned_table == None) and (data.owned_column == None) %} +{% if (data.owned_table == None and data.owned_column == None) or (data.owned_table == '' and data.owned_column == '') %} ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }} OWNED BY NONE; {% elif (data.owned_table is defined or data.owned_column is defined) and (data.owned_table != o_data.owned_table or data.owned_column != o_data.owned_column) %} ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }} - OWNED BY {% if data.owned_table is defined %}{{ conn|qtIdent(data.owned_table) }}{% else %}{{ conn|qtIdent(o_data.owned_table) }}{% endif %}.{% if data.owned_column is defined %}{{ conn|qtIdent(data.owned_column) }}{% else %}{{ conn|qtIdent(o_data.owned_column) }}{% endif %}; + OWNED BY {{ conn|qtIdent(o_data.schema) }}.{% if data.owned_table is defined %}{{ conn|qtIdent(data.owned_table) }}{% else %}{{ conn|qtIdent(o_data.owned_table) }}{% endif %}.{% if data.owned_column is defined %}{{ conn|qtIdent(data.owned_column) }}{% else %}{{ conn|qtIdent(o_data.owned_column) }}{% endif %}; {% endif %} {% if data.current_value is defined %} {% set seqname = conn|qtIdent(o_data.schema, data.name) %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/15_plus/test_sequences_pg.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/15_plus/test_sequences_pg.json index ec80587b9..73147e7cd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/15_plus/test_sequences_pg.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/15_plus/test_sequences_pg.json @@ -284,7 +284,8 @@ "sql_endpoint": "NODE-sequence.sql_id", "msql_endpoint": "NODE-sequence.msql_id", "data": { - "maximum": "900" + "owned_table": "", + "owned_column": "" }, "expected_sql_file": "alter_ownedby_remove.sql", "expected_msql_file": "alter_ownedby_remove_msql.sql" @@ -349,4 +350,3 @@ } ] } - \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_column.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_column.sql index 2cbae0efd..886aab87a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_column.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_column.sql @@ -7,7 +7,9 @@ CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" START 5 MINVALUE 5 MAXVALUE 999 - CACHE 1 + CACHE 1; + +ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" OWNED BY public.tableforownedby.col2; ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_column_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_column_msql.sql index 9dd66793d..cb1d03393 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_column_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_column_msql.sql @@ -1,2 +1,2 @@ ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" - OWNED BY tableforownedby.col2; + OWNED BY public.tableforownedby.col2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_remove.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_remove.sql index 881bb7241..5f9d93a42 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_remove.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_remove.sql @@ -6,9 +6,8 @@ CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" INCREMENT 5 START 5 MINVALUE 5 - MAXVALUE 900 - CACHE 1 - OWNED BY public.tableforownedby.col2; + MAXVALUE 999 + CACHE 1; ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" OWNER TO postgres; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_remove_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_remove_msql.sql index 6356738fd..7d3c6f83e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_remove_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_ownedby_remove_msql.sql @@ -1,2 +1,2 @@ ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" - MAXVALUE 900; + OWNED BY NONE; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby.sql index 56b70c044..24e23cd0d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby.sql @@ -7,7 +7,9 @@ CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" START 5 MINVALUE 5 MAXVALUE 999 - CACHE 1 + CACHE 1; + +ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" OWNED BY public.tableforownedby.col1; ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby_msql.sql index d0671b6dd..54b4cbc6d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby_msql.sql @@ -3,7 +3,9 @@ CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" START 5 MINVALUE 5 MAXVALUE 999 - CACHE 1 + CACHE 1; + +ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" OWNED BY public.tableforownedby.col1; ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby_remove.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby_remove.sql deleted file mode 100644 index 5f9d93a42..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_ownedby_remove.sql +++ /dev/null @@ -1,13 +0,0 @@ --- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# - --- DROP SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"; - -CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" - INCREMENT 5 - START 5 - MINVALUE 5 - MAXVALUE 999 - CACHE 1; - -ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" - OWNER TO postgres; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/test_sequences_pg.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/test_sequences_pg.json index 80cba6cf0..be62cffec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/test_sequences_pg.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/test_sequences_pg.json @@ -67,7 +67,12 @@ "sql_endpoint": "NODE-sequence.sql_id", "msql_endpoint": "NODE-sequence.msql_id", "data": { - "current_value": "7", "increment": "12", "minimum": "2", "maximum": "9992", "cache": "2", "cycled": true + "current_value": "7", + "increment": "12", + "minimum": "2", + "maximum": "9992", + "cache": "2", + "cycled": true }, "expected_sql_file": "alter_seq_props.sql", "expected_msql_file": "alter_seq_props_msql.sql" @@ -124,26 +129,6 @@ "expected_sql_file": "alter_seq_privs_update.sql", "expected_msql_file": "alter_seq_privs_update_msql.sql" }, - { - "type": "alter", - "name": "Alter Sequence remove partial privileges", - "endpoint": "NODE-sequence.obj_id", - "sql_endpoint": "NODE-sequence.sql_id", - "msql_endpoint": "NODE-sequence.msql_id", - "data": { - "relacl": { - "deleted":[{ - "grantee": "PUBLIC", - "grantor": "postgres", - "privileges":[{ - "privilege_type": "r", - "privilege": true, - "with_grant": false - }] - }] - } - } - }, { "type": "alter", "name": "Alter Sequence change grantee in privileges", @@ -284,7 +269,8 @@ "sql_endpoint": "NODE-sequence.sql_id", "msql_endpoint": "NODE-sequence.msql_id", "data": { - "maximum": "900" + "owned_table": "", + "owned_column": "" }, "expected_sql_file": "alter_ownedby_remove.sql", "expected_msql_file": "alter_ownedby_remove_msql.sql" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/15_plus/test_sequences_ppas.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/15_plus/test_sequences_ppas.json index f0a95e354..053861f7c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/15_plus/test_sequences_ppas.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/15_plus/test_sequences_ppas.json @@ -282,7 +282,8 @@ "sql_endpoint": "NODE-sequence.sql_id", "msql_endpoint": "NODE-sequence.msql_id", "data": { - "maximum": "900" + "owned_table": "", + "owned_column": "" }, "expected_sql_file": "alter_ownedby_remove.sql", "expected_msql_file": "alter_ownedby_remove_msql.sql" @@ -347,4 +348,3 @@ } ] } - \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_column.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_column.sql index 80dc9550d..e68b92f0d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_column.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_column.sql @@ -7,7 +7,9 @@ CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" START 5 MINVALUE 5 MAXVALUE 999 - CACHE 1 + CACHE 1; + +ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" OWNED BY public.tableforownedby.col2; ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_column_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_column_msql.sql index 9dd66793d..cb1d03393 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_column_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_column_msql.sql @@ -1,2 +1,2 @@ ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" - OWNED BY tableforownedby.col2; + OWNED BY public.tableforownedby.col2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_remove.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_remove.sql index 02769648f..f99f7d723 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_remove.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_remove.sql @@ -6,9 +6,8 @@ CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" INCREMENT 5 START 5 MINVALUE 5 - MAXVALUE 900 - CACHE 1 - OWNED BY public.tableforownedby.col2; + MAXVALUE 999 + CACHE 1; ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_remove_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_remove_msql.sql index 6356738fd..7d3c6f83e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_remove_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_ownedby_remove_msql.sql @@ -1,2 +1,2 @@ ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" - MAXVALUE 900; + OWNED BY NONE; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby.sql index cc717e12d..24861e2c2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby.sql @@ -7,7 +7,9 @@ CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" START 5 MINVALUE 5 MAXVALUE 999 - CACHE 1 + CACHE 1; + +ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" OWNED BY public.tableforownedby.col1; ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby_msql.sql index bed3cd97e..c788e322a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby_msql.sql @@ -3,7 +3,9 @@ CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" START 5 MINVALUE 5 MAXVALUE 999 - CACHE 1 + CACHE 1; + +ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" OWNED BY public.tableforownedby.col1; ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby_remove.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby_remove.sql deleted file mode 100644 index f99f7d723..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_ownedby_remove.sql +++ /dev/null @@ -1,13 +0,0 @@ --- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# - --- DROP SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"; - -CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#" - INCREMENT 5 - START 5 - MINVALUE 5 - MAXVALUE 999 - CACHE 1; - -ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#" - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/test_sequences_ppas.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/test_sequences_ppas.json index 646557a02..653857312 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/test_sequences_ppas.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/test_sequences_ppas.json @@ -122,26 +122,6 @@ "expected_sql_file": "alter_seq_privs_update.sql", "expected_msql_file": "alter_seq_privs_update_msql.sql" }, - { - "type": "alter", - "name": "Alter Sequence remove partial privileges", - "endpoint": "NODE-sequence.obj_id", - "sql_endpoint": "NODE-sequence.sql_id", - "msql_endpoint": "NODE-sequence.msql_id", - "data": { - "relacl": { - "deleted":[{ - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges":[{ - "privilege_type": "r", - "privilege": true, - "with_grant": false - }] - }] - } - } - }, { "type": "alter", "name": "Alter Sequence change grantee in privileges", @@ -282,7 +262,8 @@ "sql_endpoint": "NODE-sequence.sql_id", "msql_endpoint": "NODE-sequence.msql_id", "data": { - "maximum": "900" + "owned_table": "", + "owned_column": "" }, "expected_sql_file": "alter_ownedby_remove.sql", "expected_msql_file": "alter_ownedby_remove_msql.sql" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/create.sql index ea21997d6..ce0c6c168 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/create.sql @@ -46,7 +46,7 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {% if c.name and c.cltype %} - {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' %} DEFAULT {{c.defval}}{% endif %} + {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %} {% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} {% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} {% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} @@ -158,6 +158,12 @@ COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} {#===========================================#} {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} +{### Alter SQL for adding sequence to column ###} +{% if c.defval is defined and c.defval is not none and c.defval != '' %} + +ALTER TABLE IF EXISTS ONLY {{conn|qtIdent(data.schema, data.name)}} + ALTER COLUMN {{conn|qtIdent(c.name)}} SET DEFAULT {{c.defval}}; +{% endif %} {% if c.description %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql index e3888b550..0edc0e972 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql @@ -52,7 +52,7 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {% if c.name and c.cltype %} - {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %} + {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %} {% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} {% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} {% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} @@ -184,6 +184,12 @@ COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} {#===========================================#} {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} +{### Alter SQL for adding sequence to column ###} +{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} + +ALTER TABLE IF EXISTS ONLY {{conn|qtIdent(data.schema, data.name)}} + ALTER COLUMN {{conn|qtIdent(c.name)}} SET DEFAULT {{c.defval}}; +{% endif %} {% if c.description %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/14_plus/create.sql index 823e1f337..05efb6470 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/14_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/14_plus/create.sql @@ -54,7 +54,7 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {% if c.name and c.cltype %} - {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.attcompression is defined and c.attcompression is not none and c.attcompression != '' %} COMPRESSION {{c.attcompression}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %} + {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.attcompression is defined and c.attcompression is not none and c.attcompression != '' %} COMPRESSION {{c.attcompression}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %} {% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} {% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} {% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} @@ -186,6 +186,12 @@ COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} {#===========================================#} {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} +{### Alter SQL for adding sequence to column ###} +{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} + +ALTER TABLE IF EXISTS ONLY {{conn|qtIdent(data.schema, data.name)}} + ALTER COLUMN {{conn|qtIdent(c.name)}} SET DEFAULT {{c.defval}}; +{% endif %} {% if c.description %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/16_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/16_plus/create.sql index 93ea6ecee..2a681fae5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/16_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/16_plus/create.sql @@ -54,7 +54,7 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {% if c.name and c.cltype %} - {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{%if c.attstorage is defined and c.attstorage != c.defaultstorage%} STORAGE {%if c.attstorage == 'p' %}PLAIN{% elif c.attstorage == 'm'%}MAIN{% elif c.attstorage == 'e'%}EXTERNAL{% elif c.attstorage == 'x'%}EXTENDED{% elif c.attstorage == 'd'%}DEFAULT{% endif %}{% endif %}{% if c.attcompression is defined and c.attcompression is not none and c.attcompression != '' %} COMPRESSION {{c.attcompression}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %} + {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{%if c.attstorage is defined and c.attstorage != c.defaultstorage%} STORAGE {%if c.attstorage == 'p' %}PLAIN{% elif c.attstorage == 'm'%}MAIN{% elif c.attstorage == 'e'%}EXTERNAL{% elif c.attstorage == 'x'%}EXTENDED{% elif c.attstorage == 'd'%}DEFAULT{% endif %}{% endif %}{% if c.attcompression is defined and c.attcompression is not none and c.attcompression != '' %} COMPRESSION {{c.attcompression}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %} {% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} {% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} {% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} @@ -186,6 +186,12 @@ COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} {#===========================================#} {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} +{### Alter SQL for adding sequence to column ###} +{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} + +ALTER TABLE IF EXISTS ONLY {{conn|qtIdent(data.schema, data.name)}} + ALTER COLUMN {{conn|qtIdent(c.name)}} SET DEFAULT {{c.defval}}; +{% endif %} {% if c.description %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql index 3e5763781..72e44bfce 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql @@ -46,7 +46,7 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {% if c.name and c.cltype %} - {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' %} DEFAULT {{c.defval}}{% endif %} + {% if c.inheritedfromtable %}-- Inherited from table {{c.inheritedfromtable}}: {% elif c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %} {% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} {% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} {% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} @@ -157,6 +157,12 @@ COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} {#===========================================#} {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} +{### Alter SQL for adding sequence to column ###} +{% if c.defval is defined and c.defval is not none and c.defval != '' %} + +ALTER TABLE IF EXISTS ONLY {{conn|qtIdent(data.schema, data.name)}} + ALTER COLUMN {{conn|qtIdent(c.name)}} SET DEFAULT {{c.defval}}; +{% endif %} {% if c.description %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}}