public inbox for [email protected]
help / color / mirror / Atom feedFrom: Pradip Parkale <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [pgAdmin][RM7031]: Database definition wrong
Date: Wed, 1 Dec 2021 16:22:44 +0530
Message-ID: <CAJ9T6Ss6eaT7zd8aEgqube6JOU4fuqP+WA9horGq7umtXBbKxA@mail.gmail.com> (raw)
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
##########################################################################
#
view thread (5+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected]
Subject: Re: [pgAdmin][RM7031]: Database definition wrong
In-Reply-To: <CAJ9T6Ss6eaT7zd8aEgqube6JOU4fuqP+WA9horGq7umtXBbKxA@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox