public inbox for [email protected]help / color / mirror / Atom feed
[pgAdmin][RM7031]: Database definition wrong 5+ messages / 3 participants [nested] [flat]
* [pgAdmin][RM7031]: Database definition wrong @ 2021-12-01 10:52 Pradip Parkale <[email protected]> 0 siblings, 1 reply; 5+ messages in thread From: Pradip Parkale @ 2021-12-01 10:52 UTC (permalink / raw) To: pgadmin-hackers Hi Hackers, Please find the attached for #7031 Database definition wrong. -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation Attachments: [application/octet-stream] RM7031.patch (3.8K, 3-RM7031.patch) download | inline diff: diff --git a/web/migrations/versions/35f29b1701bd_.py b/web/migrations/versions/35f29b1701bd_.py index 1180e7d89..653718e20 100644 --- a/web/migrations/versions/35f29b1701bd_.py +++ b/web/migrations/versions/35f29b1701bd_.py @@ -21,7 +21,10 @@ depends_on = None def upgrade(): - db.engine.execute("ALTER TABLE user RENAME TO user_old") + + db.engine.execute("create table user_old as select * from user") + + db.engine.execute("DROP TABLE user") db.engine.execute(""" CREATE TABLE user ( @@ -46,6 +49,12 @@ def upgrade(): db.engine.execute("DROP TABLE user_old") + # db.engine.execute("PRAGMA foreign_keys=ON") + + # db.session.commit() + + # db.engine.execute("PRAGMA foreign_keys=ON") + def downgrade(): # pgAdmin only upgrades, downgrade not implemented. diff --git a/web/migrations/versions/3ce25f562f3b_.py b/web/migrations/versions/3ce25f562f3b_.py new file mode 100644 index 000000000..bf4f266d8 --- /dev/null +++ b/web/migrations/versions/3ce25f562f3b_.py @@ -0,0 +1,36 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2021, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +"""empty message + +Revision ID: 3ce25f562f3b +Revises: 6650c52670c2 +Create Date: 2021-12-01 11:52:09.037749 + +""" +from pgadmin.model import db + +# revision identifiers, used by Alembic. +revision = '3ce25f562f3b' +down_revision = '6650c52670c2' +branch_labels = None +depends_on = None + + +def upgrade(): + db.engine.execute("create table user_old as select * from user") + + db.engine.execute("DROP TABLE user") + + db.engine.execute("ALTER TABLE user_old RENAME TO user") + + +def downgrade(): + # pgAdmin only upgrades, downgrade not implemented. + pass diff --git a/web/migrations/versions/7fedf8531802_.py b/web/migrations/versions/7fedf8531802_.py index 4d055c829..222f59d8e 100644 --- a/web/migrations/versions/7fedf8531802_.py +++ b/web/migrations/versions/7fedf8531802_.py @@ -19,7 +19,9 @@ depends_on = None def upgrade(): - db.engine.execute("ALTER TABLE user RENAME TO user_old") + db.engine.execute("create table user_old as select * from user") + + db.engine.execute("DROP TABLE user") db.engine.execute(""" CREATE TABLE user ( diff --git a/web/migrations/versions/c465fee44968_.py b/web/migrations/versions/c465fee44968_.py index c2abe767a..de5b763d2 100644 --- a/web/migrations/versions/c465fee44968_.py +++ b/web/migrations/versions/c465fee44968_.py @@ -19,7 +19,10 @@ depends_on = None def upgrade(): - db.engine.execute("ALTER TABLE user RENAME TO user_old") + + db.engine.execute("create table user_old as select * from user") + + db.engine.execute("DROP TABLE user") db.engine.execute(""" CREATE TABLE user ( @@ -48,7 +51,6 @@ def upgrade(): confirmed_at, masterpass_check, auth_source, fs_uniquifier) VALUES(:id, :username, :email, :password, :active, :confirmed_at, :masterpass_check, :auth_source, :fs_uniquifier)""") - db.engine.execute(statement, [ { **row, @@ -58,7 +60,6 @@ def upgrade(): db.engine.execute("DROP TABLE user_old") - def downgrade(): # pgAdmin only upgrades, downgrade not implemented. pass diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py index aea32c1e1..58c309bbd 100644 --- a/web/pgadmin/model/__init__.py +++ b/web/pgadmin/model/__init__.py @@ -30,7 +30,7 @@ import uuid # ########################################################################## -SCHEMA_VERSION = 31 +SCHEMA_VERSION = 32 ########################################################################## # ^ permalink raw reply [nested|flat] 5+ messages in thread
* Re: [pgAdmin][RM7031]: Database definition wrong @ 2021-12-01 11:55 Akshay Joshi <[email protected]> parent: Pradip Parkale <[email protected]> 0 siblings, 1 reply; 5+ messages in thread From: Akshay Joshi @ 2021-12-01 11:55 UTC (permalink / raw) To: Pradip Parkale <[email protected]>; +Cc: pgadmin-hackers Thanks, the patch applied. On Wed, Dec 1, 2021 at 4:23 PM Pradip Parkale < [email protected]> wrote: > Hi Hackers, > > Please find the attached for #7031 Database definition wrong. > > -- > Thanks & Regards, > Pradip Parkale > Software Engineer | EnterpriseDB Corporation > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Principal Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* ^ permalink raw reply [nested|flat] 5+ messages in thread
* Re: [pgAdmin][RM7031]: Database definition wrong @ 2021-12-01 12:26 Aditya Toshniwal <[email protected]> parent: Akshay Joshi <[email protected]> 0 siblings, 1 reply; 5+ messages in thread From: Aditya Toshniwal @ 2021-12-01 12:26 UTC (permalink / raw) To: Pradip Parkale <[email protected]>; +Cc: pgadmin-hackers; Akshay Joshi <[email protected]> Hi Pradip, You did not include the server_old table for query_history. Please also remove the commented code: + # db.engine.execute("PRAGMA foreign_keys=ON") + + # db.session.commit() + + # db.engine.execute("PRAGMA foreign_keys=ON") + On Wed, Dec 1, 2021 at 5:25 PM Akshay Joshi <[email protected]> wrote: > Thanks, the patch applied. > > On Wed, Dec 1, 2021 at 4:23 PM Pradip Parkale < > [email protected]> wrote: > >> Hi Hackers, >> >> Please find the attached for #7031 Database definition wrong. >> >> -- >> Thanks & Regards, >> Pradip Parkale >> Software Engineer | EnterpriseDB Corporation >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Principal Software Architect* > *EDB Postgres <http://edbpostgres.com>* > > *Mobile: +91 976-788-8246* > -- Thanks, Aditya Toshniwal pgAdmin Hacker | Software Architect | *edbpostgres.com* <http://edbpostgres.com; "Don't Complain about Heat, Plant a TREE" ^ permalink raw reply [nested|flat] 5+ messages in thread
* Re: [pgAdmin][RM7031]: Database definition wrong @ 2021-12-02 09:39 Pradip Parkale <[email protected]> parent: Aditya Toshniwal <[email protected]> 0 siblings, 1 reply; 5+ messages in thread From: Pradip Parkale @ 2021-12-02 09:39 UTC (permalink / raw) To: Aditya Toshniwal <[email protected]>; +Cc: pgadmin-hackers; Akshay Joshi <[email protected]> Hi Akshay/Aditya, Please find the updated patch. On Wed, Dec 1, 2021 at 5:56 PM Aditya Toshniwal < [email protected]> wrote: > Hi Pradip, > > You did not include the server_old table for query_history. > Fixed. > Please also remove the commented code: > + # db.engine.execute("PRAGMA foreign_keys=ON") > + > + # db.session.commit() > + > + # db.engine.execute("PRAGMA foreign_keys=ON") > + > Fixed. > > > > On Wed, Dec 1, 2021 at 5:25 PM Akshay Joshi <[email protected]> > wrote: > >> Thanks, the patch applied. >> >> On Wed, Dec 1, 2021 at 4:23 PM Pradip Parkale < >> [email protected]> wrote: >> >>> Hi Hackers, >>> >>> Please find the attached for #7031 Database definition wrong. >>> >>> -- >>> Thanks & Regards, >>> Pradip Parkale >>> Software Engineer | EnterpriseDB Corporation >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> *pgAdmin Hacker | Principal Software Architect* >> *EDB Postgres <http://edbpostgres.com>* >> >> *Mobile: +91 976-788-8246* >> > > > -- > Thanks, > Aditya Toshniwal > pgAdmin Hacker | Software Architect | *edbpostgres.com* > <http://edbpostgres.com; > "Don't Complain about Heat, Plant a TREE" > -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation Attachments: [application/octet-stream] RM7031_v2.patch (5.2K, 3-RM7031_v2.patch) download | inline diff: diff --git a/web/migrations/versions/09d53fca90c7_.py b/web/migrations/versions/09d53fca90c7_.py index 3214754f1..b797b6183 100644 --- a/web/migrations/versions/09d53fca90c7_.py +++ b/web/migrations/versions/09d53fca90c7_.py @@ -47,7 +47,12 @@ def upgrade(): if version < 5: db.engine.execute('ALTER TABLE server ADD COLUMN role text(64)') if version < 6: - db.engine.execute("ALTER TABLE server RENAME TO server_old") + # To Save previous data, create temp table + + db.engine.execute("create table server_old as select * from server") + + db.engine.execute("DROP TABLE server") + db.engine.execute(""" CREATE TABLE server ( id INTEGER NOT NULL, @@ -161,7 +166,10 @@ def upgrade(): """) if version < 12: - db.engine.execute("ALTER TABLE server RENAME TO server_old") + db.engine.execute("create table server_old as select * from server") + + db.engine.execute("DROP TABLE server") + db.engine.execute(""" CREATE TABLE server ( id INTEGER NOT NULL, diff --git a/web/migrations/versions/35f29b1701bd_.py b/web/migrations/versions/35f29b1701bd_.py index 653718e20..0599a3434 100644 --- a/web/migrations/versions/35f29b1701bd_.py +++ b/web/migrations/versions/35f29b1701bd_.py @@ -49,12 +49,6 @@ def upgrade(): db.engine.execute("DROP TABLE user_old") - # db.engine.execute("PRAGMA foreign_keys=ON") - - # db.session.commit() - - # db.engine.execute("PRAGMA foreign_keys=ON") - def downgrade(): # pgAdmin only upgrades, downgrade not implemented. diff --git a/web/migrations/versions/3ce25f562f3b_.py b/web/migrations/versions/3ce25f562f3b_.py index bf4f266d8..e47651041 100644 --- a/web/migrations/versions/3ce25f562f3b_.py +++ b/web/migrations/versions/3ce25f562f3b_.py @@ -24,12 +24,19 @@ depends_on = None def upgrade(): - db.engine.execute("create table user_old as select * from user") + # Rename user table to user_old and again user_old to user to change + # the foreign key refernce of user_old table which is not exists - db.engine.execute("DROP TABLE user") + db.engine.execute("ALTER TABLE user RENAME TO user_old") db.engine.execute("ALTER TABLE user_old RENAME TO user") + # Rename server table to server_old and again server_old to server to change + # the foreign key refernce of server_old table which is not exists + db.engine.execute("ALTER TABLE server RENAME TO server_old") + + db.engine.execute("ALTER TABLE server_old RENAME TO server") + def downgrade(): # pgAdmin only upgrades, downgrade not implemented. diff --git a/web/migrations/versions/50aad68f99c2_.py b/web/migrations/versions/50aad68f99c2_.py index cadd2e445..a308dc34f 100644 --- a/web/migrations/versions/50aad68f99c2_.py +++ b/web/migrations/versions/50aad68f99c2_.py @@ -17,8 +17,11 @@ depends_on = None def upgrade(): - # To Save previous data - db.engine.execute("ALTER TABLE server RENAME TO server_old") + # To Save previous data, create temp table + + db.engine.execute("create table server_old as select * from server") + + db.engine.execute("DROP TABLE server") # With service file some fields won't be mandatory as user can provide # them using service file. Removed NOT NULL constraint from few columns diff --git a/web/migrations/versions/7c56ea250085_.py b/web/migrations/versions/7c56ea250085_.py index 54a08588c..7d0b6f647 100644 --- a/web/migrations/versions/7c56ea250085_.py +++ b/web/migrations/versions/7c56ea250085_.py @@ -19,8 +19,11 @@ depends_on = None def upgrade(): - # To Save previous data - db.engine.execute("ALTER TABLE server RENAME TO server_old") + # To Save previous data, create temp table + + db.engine.execute("create table server_old as select * from server") + + db.engine.execute("DROP TABLE server") # Create table with new constraint definition db.engine.execute(""" diff --git a/web/migrations/versions/a39bd015b644_.py b/web/migrations/versions/a39bd015b644_.py index da887ab2d..a6f2796e1 100644 --- a/web/migrations/versions/a39bd015b644_.py +++ b/web/migrations/versions/a39bd015b644_.py @@ -17,8 +17,13 @@ depends_on = None def upgrade(): - # Rename older table to save previous data - db.engine.execute("ALTER TABLE sharedserver RENAME TO sharedserver_old") + + # To Save previous data, create temp table + + db.engine.execute("create table sharedserver_old as " + "select * from sharedserver") + + db.engine.execute("DROP TABLE sharedserver") # Create new table with removed not null constraints for port column. db.engine.execute(""" diff --git a/web/migrations/versions/a77a0932a568_.py b/web/migrations/versions/a77a0932a568_.py index 2702aa279..ff7fa392c 100644 --- a/web/migrations/versions/a77a0932a568_.py +++ b/web/migrations/versions/a77a0932a568_.py @@ -19,8 +19,10 @@ depends_on = None def upgrade(): - # To Save previous data - db.engine.execute("ALTER TABLE server RENAME TO server_old") + # To Save previous data, create temp table + db.engine.execute("create table server_old as select * from server") + + db.engine.execute("DROP TABLE server") # Create table with drop constraint for port and username definition db.engine.execute(""" ^ permalink raw reply [nested|flat] 5+ messages in thread
* Re: [pgAdmin][RM7031]: Database definition wrong @ 2021-12-02 10:59 Akshay Joshi <[email protected]> parent: Pradip Parkale <[email protected]> 0 siblings, 0 replies; 5+ messages in thread From: Akshay Joshi @ 2021-12-02 10:59 UTC (permalink / raw) To: Pradip Parkale <[email protected]>; +Cc: Aditya Toshniwal <[email protected]>; pgadmin-hackers Thanks, the patch applied. On Thu, Dec 2, 2021 at 3:09 PM Pradip Parkale < [email protected]> wrote: > Hi Akshay/Aditya, > > Please find the updated patch. > > On Wed, Dec 1, 2021 at 5:56 PM Aditya Toshniwal < > [email protected]> wrote: > >> Hi Pradip, >> >> You did not include the server_old table for query_history. >> > Fixed. > >> Please also remove the commented code: >> + # db.engine.execute("PRAGMA foreign_keys=ON") >> + >> + # db.session.commit() >> + >> + # db.engine.execute("PRAGMA foreign_keys=ON") >> + >> > Fixed. > >> >> >> >> On Wed, Dec 1, 2021 at 5:25 PM Akshay Joshi < >> [email protected]> wrote: >> >>> Thanks, the patch applied. >>> >>> On Wed, Dec 1, 2021 at 4:23 PM Pradip Parkale < >>> [email protected]> wrote: >>> >>>> Hi Hackers, >>>> >>>> Please find the attached for #7031 Database definition wrong. >>>> >>>> -- >>>> Thanks & Regards, >>>> Pradip Parkale >>>> Software Engineer | EnterpriseDB Corporation >>>> >>> >>> >>> -- >>> *Thanks & Regards* >>> *Akshay Joshi* >>> *pgAdmin Hacker | Principal Software Architect* >>> *EDB Postgres <http://edbpostgres.com>* >>> >>> *Mobile: +91 976-788-8246* >>> >> >> >> -- >> Thanks, >> Aditya Toshniwal >> pgAdmin Hacker | Software Architect | *edbpostgres.com* >> <http://edbpostgres.com; >> "Don't Complain about Heat, Plant a TREE" >> > > > -- > Thanks & Regards, > Pradip Parkale > Software Engineer | EnterpriseDB Corporation > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Principal Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* ^ permalink raw reply [nested|flat] 5+ messages in thread
end of thread, other threads:[~2021-12-02 10:59 UTC | newest] Thread overview: 5+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2021-12-01 10:52 [pgAdmin][RM7031]: Database definition wrong Pradip Parkale <[email protected]> 2021-12-01 11:55 ` Akshay Joshi <[email protected]> 2021-12-01 12:26 ` Aditya Toshniwal <[email protected]> 2021-12-02 09:39 ` Pradip Parkale <[email protected]> 2021-12-02 10:59 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox