Compare commits

..
159 Commits
Author SHA1 Message Date
Akshay Joshi 85a1855928 Update Dependencies. 2022-01-10 16:24:40 +05:30
Akshay Joshi 44a5a3f2fc Update version for release. 2022-01-10 16:20:11 +05:30
Akshay Joshi 7fe1d89891 Fixed import/export servers issue reported during testing. 2022-01-10 16:16:10 +05:30
Nikhil Mohite e43a87da09 Fixed SonarQube issue. 2022-01-10 12:10:20 +05:30
Akshay Joshi 55dc06de15 Fixed API test case for Import/Export Servers. 2022-01-09 14:47:32 +05:30
Identifier Anonymous f61d22d58d Update Japanese translation. 2022-01-09 12:54:51 +05:30
Domenico Sgarbossa fd92974902 Update Italian translation. 2022-01-09 12:53:42 +05:30
Akshay Joshi ec64910e0c Update message catalog. 2022-01-07 21:36:04 +05:30
Akshay Joshi 4ecd05e33b 1) Fixed import/export servers issue in server mode.
2) Fixed an issue where files are not showing as per the selected format in
   the file dialog when opened the first time.
2022-01-07 21:29:17 +05:30
Nikhil Mohite af6ff20020 Fixed SonarQube issues. 2022-01-07 19:58:19 +05:30
Nikhil Mohite ad862f4084 Port Maintenance dialog to React. Fixes #7019 2022-01-07 12:07:49 +05:30
Rahul Shirsat 65a6c18263 Updated screenshots and descriptions for Backup and Restore dialog. 2022-01-07 11:35:40 +05:30
Akshay Joshi 7cc76c7d2d Fixed import/export server issues reported while testing. 2022-01-06 20:01:25 +05:30
Rahul Shirsat 6528d086ba Fixed review comments:
1. Split the restore options/backup options into 2 tabs
2. Restore icon changes
3. feature tests issues
4. restore help link broken
5. Comment section not visible

refs #7018
2022-01-06 16:46:44 +05:30
Akshay Joshi f56b4030f1 Fixed a schema diff issue where generated script adds unwanted line endings for Functions/Procedures/Trigger Functions. Fixes #7102 2022-01-06 13:08:50 +05:30
Akshay Joshi 8b13f158ab Fixed review comments for Import/Export Servers.
refs #4803
2022-01-05 14:02:49 +05:30
Dave Page 920c27bb31 Add trademark notice. 2022-01-04 15:33:10 +00:00
Akshay Joshi 964eddf952 Corrected wrong import statement. 2022-01-04 15:27:06 +05:30
Akshay Joshi 2786f7ac5a Update copyright notices for 2022 2022-01-04 13:54:25 +05:30
Akshay Joshi 9dd957a2aa Added support to import/export server groups and servers from GUI. Fixes #4803 2022-01-04 12:27:17 +05:30
Pradip Parkale c1ad7d81f4 Fixed an issue where destroy method is not present for the browser tree after React porting. 2022-01-03 17:47:22 +05:30
Akshay Joshi a4ef5ea48b Fixed an issue where SubPlans may overlap other nodes & make them inaccessible in Graphical EXPLAIN View.
Patch sent by:  Robert Frunzke

Fixes #7093
2021-12-31 14:49:42 +05:30
Yogesh Mahajan 44ab4648a8 Fixed an issue in SQL generation for PostgreSQL-14 functions. Fixes #7081 2021-12-31 14:30:53 +05:30
Nikhil Mohite 19016c3733 Ensure that help should be visible properly for Procedures. Fixes #7075 2021-12-31 14:21:38 +05:30
Nikhil Mohite e18ce2c9e3 Updates CSS and structure in Wizard, also fixed css issues in GrantWizard. 2021-12-31 14:16:50 +05:30
Yogesh Mahajan 0ceb2e2767 Ensure that Truncate and Reset statistics should work. Fixes #7096 2021-12-30 12:19:33 +05:30
Nikhil Mohite 191e2b6242 Fixed an issue where an operation error message pop up showing the database object's name incorrectly. Fixes #7078 2021-12-28 13:49:04 +05:30
Rahul Shirsat 603d91be0e Port Restore dialog to React. Fixes #7018 2021-12-28 13:45:59 +05:30
Akshay Joshi 262dcdcf54 Added postion relative to show error message properly. 2021-12-24 17:37:59 +05:30
Akshay Joshi 74be3a9f52 Fixed linter error. 2021-12-24 16:52:32 +05:30
Aditya Toshniwal 5c65766ece Added a common table MUI style object which can be used on any table.
Added a few more styling improvements.
2021-12-24 16:15:38 +05:30
Nikhil Mohite bae8a2bd5d Fixed an issue where Explain Analyze shows negative exclusive time. Fixes #7003 2021-12-24 16:11:58 +05:30
Yogesh Mahajan 6d0ed91d31 Fixed an issue where the Owner is not displayed in the reverse engineering SQL for Procedures. Fixes #7077 2021-12-24 16:09:51 +05:30
Nikhil Mohite 45179ccb8c Change logic for grant wizard, wizard component, and updated CSS. 2021-12-22 18:26:21 +05:30
Akshay Joshi ebee7a5b72 Fixed linter errors. 2021-12-22 14:44:57 +05:30
Akshay Joshi ae73f13812 Added beforeNext and beforeBack method in Wizard. 2021-12-22 14:25:08 +05:30
Yogesh Mahajan e302a6199a Fixed QueryToolJourneyTest feature test. 2021-12-21 18:10:48 +05:30
Nikhil Mohite e5e9981836 Fixed an issue where Columns with default value not showing when adding a new row. Fixes #7034 2021-12-21 18:09:20 +05:30
Nikhil Mohite 461c0abce1 Fixed an issue where Tablespace is created though an error is shown on the dialog. Fixes #6745 2021-12-21 18:07:17 +05:30
Akshay Joshi 02b83146be 1) Added spacing for message and loading spinner.
2) Rename the GrantWizard Dialog.
3) Return the activeStep from disableNextStep function.
2021-12-21 18:00:07 +05:30
Pradip Parkale 9754b0fe14 Fixed an issue where Columns with default value not showing when adding a new row. Fixes #7034 2021-12-17 10:48:24 +05:30
Akshay Joshi 92a997b16a Rearrange tools menu on the basis of usability and form groups of similar sub-menus. 2021-12-16 18:29:44 +05:30
Akshay Joshi 8cfdfd898d Updated testtools version to work with Python 3.10 2021-12-16 17:36:13 +05:30
Akshay Joshi 448b4c07c1 Update psycopg2 and pywinpty 2021-12-16 15:53:58 +05:30
Dave Page 6d026b3e28 Update to gssapi 1.7.x 2021-12-16 10:20:04 +00:00
Fred Escallier 3a9a635419 Update French translation. 2021-12-15 14:51:19 +05:30
Aditya Toshniwal 6875d00e44 Fixed an issue where confirmation pop-up is hidden behind Reassign/Drop Owned Dialog. Fixes #7071 2021-12-14 16:42:06 +05:30
Akshay Joshi 83e646c7d4 Reverting patch for #7003, showing Nan in time fields. 2021-12-14 16:30:59 +05:30
Akshay Joshi d0d194b60d Update version for release. 2021-12-13 17:20:43 +05:30
Dave Page c8109beaa7 Fix a couple of places missed in the mod_wsgi update. 2021-12-13 10:29:01 +00:00
Dave Page 42d2a18b91 Fix a couple of places missed in the mod_wsgi update. 2021-12-13 10:28:13 +00:00
Dave Page 1e59ec74e1 Bump mod_wsgi version. 2021-12-13 10:03:37 +00:00
Aditya Toshniwal 701e6f86f5 Ensure that statue message should not hide the last line of messages when running a long query. Fixes #7020 2021-12-13 13:10:56 +05:30
Akshay Joshi da5545ff57 Added support to disable the auto-discovery of the database servers. Fixes #7039 2021-12-13 13:07:37 +05:30
Libor M fea44c07c7 Update Czech translation. 2021-12-13 11:22:11 +05:30
Identifier Anonymous e539bc2ae7 Update Japanese translation. 2021-12-13 11:20:25 +05:30
Domenico Sgarbossa 9bdca4b409 Update Italian translation. 2021-12-13 11:17:37 +05:30
Pradip Parkale 40027dd502 Remove some unwanted code.
refs #6840
2021-12-13 11:13:34 +05:30
Akshay Joshi bd545fd5b2 1) Fixed schema diff owner related issue. Fixes #6877
2) Fixed schema diff related some issues. Fixes #6957
2021-12-11 22:10:28 +05:30
Akshay Joshi 441a3d4533 Update Dependencies. 2021-12-10 19:55:31 +05:30
Akshay Joshi 3f939dfc11 Update message catalogs. 2021-12-10 19:49:27 +05:30
zhangjie2@fujitsu.com 837925a47c Fixed typos in the Documentation. 2021-12-10 19:46:45 +05:30
Nikhil Mohite 4dc7f24b5f Fixed linter error 2021-12-09 20:26:44 +05:30
Nikhil Mohite 9ec8d05a64 1) Ensure that the Owner should not be disabled while creating the procedure. Fixes #7064
2) Fixed an issue where Explain Analyze shows negative exclusive time. Fixes #7003
2021-12-09 16:59:43 +05:30
Akshay Joshi 4ee9a95360 Remove the hardcoded version of NWjs from build scripts. 2021-12-09 10:39:21 +05:30
Akshay Joshi 3a87e05f80 Updated NWjs version to 0.59.0 2021-12-08 19:17:15 +05:30
Akshay Joshi f24348b2b0 Fixed an issue where notifier not working when opening query tool in a new
window and then open it in the new tab.
2021-12-08 18:15:13 +05:30
Rahul Shirsat 91a288c2bb Correct the SQL definition for function/procedure with the Atomic keyword in PG14. Fixes #7029 2021-12-08 12:31:59 +05:30
Akshay Joshi fd53e4f5f9 Replace Alertify alert and confirm with React-based model dialog. Fixes #7053 2021-12-07 18:52:40 +05:30
Akshay Joshi e327066523 Fixed RESQL test cases for EPAS-14 2021-12-07 11:48:27 +05:30
Dave Page 2121adb7fb PEP-8. Sigh. 2021-12-06 17:06:26 +00:00
Dave Page 18c2faf7a9 Update Python version compatibility and PyPi description. 2021-12-06 16:44:50 +00:00
Yogesh Mahajan 48dc4bacc4 Fixed Kerberos authentication issue which is broken due to 2FA.
refs #6543
2021-12-06 20:14:39 +05:30
Nikhil Mohite 950809ee55 Increase the width of the scrollbars. Fixes #6978 2021-12-06 20:11:30 +05:30
Pradip Parkale c7a49490a2 Fixed an issue where tooltip data are not displaying on downloaded graphical explain plan. Fixes #6840 2021-12-06 20:07:11 +05:30
Akshay Joshi f8cb62180e Fixed API test cases for StartRunningQueryTest. 2021-12-03 13:19:31 +05:30
Aditya Toshniwal dfdaf7f6d1 Implemented React based modal provider to create models on the fly.
Also, use this to replace Alertify alert and confirm dialog.
2021-12-03 12:50:24 +05:30
Akshay Joshi 9c0c046a38 Fixed unhashable type issue while opening the about dialog. Fixes #7048 2021-12-03 12:31:59 +05:30
Akshay Joshi 5ae1036a24 Corrected the down_version in migration file. 2021-12-02 18:35:08 +05:30
Ashesh Vashi 36c9eb3dfd Added support for Two-factor authentication for improving security. Fixes #6543 2021-12-02 16:47:18 +05:30
Pradip Parkale fe096116be Change the logic to rename the table in the SQLite database to fix the migration issue.
refs #7031
2021-12-02 16:25:59 +05:30
Ganesh Jaybhay e30cbe2579 Fixed some accessibility issues:
1) Focus is not visible while navigating through top navbar menu items(File, Object, Tools)
2) In preference dialog wherever access key is used for a shortcut declaration, unable to get out of the textbox.
3) Focus is not visible for the links on the dashboard

Fixes #7046
2021-12-02 16:24:55 +05:30
Akshay Joshi c6424e3897 Replaced alertifyjs notifiers with React-based notistack. Fixes #7004 2021-12-02 16:05:52 +05:30
Akshay Joshi 0f9b9b9dcf Added 'eslint-plugin-react-hooks' to identify the linter errors related to react hooks. 2021-12-01 17:43:20 +05:30
Pradip Parkale 6b613fdf36 Fixed an issue where SQLite database definition is wrong because the USER_ID FK
references the table user_old which is not available.

Fixes #7031
2021-12-01 17:24:41 +05:30
Aditya Toshniwal 9d804d2857 Update the dropzone version to 5.9.3 and Flask-SQLAlchemy to 2.5.*. Fixes #7044 2021-12-01 17:23:46 +05:30
Dave Page b14285cdbf Remove mention of 9.6 utilities. 2021-11-30 11:58:02 +00:00
Dave Page 1438eb6364 Update to the latest Alpine release
Add libldap, which is now required for libpq, and remove 9.6 support.
2021-11-30 11:56:41 +00:00
Talha Bin Rizwan 976faa5e2f Add "section" to the Debian package control files. Fixes #7040 2021-11-29 13:47:11 +00:00
Akshay Joshi 2c02e6fc23 Ensure that the user should be allowed to set the schema of an extension while creating it. Fixes #6963 2021-11-29 15:27:44 +05:30
Nikhil Mohite 61b440261f Ensure that sort order should be maintained when renaming a server group. Fixes #6955 2021-11-29 12:04:04 +05:30
Akshay Joshi fbd10ef4b6 Fixed an issue where reverse engineering SQL is wrong for Aggregate. Fixes #7024 2021-11-29 12:00:38 +05:30
Yogesh Mahajan abe5303448 Fixed an issue where the error is thrown while creating a new server using
Add New Server from the dashboard while tree item is not selected.

Fixes #7015
2021-11-28 13:32:30 +05:30
Nikhil Mohite bef692d431 Fixed an issue where On-demand rows throw an error when any row cell is edited
and saved it then scroll to get more rows.

Fixes #7005
2021-11-28 13:26:40 +05:30
Dave Page 7c18ddfe7d Include GSSAPI support in the PostgreSQL libraries and utilities on macOS. Refs #6872 2021-11-26 15:05:40 +00:00
Akshay Joshi 9a0d92469b Use .__ne__ instead of 'is not None' statement to fix the API test cases. 2021-11-24 18:54:25 +05:30
Akshay Joshi bce7e8346d Fixed API test case after upgrading Flask to v2. 2021-11-24 17:58:29 +05:30
Nikhil Mohite 3dcee71a92 Resolved issue if the binary path is not present/correct, then show error notification to add/correct the binary path.
refs #6984
2021-11-24 17:28:04 +05:30
Akshay Joshi d644b4f94e 1) Replace Flask-BabelEx with Flask-Babel. Fixes #6088
2) Upgrade Flask to version 2. Fixes #7010
2021-11-24 17:22:57 +05:30
Nikhil Mohite 3a30f27153 1. Updated notification message for the reset layout.
2. Added notification type in alertify which was missing.

refs #6988
2021-11-24 10:58:15 +05:30
Yogesh Mahajan 19984d6563 Fixed feature test failures due to React porting of backup dialog. 2021-11-23 17:36:10 +05:30
Dave Page 43176a8c6f Don't generate build-id links in RPMs. Fixes #7013
We don't ship debuginfo RPMs so they're of no use, and can cause conflicts.
2021-11-23 10:57:20 +00:00
Dave Page 849a1b1a89 Fix an RPM build issue that could lead to a conflict with python3 at installation. Fixes #7013. 2021-11-23 09:16:47 +00:00
Yogesh Mahajan b921a55c46 Adds flexibility to wait for launching pgAdmin in feature test. 2021-11-22 18:05:30 +05:30
Dave Page b0abc4048e Fix an RPM build issue that could lead to a conflict with python3 at installation. Fixes #7013. 2021-11-22 11:33:20 +00:00
Dave Page a55ac2fdd1 Fix an RPM build issue that could lead to a conflict with python3 at installation. Fixes #7103. 2021-11-22 11:32:04 +00:00
Nikhil Mohite 3afeb8ca46 Port Backup Global, Backup Server, and Backup object dialog in React. Fixes #6984 2021-11-22 11:20:44 +05:30
Akshay Joshi a701e8c766 Fixed an issue where the Change Password menu option is missing for internal
authentication source when more than one authentication source is defined.

Fixes #6989
2021-11-22 11:02:26 +05:30
Yogesh Mahajan 246bb01736 Fixed feature test cases. 2021-11-18 17:13:32 +05:30
Nikhil Mohite cc91e5da94 Fixed an issue where properties of the database should not be visible after removing the database.
Fixes #6964
2021-11-18 12:36:39 +05:30
Rahul Shirsat 5b99646798 Ensure that Python 3.10 and the latest eventlet dependency should not break the application. Fixes #7006 2021-11-18 12:29:24 +05:30
Pradip Parkale a5b79564ff Fixed an issue where the user can't debug function with timestamp parameter. Fixes #6986 2021-11-18 12:25:21 +05:30
Nikhil Mohite 3d5d507f4b Fixed an issue where referenced table drop-down should be disabled in
foreign key -> columns after one row is added.

Fixes #6906
2021-11-18 12:22:14 +05:30
Fred Escallier e1020aefdd Update French translation. 2021-11-18 12:01:06 +05:30
Khushboo Vashi cc38bc132e Fixed scroll issue in the browser tree when navigating using the keyboard. 2021-11-15 18:26:16 +05:30
Akshay Joshi 053519aef6 Update version for release. 2021-11-15 16:38:10 +05:30
Nikhil Mohite 1408bad8ba Fixed an issue where reset layout message showing when the user opens the query tool.
refs #6988
2021-11-15 16:34:25 +05:30
Pradip Parkale 33cc2a7514 Fixed an issue where SQL for index shows the same column multiple times. Fixes #6981 2021-11-15 16:31:40 +05:30
Domenico Sgarbossa d6a754e850 Update Italian translation. 2021-11-15 12:56:58 +05:30
Libor M fc05ef49ce Update Czech translation. 2021-11-15 12:54:06 +05:30
Identifier Anonymous b36a290b54 Update Japanese translation. 2021-11-15 12:52:09 +05:30
Akshay Joshi 0ca7dbccf6 Ensure that the Binary path for PG14 should be visible in the preferences. Fixes #6972 2021-11-15 12:44:33 +05:30
Khushboo Vashi e67bad3461 Ensure that the user should be able to navigate browser tree objects using arrow keys from keyboard. Fixes #6896 2021-11-15 11:17:42 +05:30
Yogesh Mahajan e2e5a8208c 1) Fixed an issue where JSON editor preview colours have inappropriate contrast in dark mode. Fixes #6944
2) Fixed JSON Editor scrolling issue in code mode. Fixes #6945
2021-11-15 10:58:17 +05:30
Akshay Joshi a47cbbe26c Update Dependencies. 2021-11-12 20:02:51 +05:30
Akshay Joshi 59707fc8af Update message catalogs. 2021-11-12 20:01:25 +05:30
Akshay Joshi 25ace94d10 Fixed API test cases for search object. 2021-11-12 19:58:29 +05:30
Akshay Joshi ca4d5d0ca4 Added operators and aggregates in search objects. Fixes #6974 2021-11-12 17:45:08 +05:30
Aditya Toshniwal 600690a789 Fixed JS audit issues. 2021-11-12 14:19:09 +05:30
Yogesh Mahajan 77931d2315 Uses selenium 4.0.0a6 which works with python 3.6 2021-11-12 11:56:44 +05:30
Nikhil Mohite 8bf178b0a3 Reset the layout if pgAdmin4 detects the layout is in an inconsistent state. Fixes #6988 2021-11-12 11:50:37 +05:30
Pradip Parkale d4bf7164f9 Ensure that inherit table icon should be visible properly in the tree view. Fixes #6845 2021-11-11 12:55:38 +05:30
Nikhil Mohite 7468ca36ae Fixed SQL syntax error if select "Custom auto-vacuum" option and not set Autovacuum option to Yes or No. Fixes #6925 2021-11-11 12:36:19 +05:30
Rahul Shirsat 572b5a126a Ensure that internal authentication when combined with other authentication providers, the order of internal source should not matter while picking up the provider. Fixes #6832 2021-11-11 12:29:30 +05:30
Akshay Joshi 36e5708464 Correct the release notes. 2021-11-10 15:44:03 +05:30
Khushboo Vashi d4697e8f1c Ensure that users should be able to modify the REMOTE_USER environment
variable as per their environment by introducing the new config parameter
WEBSERVER_REMOTE_USER.

Fixes #6953
2021-11-10 15:38:41 +05:30
Yogesh Mahajan 9479f0e632 Fixed feature test cases after react porting. 2021-11-10 11:50:20 +05:30
Khushboo Vashi aff84103d9 Fixed an issue where database nodes are not getting loaded behind a reverse
proxy with SSL. Fixes #6905
2021-11-10 11:47:40 +05:30
Pradip Parkale a61a9e5b8f Fixed an issue where older server group name displayed in the confirmation
pop-up when the user removes server group. Fixes #6939
2021-11-10 11:17:51 +05:30
Pradip Parkale eb8168285e Cover more scenarios for the pgAdmin freezing issue. Fixes #5427 2021-11-10 11:11:24 +05:30
Aditya Toshniwal 1ed4d0f95e Fixed an issue where textarea should be allowed to resize and have more than 255 chars. Fixes #6976 2021-11-07 10:51:54 +05:30
Aditya Toshniwal 31849ea95f Ensure that changing themes should work on Windows when system high contrast
mode is enabled. Fixes #6954
2021-11-07 10:46:49 +05:30
Dave Page d7f5e13cdd Revert changes to support Python 3.10. Too many things broke, needs more thought :-( 2021-11-03 14:50:05 +00:00
Dave Page 33aeacd8d1 Only include the dnspython library for Python 3.10. 2021-11-03 13:20:09 +00:00
Dave Page f3bf068066 Fix dependencies to work with Python 3.10.
Patch by me, legwork by Aditya.
2021-11-03 13:12:11 +00:00
Akshay Joshi 719f8c8fd2 Fixed API test case for DataTypeReader 2021-10-29 17:37:02 +05:30
Pradip Parkale fa8b3edda5 Fixed an issue where user details are not shown when the non-admin user tries
to connect to the shared server. Fixes #6940
2021-10-29 16:26:11 +05:30
Nikhil Mohite f71e2e8040 Fixed an issue where pgAdmin is not opening properly. Fixes #6809 2021-10-29 16:17:36 +05:30
Akshay Joshi 39992a817d Added support of Aggregate and Operator node in view-only mode. Fixes #3834 2021-10-29 16:14:33 +05:30
Akshay Joshi 7b85253465 Corrected some menu lables. 2021-10-27 11:05:23 +05:30
Pradip Parkale 35b1e1d0d2 Fixed pgAdmin freezing issue by providing the error message for the operation
that can't perform due to lock on the particular table. Fixes #5427
2021-10-27 10:51:52 +05:30
Rahul Shirsat 711ea3bfa1 Fixed an issue where properties panel is not updated when any object is added from the browser tree. Fixes #6859 2021-10-27 10:31:49 +05:30
Rahul Shirsat 8eb6f8061d Ensure that dialog should be opened when clicking on Reassign/Drop owned menu. Fixes #6949 2021-10-25 11:47:28 +05:30
Akshay Joshi 2c4ed4d115 Reverted the last patch to pin mozjpeg as it didn't work. 2021-10-21 17:06:04 +05:30
Aditya Toshniwal fc233ed993 Pin mozjpeg to 7.1.0 as the latest version will require zlib to be re-compiled. 2021-10-21 16:18:06 +05:30
Aditya Toshniwal 1d8810775c Fixed JS audit issues wherever possible and ignores devDependencies from packages.json 2021-10-21 15:08:24 +05:30
Aditya Toshniwal d28e249673 Ignore flask-security-too irrelevant vulnerability. 2021-10-21 11:14:27 +05:30
Pradip Parkale c7cd57db91 Ensure that columns should be merged if the newly added column is present in the parent table. Fixes #6780 2021-10-21 10:59:52 +05:30
Akshay Joshi d2a7f7fffe Fixed API test cases for PG 14 2021-10-20 18:39:42 +05:30
1578 changed files with 53492 additions and 42296 deletions

No files matched your search

+6
View File
@@ -3,6 +3,12 @@ web/node_modules
web/*.log
web/regression
web/**/tests/
web/**/*.pyc
web/**/__pycache__
.DS_Store
web/pgadmin/messages.pot
web/pgadmin/translations/??/LC_MESSAGES/messages.po
Dockerfile
docs/en_US/_build/**/*
src-build/**/*
dist/**/*
+188 -79
View File
@@ -23,112 +23,154 @@ Python Dependencies
Name Version Licence URL
---- ------- ------- ---
Flask 1.1.4 BSD-3-Clause https://palletsprojects.com/p/flask/
Flask 2.0.2 BSD-3-Clause https://palletsprojects.com/p/flask
Flask-Gravatar 0.5.0 BSD https://github.com/zzzsochi/Flask-Gravatar/
Flask-Login 0.5.0 MIT https://github.com/maxcountryman/flask-login
Flask-Mail 0.9.1 BSD https://github.com/rduplain/flask-mail
Flask-Migrate 2.7.0 MIT http://github.com/miguelgrinberg/flask-migrate/
Flask-Migrate 3.1.0 UNKNOWN https://github.com/miguelgrinberg/flask-migrate
Flask-SQLAlchemy 2.5.1 BSD-3-Clause https://github.com/pallets/flask-sqlalchemy
Flask-WTF 0.14.3 BSD https://github.com/lepture/flask-wtf
Flask-Compress 1.9.0 MIT https://github.com/colour-science/flask-compress
Flask-WTF 1.0.0 BSD-3-Clause https://github.com/wtforms/flask-wtf/
Flask-Compress 1.10.1 MIT https://github.com/colour-science/flask-compress
Flask-Paranoid 0.2.0 MIT http://github.com/miguelgrinberg/flask-paranoid/
Flask-Babel 2.0.0 BSD http://github.com/python-babel/flask-babel
Flask-Security-Too 4.1.2 MIT https://github.com/Flask-Middleware/flask-security
Flask-SocketIO 5.1.1 UNKNOWN https://github.com/miguelgrinberg/flask-socketio
WTForms 3.0.0 BSD-3-Clause https://wtforms.readthedocs.io/
passlib 1.7.4 BSD https://passlib.readthedocs.io
pytz 2021.1 MIT http://pythonhosted.org/pytz
simplejson 3.17.2 MIT License https://github.com/simplejson/simplejson
pytz 2021.3 MIT http://pythonhosted.org/pytz
simplejson 3.17.6 MIT License https://github.com/simplejson/simplejson
six 1.16.0 MIT https://github.com/benjaminp/six
speaklater3 1.4 UNKNOWN https://github.com/ThomasWaldmann/speaklater
sqlparse 0.4.1 BSD-3-Clause https://github.com/andialbrecht/sqlparse
WTForms 2.3.3 BSD-3-Clause https://wtforms.readthedocs.io/
Flask-Paranoid 0.2.0 MIT http://github.com/miguelgrinberg/flask-paranoid/
sqlparse 0.4.2 BSD-3-Clause https://github.com/andialbrecht/sqlparse
psutil 5.8.0 BSD https://github.com/giampaolo/psutil
psycopg2 2.8.6 LGPL with exceptions https://psycopg.org/
python-dateutil 2.8.1 Dual License https://dateutil.readthedocs.io
SQLAlchemy 1.3.24 MIT http://www.sqlalchemy.org
itsdangerous 1.1.0 BSD https://palletsprojects.com/p/itsdangerous/
Flask-Security-Too 4.0.1 MIT https://github.com/Flask-Middleware/flask-security
psycopg2 2.9.2 LGPL with exceptions https://psycopg.org/
python-dateutil 2.8.2 Dual License https://github.com/dateutil/dateutil
SQLAlchemy 1.4.28 MIT https://www.sqlalchemy.org
bcrypt 3.2.0 Apache License, Version 2.0 https://github.com/pyca/bcrypt/
cryptography 3.4.7 BSD or Apache License, Version 2.0 https://github.com/pyca/cryptography
cryptography 3.4.8 BSD or Apache License, Version 2.0 https://github.com/pyca/cryptography
sshtunnel 0.4.0 MIT https://github.com/pahaz/sshtunnel
ldap3 2.9 LGPL v3 https://github.com/cannatag/ldap3
Flask-BabelEx 0.9.4 BSD http://github.com/mrjoes/flask-babelex
gssapi 1.6.12 LICENSE.txt https://github.com/pythongssapi/python-gssapi
Flask-SocketIO 5.0.3 MIT http://github.com/miguelgrinberg/Flask-SocketIO/
eventlet 0.31.0 UNKNOWN http://eventlet.net
ldap3 2.9.1 LGPL v3 https://github.com/cannatag/ldap3
gssapi 1.7.2 LICENSE.txt https://github.com/pythongssapi/python-gssapi
eventlet 0.33.0 UNKNOWN http://eventlet.net
httpagentparser 1.9.1 http://www.opensource.org/licenses/mit-license.php http://shon.github.com/httpagentparser
user-agents 2.2.0 MIT https://github.com/selwin/python-user-agents
pywinpty 1.1.1 Unknown Unknown
Authlib 0.15.4 BSD-3-Clause https://authlib.org/
pywinpty 1.1.* Unknown Unknown
Authlib 0.15.5 BSD-3-Clause https://authlib.org/
requests 2.25.1 Apache 2.0 https://requests.readthedocs.io
pyotp 2.6.0 MIT License https://github.com/pyotp/pyotp
qrcode 7.3.1 BSD https://github.com/lincolnloop/python-qrcode
Pillow 8.3.2 HPND https://python-pillow.org
NOTE: This report was generated using Python 3.9. Full information may not be
NOTE: This report was generated using Python 3.10. Full information may not be
shown for Python modules that are not required with this version.
35 dependencies listed.
37 dependencies listed.
Javascript Dependencies
=======================
Name Version Licence URL
---- ------- ------- ---
@babel/code-frame 7.14.5 MIT https://github.com/babel/babel.git
@babel/code-frame 7.12.13 MIT https://github.com/babel/babel.git
@babel/compat-data 7.14.0 MIT https://github.com/babel/babel.git
@babel/core 7.14.3 MIT https://github.com/babel/babel.git
@babel/generator 7.14.3 MIT https://github.com/babel/babel.git
@babel/helper-annotate-as-pure 7.12.13 MIT https://github.com/babel/babel.git
@babel/helper-compilation-targets 7.13.16 MIT https://github.com/babel/babel.git
@babel/helper-create-class-features-plugin 7.14.3 MIT https://github.com/babel/babel.git
@babel/helper-function-name 7.14.2 MIT https://github.com/babel/babel.git
@babel/helper-get-function-arity 7.12.13 MIT https://github.com/babel/babel.git
@babel/helper-member-expression-to-functions 7.13.12 MIT https://github.com/babel/babel.git
@babel/compat-data 7.14.7 MIT https://github.com/babel/babel.git
@babel/core 7.13.8 MIT https://github.com/babel/babel.git
@babel/generator 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-annotate-as-pure 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-compilation-targets 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-create-class-features-plugin 7.14.6 MIT https://github.com/babel/babel.git
@babel/helper-function-name 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-get-function-arity 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-hoist-variables 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-member-expression-to-functions 7.14.7 MIT https://github.com/babel/babel.git
@babel/helper-module-imports 7.13.12 MIT https://github.com/babel/babel.git
@babel/helper-module-transforms 7.14.2 MIT https://github.com/babel/babel.git
@babel/helper-optimise-call-expression 7.12.13 MIT https://github.com/babel/babel.git
@babel/helper-plugin-utils 7.13.0 MIT https://github.com/babel/babel.git
@babel/helper-replace-supers 7.14.3 MIT https://github.com/babel/babel.git
@babel/helper-module-transforms 7.13.0 MIT https://github.com/babel/babel.git
@babel/helper-optimise-call-expression 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-plugin-utils 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-replace-supers 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-simple-access 7.13.12 MIT https://github.com/babel/babel.git
@babel/helper-split-export-declaration 7.12.13 MIT https://github.com/babel/babel.git
@babel/helper-validator-identifier 7.14.0 MIT https://github.com/babel/babel.git
@babel/helper-validator-option 7.12.17 MIT https://github.com/babel/babel.git
@babel/helpers 7.14.0 MIT https://github.com/babel/babel.git
@babel/highlight 7.14.0 MIT https://github.com/babel/babel.git
@babel/parser 7.14.3 MIT https://github.com/babel/babel.git
@babel/helper-split-export-declaration 7.14.5 MIT https://github.com/babel/babel.git
@babel/helper-validator-identifier 7.14.9 MIT https://github.com/babel/babel.git
@babel/helper-validator-option 7.14.5 MIT https://github.com/babel/babel.git
@babel/helpers 7.13.0 MIT https://github.com/babel/babel.git
@babel/highlight 7.14.5 MIT https://github.com/babel/babel.git
@babel/parser 7.14.7 MIT https://github.com/babel/babel.git
@babel/plugin-proposal-class-properties 7.13.0 MIT https://github.com/babel/babel.git
@babel/plugin-syntax-jsx 7.12.13 MIT https://github.com/babel/babel.git
@babel/plugin-transform-react-display-name 7.14.2 MIT https://github.com/babel/babel.git
@babel/plugin-transform-react-jsx 7.14.3 MIT https://github.com/babel/babel.git
@babel/plugin-transform-react-jsx 7.13.12 MIT https://github.com/babel/babel.git
@babel/plugin-transform-react-jsx-development 7.12.17 MIT https://github.com/babel/babel.git
@babel/plugin-transform-react-pure-annotations 7.12.1 MIT https://github.com/babel/babel.git
@babel/preset-react 7.13.13 MIT https://github.com/babel/babel.git
@babel/template 7.12.13 MIT https://github.com/babel/babel.git
@babel/traverse 7.14.2 MIT https://github.com/babel/babel.git
@babel/types 7.14.2 MIT https://github.com/babel/babel.git
@babel/runtime 7.14.0 MIT https://github.com/babel/babel.git
@babel/template 7.14.5 MIT https://github.com/babel/babel.git
@babel/traverse 7.14.7 MIT https://github.com/babel/babel.git
@babel/types 7.15.4 MIT https://github.com/babel/babel.git
@date-io/core 1.3.13 MIT https://github.com/dmtrKovalenko/date-io
@date-io/date-fns 1.3.13 MIT https://github.com/dmtrKovalenko/date-io
@emotion/cache 11.4.0 MIT https://github.com/emotion-js/emotion/tree/main/packages/cache
@emotion/hash 0.8.0 MIT https://github.com/emotion-js/emotion/tree/master/packages/hash
@emotion/is-prop-valid 0.8.8 MIT https://github.com/emotion-js/emotion/tree/master/packages/is-prop-valid
@emotion/memoize 0.7.5 MIT https://github.com/emotion-js/emotion/tree/master/packages/memoize
@emotion/memoize 0.7.4 MIT https://github.com/emotion-js/emotion/tree/master/packages/memoize
@emotion/react 11.4.0 MIT https://github.com/emotion-js/emotion/tree/main/packages/react
@emotion/serialize 1.0.2 MIT https://github.com/emotion-js/emotion/tree/main/packages/serialize
@emotion/sheet 1.0.1 MIT https://github.com/emotion-js/emotion/tree/master/packages/sheet
@emotion/stylis 0.8.5 MIT https://github.com/emotion-js/emotion/tree/master/packages/stylis
@emotion/unitless 0.7.5 MIT https://github.com/emotion-js/emotion/tree/master/packages/unitless
@emotion/utils 1.0.0 MIT https://github.com/emotion-js/emotion/tree/master/packages/utils
@emotion/weak-memoize 0.2.5 MIT https://github.com/emotion-js/emotion/tree/master/packages/weak-memoize
@istanbuljs/schema 0.1.3 MIT git+https://github.com/istanbuljs/schema.git
@popperjs/core 2.9.2 MIT https://github.com/popperjs/popper-core.git
@projectstorm/geometry 6.5.2 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-canvas-core 6.5.2 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-diagrams 6.5.2 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-diagrams-core 6.5.2 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-diagrams-defaults 6.5.2 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-diagrams-routing 6.5.2 MIT https://github.com/projectstorm/react-diagrams.git
@material-ui/core 4.11.0 MIT https://github.com/mui-org/material-ui.git
@material-ui/icons 4.11.2 MIT https://github.com/mui-org/material-ui.git
@material-ui/lab 4.0.0-alpha.58 MIT https://github.com/mui-org/material-ui.git
@material-ui/pickers 3.2.10 MIT https://github.com/mui-org/material-ui-pickers
@material-ui/styles 4.11.4 MIT https://github.com/mui-org/material-ui.git
@material-ui/system 4.12.1 MIT https://github.com/mui-org/material-ui.git
@material-ui/types 5.1.0 MIT https://github.com/mui-org/material-ui.git
@material-ui/utils 4.11.2 MIT https://github.com/mui-org/material-ui.git
@popperjs/core 2.9.0 MIT https://github.com/popperjs/popper-core.git
@projectstorm/geometry 6.6.1 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-canvas-core 6.6.1 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-diagrams 6.6.1 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-diagrams-core 6.6.1 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-diagrams-defaults 6.6.1 MIT https://github.com/projectstorm/react-diagrams.git
@projectstorm/react-diagrams-routing 6.6.1 MIT https://github.com/projectstorm/react-diagrams.git
@simonwep/pickr 1.8.1 MIT https://github.com/Simonwep/pickr.git
@tippyjs/react 4.2.5 MIT git+https://github.com/atomiks/tippyjs-react.git
@sindresorhus/is 0.7.0 MIT https://github.com/sindresorhus/is.git
@tippyjs/react 4.2.3 MIT git+https://github.com/atomiks/tippyjs-react.git
@types/classnames 2.3.1 MIT Unknown
@types/component-emitter 1.2.10 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/json-schema 7.0.7 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/node 15.6.1 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/node 14.14.32 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/parse-json 4.0.0 MIT https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
@types/prop-types 15.7.3 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/react 16.14.10 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/react 16.14.18 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/react-dom 16.9.14 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/react-transition-group 4.4.1 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/scheduler 0.16.1 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
@types/styled-jsx 2.2.8 MIT https://github.com/DefinitelyTyped/DefinitelyTyped.git
acitree 4.5.0-rc.7 MIT https://github.com/imsurinder90/jquery-aciTree.git
ajv 6.12.6 MIT https://github.com/ajv-validator/ajv.git
ajv 5.5.2 MIT https://github.com/epoberezkin/ajv.git
ajv-errors 1.0.1 MIT git+https://github.com/epoberezkin/ajv-errors.git
ajv-keywords 3.5.2 MIT git+https://github.com/epoberezkin/ajv-keywords.git
alertifyjs 1.7.1 MIT git@github.com:MohammadYounes/AlertifyJS.git
alphanum-sort 1.0.2 MIT https://github.com/TrySound/alphanum-sort.git
ansi-regex 2.1.1 MIT https://github.com/chalk/ansi-regex.git
ansi-styles 3.2.1 MIT https://github.com/chalk/ansi-styles.git
ansi-styles 4.3.0 MIT https://github.com/chalk/ansi-styles.git
ansi-styles 2.2.1 MIT https://github.com/chalk/ansi-styles.git
axios 0.21.1 MIT https://github.com/axios/axios.git
aspen-core 1.0.4 MIT git+https://github.com/neeksandhu/aspen-core.git
aspen-decorations 1.1.1 MIT git+https://github.com/neeksandhu/aspen-decorations.git
aspen-tree-model 1.0.5 MIT git+https://github.com/neeksandhu/aspen-tree-model.git
async 2.6.3 MIT https://github.com/caolan/async.git
axios 0.21.4 MIT https://github.com/axios/axios.git
babel-code-frame 6.26.0 MIT https://github.com/babel/babel/tree/master/packages/babel-code-frame
babel-generator 6.26.1 MIT https://github.com/babel/babel/tree/master/packages/babel-generator
babel-messages 6.23.0 MIT https://github.com/babel/babel/tree/master/packages/babel-messages
babel-plugin-styled-components 1.12.0 MIT https://github.com/styled-components/babel-plugin-styled-components.git
babel-plugin-syntax-jsx 6.18.0 MIT https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-jsx
babel-runtime 6.26.0 MIT https://github.com/babel/babel/tree/master/packages/babel-runtime
babel-template 6.26.0 MIT https://github.com/babel/babel/tree/master/packages/babel-template
babel-traverse 6.26.0 MIT https://github.com/babel/babel/tree/master/packages/babel-traverse
@@ -152,20 +194,23 @@ bignumber.js 7.2.1
bootstrap 4.6.0 MIT git+https://github.com/twbs/bootstrap.git
bootstrap4-toggle 3.6.1 MIT https://github.com/gitbrent/bootstrap4-toggle.git
brace-expansion 1.1.11 MIT git://github.com/juliangruber/brace-expansion.git
browserfs 1.4.3 MIT https://github.com/jvilk/BrowserFS.git
browserslist 4.16.6 MIT https://github.com/browserslist/browserslist.git
callsites 3.1.0 MIT https://github.com/sindresorhus/callsites.git
camelcase 6.2.0 MIT https://github.com/sindresorhus/camelcase.git
camelize 1.0.0 MIT git://github.com/substack/camelize.git
caniuse-api 3.0.0 MIT https://github.com/nyalab/caniuse-api.git
chalk 2.4.2 MIT https://github.com/chalk/chalk.git
chalk 4.1.1 MIT https://github.com/chalk/chalk.git
chalk 1.1.3 MIT https://github.com/chalk/chalk.git
chart.js 2.9.4 MIT https://github.com/chartjs/Chart.js.git
chartjs-color 2.4.1 MIT https://github.com/chartjs/chartjs-color.git
chartjs-color-string 0.6.0 MIT https://github.com/chartjs/chartjs-color-string.git
classnames 2.3.1 MIT https://github.com/JedWatson/classnames.git
closest 0.0.1 MIT https://github.com/ForbesLindesay/closest.git
clsx 1.1.1 MIT https://github.com/lukeed/clsx.git
co 4.6.0 MIT https://github.com/tj/co.git
codemirror 5.61.1 MIT https://github.com/codemirror/CodeMirror.git
codemirror 5.59.4 MIT https://github.com/codemirror/CodeMirror.git
color-convert 1.9.3 MIT https://github.com/Qix-/color-convert.git
color-convert 2.0.1 MIT https://github.com/Qix-/color-convert.git
color-name 1.1.3 MIT git@github.com:dfcreative/color-name.git
color-name 1.1.4 MIT git@github.com:colorjs/color-name.git
colord 2.0.0 MIT https://github.com/omgovich/colord.git
@@ -173,26 +218,35 @@ colorette 1.2.2
commander 7.2.0 MIT https://github.com/tj/commander.js.git
component-emitter 1.3.0 MIT https://github.com/component/emitter.git
concat-map 0.0.1 MIT git://github.com/substack/node-concat-map.git
convert-source-map 1.7.0 MIT git://github.com/thlorenz/convert-source-map.git
core-js 3.13.0 MIT https://github.com/zloirock/core-js.git
context-menu 2.0.0 MIT https://github.com/chipto/context-menu.git
convert-source-map 1.8.0 MIT git://github.com/thlorenz/convert-source-map.git
core-js 3.12.1 MIT https://github.com/zloirock/core-js.git
core-js 2.6.12 MIT https://github.com/zloirock/core-js.git
cosmiconfig 7.0.0 MIT git+https://github.com/davidtheclark/cosmiconfig.git
css-color-names 1.0.1 MIT git://github.com/bahamas10/css-color-names.git
css-color-names 0.0.4 MIT git://github.com/bahamas10/css-color-names.git
css-line-break 1.1.1 MIT git+ssh://git@github.com/niklasvh/css-line-break.git
css-loader 5.2.6 MIT https://github.com/webpack-contrib/css-loader.git
css-loader 5.1.1 MIT https://github.com/webpack-contrib/css-loader.git
css-to-react-native 3.0.0 MIT git+https://github.com/styled-components/css-to-react-native.git
css-tree 1.1.3 MIT https://github.com/csstree/csstree.git
css-vendor 2.0.8 MIT git@github.com:cssinjs/css-vendor.git
cssesc 3.0.0 MIT https://github.com/mathiasbynens/cssesc.git
cssnano 5.0.4 MIT https://github.com/cssnano/cssnano.git
cssnano-preset-default 5.1.1 MIT https://github.com/cssnano/cssnano.git
cssnano-utils 2.0.1 MIT https://github.com/cssnano/cssnano.git
csso 4.2.0 MIT https://github.com/css/csso.git
csstype 2.6.16 MIT https://github.com/frenic/csstype
csstype 3.0.8 MIT https://github.com/frenic/csstype
dagre 0.8.5 MIT https://github.com/dagrejs/dagre.git
date-fns 2.24.0 MIT https://github.com/date-fns/date-fns
debug 4.3.1 MIT git://github.com/visionmedia/debug.git
debug 2.6.9 MIT git://github.com/visionmedia/debug.git
deep-diff 1.0.2 MIT git://github.com/flitbit/diff.git
detect-indent 4.0.0 MIT https://github.com/sindresorhus/detect-indent.git
diff-arrays-of-objects 1.1.8 MIT git+https://github.com/malcolmvr/diff-arrays-of-objects.git
dom-helpers 5.2.0 MIT git+https://github.com/react-bootstrap/dom-helpers.git
dom-serializer 1.3.2 MIT git://github.com/cheeriojs/dom-renderer.git
dropzone 5.9.2 MIT https://github.com/dropzone/dropzone.git
dropzone 5.9.3 MIT https://github.com/dropzone/dropzone.git
emojis-list 3.0.0 MIT git+https://github.com/kikobeats/emojis-list.git
engine.io-client 5.1.1 MIT https://github.com/socketio/engine.io-client.git
engine.io-parser 4.0.2 MIT git@github.com:socketio/engine.io-parser.git
@@ -202,7 +256,8 @@ escape-string-regexp 1.0.5
fast-deep-equal 3.1.3 MIT git+https://github.com/epoberezkin/fast-deep-equal.git
fast-deep-equal 1.1.0 MIT git+https://github.com/epoberezkin/fast-deep-equal.git
fast-json-stable-stringify 2.1.0 MIT git://github.com/epoberezkin/fast-json-stable-stringify.git
follow-redirects 1.14.1 MIT git@github.com:follow-redirects/follow-redirects.git
filename-reserved-regex 2.0.0 MIT https://github.com/sindresorhus/filename-reserved-regex.git
follow-redirects 1.14.4 MIT git@github.com:follow-redirects/follow-redirects.git
gensync 1.0.0-beta.2 MIT https://github.com/loganfsmyth/gensync.git
globals 11.12.0 MIT https://github.com/sindresorhus/globals.git
globals 9.18.0 MIT https://github.com/sindresorhus/globals.git
@@ -219,6 +274,7 @@ html2canvas 1.0.0-rc.7
immutability-helper 3.1.1 MIT git+https://github.com/kolodny/immutability-helper.git
import-fresh 3.3.0 MIT https://github.com/sindresorhus/import-fresh.git
imports-loader 2.0.0 MIT https://github.com/webpack-contrib/imports-loader.git
insert-if 1.2.0 MIT git+https://github.com/chipto/insert-if.git
invariant 2.2.4 MIT https://github.com/zertosh/invariant
ip-address 7.1.0 MIT git://github.com/beaugunderson/ip-address.git
is-absolute-url 3.0.3 MIT https://github.com/sindresorhus/is-absolute-url.git
@@ -226,11 +282,14 @@ is-any-array 1.0.0
is-arrayish 0.2.1 MIT https://github.com/qix-/node-is-arrayish.git
is-color-stop 1.1.0 MIT git+https://github.com/pigcan/is-color-stop.git
is-finite 1.1.0 MIT https://github.com/sindresorhus/is-finite.git
is-in-browser 1.1.3 MIT git+https://github.com/tuxsudo/is-in-browser.git
is-relative 1.0.0 MIT https://github.com/jonschlinkert/is-relative.git
is-unc-path 1.0.0 MIT https://github.com/jonschlinkert/is-unc-path.git
istanbul-instrumenter-loader 3.0.1 MIT https://github.com/webpack-contrib/istanbul-instrumenter-loader.git
javascript-natural-sort 0.7.1 MIT https://github.com/Bill4Time/javascript-natural-sort.git
jquery 3.6.0 MIT https://github.com/jquery/jquery.git
jquery-contextmenu 2.9.2 MIT git://github.com/swisnl/jQuery-contextMenu.git
jquery-ui 1.12.1 MIT git://github.com/jquery/jquery-ui.git
jquery-ui 1.13.0 MIT git://github.com/jquery/jquery-ui.git
js-tokens 4.0.0 MIT https://github.com/lydell/js-tokens.git
js-tokens 3.0.2 MIT https://github.com/lydell/js-tokens.git
jsbn 1.1.0 MIT https://github.com/andyperlitch/jsbn.git
@@ -243,6 +302,14 @@ json-schema-traverse 0.3.1
json-source-map 0.6.1 MIT git+https://github.com/epoberezkin/json-source-map.git
json5 2.2.0 MIT git+https://github.com/json5/json5.git
json5 1.0.1 MIT git+https://github.com/json5/json5.git
jss 10.5.1 MIT https://github.com/cssinjs/jss
jss-plugin-camel-case 10.5.1 MIT https://github.com/cssinjs/jss
jss-plugin-default-unit 10.5.1 MIT https://github.com/cssinjs/jss
jss-plugin-global 10.5.1 MIT https://github.com/cssinjs/jss
jss-plugin-nested 10.5.1 MIT https://github.com/cssinjs/jss
jss-plugin-props-sort 10.5.1 MIT https://github.com/cssinjs/jss
jss-plugin-rule-value-function 10.5.1 MIT https://github.com/cssinjs/jss
jss-plugin-vendor-prefixer 10.5.1 MIT https://github.com/cssinjs/jss
karma-coverage 2.0.3 MIT git://github.com/karma-runner/karma-coverage.git
lines-and-columns 1.1.6 MIT https://github.com/eventualbuddha/lines-and-columns.git
loader-utils 2.0.0 MIT https://github.com/webpack/loader-utils.git
@@ -254,6 +321,8 @@ loose-envify 1.4.0
lunr 0.7.2 MIT https://github.com/olivernn/lunr.js.git
make-dir 3.1.0 MIT https://github.com/sindresorhus/make-dir.git
matches-selector 0.0.1 MIT https://github.com/ForbesLindesay/matches-selector.git
memoize-one 5.2.1 MIT https://github.com/alexreardon/memoize-one.git
mime 2.5.2 MIT https://github.com/broofa/mime
minimist 1.2.5 MIT git://github.com/substack/minimist.git
ml-array-max 1.2.3 MIT git+https://github.com/mljs/array.git
ml-array-min 1.2.2 MIT git+https://github.com/mljs/array.git
@@ -265,21 +334,30 @@ moment 2.24.0
moment-timezone 0.5.33 MIT https://github.com/moment/moment-timezone.git
ms 2.1.2 MIT https://github.com/zeit/ms.git
ms 2.0.0 MIT https://github.com/zeit/ms.git
nanocolors 0.1.12 MIT https://github.com/ai/nanocolors.git
nanoid 3.1.23 MIT https://github.com/ai/nanoid.git
nanoid 3.1.30 MIT https://github.com/ai/nanoid.git
nanopop 2.1.0 MIT https://github.com/Simonwep/nanopop.git
node-releases 1.1.72 MIT git+https://github.com/chicoxyzzy/node-releases.git
normalize-url 4.5.1 MIT https://github.com/sindresorhus/normalize-url.git
notificar 1.0.1 MIT git+https://github.com/neeksandhu/notificar.git
notistack 1.0.10 MIT git+https://github.com/iamhosseindhv/notistack.git
object-assign 4.1.1 MIT https://github.com/sindresorhus/object-assign.git
p-reduce 1.0.0 MIT https://github.com/sindresorhus/p-reduce.git
p-series 1.1.0 MIT https://github.com/sindresorhus/p-series.git
parent-module 1.0.1 MIT https://github.com/sindresorhus/parent-module.git
parse-json 5.2.0 MIT https://github.com/sindresorhus/parse-json.git
parseqs 0.0.6 MIT https://github.com/get/querystring.git
parseuri 0.0.6 MIT https://github.com/get/parseuri.git
path-fx 2.1.1 MIT git+https://github.com/NeekSandhu/path-fx.git
path-type 4.0.0 MIT https://github.com/sindresorhus/path-type.git
pathfinding 0.4.18 MIT git://github.com/qiao/PathFinding.js.git
performance-now 2.1.0 MIT git://github.com/braveg1rl/performance-now.git
pgadmin4-tree 1.0.0 MIT Unknown
picomodal 3.0.0 MIT https://github.com/Nycto/PicoModal.git
popper.js 1.16.1-lts MIT git+https://github.com/FezVrasta/popper.js.git
popper.js 1.16.1 MIT git+https://github.com/FezVrasta/popper.js.git
postcss 8.3.0 MIT https://github.com/postcss/postcss.git
postcss 8.2.15 MIT https://github.com/postcss/postcss.git
postcss-calc 8.0.0 MIT https://github.com/postcss/postcss-calc.git
postcss-colormin 5.1.1 MIT https://github.com/cssnano/cssnano.git
postcss-convert-values 5.0.1 MIT https://github.com/cssnano/cssnano.git
@@ -310,20 +388,38 @@ postcss-selector-parser 6.0.6
postcss-svgo 5.0.1 MIT https://github.com/cssnano/cssnano.git
postcss-unique-selectors 5.0.1 MIT https://github.com/cssnano/cssnano.git
postcss-value-parser 4.1.0 MIT https://github.com/TrySound/postcss-value-parser.git
prop-types 15.7.2 MIT https://github.com/facebook/prop-types.git
punycode 2.1.1 MIT https://github.com/bestiejs/punycode.js.git
raf 3.4.1 MIT git://github.com/chrisdickinson/raf.git
react 16.14.0 MIT git+https://github.com/facebook/react.git
react 17.0.2 MIT https://github.com/facebook/react.git
react-aspen 1.1.1 MIT https://github.com/neeksandhu/react-aspen.git
react-checkbox-tree 1.7.2 MIT https://github.com/jakezatecky/react-checkbox-tree
react-dom 16.14.0 MIT git+https://github.com/facebook/react.git
react-dom 17.0.2 MIT https://github.com/facebook/react.git
react-draggable 4.4.4 MIT https://github.com/react-grid-layout/react-draggable.git
react-input-autosize 3.0.0 MIT https://github.com/JedWatson/react-input-autosize.git
react-is 16.13.1 MIT https://github.com/facebook/react.git
react-is 17.0.2 MIT https://github.com/facebook/react.git
react-select 4.3.1 MIT https://github.com/JedWatson/react-select/tree/master/packages/react-select
react-table 7.7.0 MIT https://github.com/tannerlinsley/react-table
react-virtualized-auto-sizer 1.0.6 MIT https://github.com/bvaughn/react-virtualized-auto-sizer.git
react-window 1.8.6 MIT https://github.com/bvaughn/react-window.git
regenerator-runtime 0.13.7 MIT https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime
regenerator-runtime 0.11.1 MIT https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime
repeating 2.0.1 MIT https://github.com/sindresorhus/repeating.git
resolve-from 4.0.0 MIT https://github.com/sindresorhus/resolve-from.git
rgb-regex 1.0.1 MIT https://github.com/regexps/rgb-regex.git
rgba-regex 1.0.0 MIT https://github.com/johnotander/rgba-regex.git
rifm 0.7.0 MIT https://github.com/istarkov/rifm.git
safe-buffer 5.1.2 MIT git://github.com/feross/safe-buffer.git
scheduler 0.19.1 MIT https://github.com/facebook/react.git
scheduler 0.20.2 MIT https://github.com/facebook/react.git
schema-utils 3.0.0 MIT https://github.com/webpack/schema-utils.git
schema-utils 0.3.0 MIT git+https://github.com/webpack-contrib/schema-utils.git
schema-utils 1.0.0 MIT https://github.com/webpack-contrib/schema-utils
select2 4.0.13 MIT git://github.com/select2/select2.git
shallowequal 1.1.0 MIT https://github.com/dashed/shallowequal.git
shim-loader 1.0.1 MIT https://github.com/zinserjan/shim-loader
slickgrid 2.3.16 MIT git+https://github.com/6pac/SlickGrid.git
snapsvg-cjs 0.0.6 MIT git+https://github.com/geelen/Snap.svg-cjs.git
@@ -334,21 +430,29 @@ split.js 1.6.4
stable 0.1.8 MIT https://github.com/Two-Screen/stable.git
strip-ansi 3.0.1 MIT https://github.com/chalk/strip-ansi.git
strip-comments 2.0.1 MIT https://github.com/jonschlinkert/strip-comments.git
styled-components 5.2.1 MIT git+https://github.com/styled-components/styled-components.git
stylehacks 5.0.1 MIT https://github.com/cssnano/cssnano.git
stylis 4.0.10 MIT https://github.com/thysultan/stylis.js
supports-color 5.5.0 MIT https://github.com/chalk/supports-color.git
supports-color 7.2.0 MIT https://github.com/chalk/supports-color.git
supports-color 2.0.0 MIT https://github.com/chalk/supports-color.git
svgo 2.3.0 MIT git://github.com/svg/svgo.git
supports-color 7.2.0 MIT https://github.com/chalk/supports-color.git
svgo 2.7.0 MIT git://github.com/svg/svgo.git
symbol-observable 1.2.0 MIT https://github.com/blesh/symbol-observable.git
tempusdominus-bootstrap-4 5.39.0 MIT https://github.com/tempusdominus/bootstrap-4.git
tempusdominus-core 5.19.0 MIT https://github.com/tempusdominus/core.git
timsort 0.3.0 MIT https://github.com/mziccard/node-timsort.git
tiny-emitter 2.1.0 MIT https://github.com/scottcorgan/tiny-emitter.git
tiny-warning 1.0.3 MIT https://github.com/alexreardon/tiny-warning.git
tippy.js 6.3.1 MIT git+https://github.com/atomiks/tippyjs.git
to-fast-properties 2.0.0 MIT https://github.com/sindresorhus/to-fast-properties.git
to-fast-properties 1.0.3 MIT https://github.com/sindresorhus/to-fast-properties.git
trim-right 1.0.1 MIT https://github.com/sindresorhus/trim-right.git
unc-path-regex 0.1.2 MIT https://github.com/regexhq/unc-path-regex.git
underscore 1.13.1 MIT git://github.com/jashkenas/underscore.git
uniqs 2.0.0 MIT git://github.com/fgnass/uniqs.git
url-loader 1.1.2 MIT https://github.com/webpack-contrib/url-loader.git
util-deprecate 1.0.2 MIT git://github.com/TooTallNate/util-deprecate.git
valid-filename 2.0.1 MIT https://github.com/sindresorhus/valid-filename.git
vendors 1.0.4 MIT https://github.com/wooorm/vendors.git
webpack-sources 0.2.3 MIT git+https://github.com/webpack/webpack-sources.git
wkx 0.5.0 MIT http://github.com/cschwarz/wkx.git
@@ -358,10 +462,11 @@ xterm-addon-fit 0.5.0
xterm-addon-search 0.8.0 MIT https://github.com/xtermjs/xterm.js
xterm-addon-web-links 0.4.0 MIT https://github.com/xtermjs/xterm.js
yeast 0.1.2 MIT https://github.com/unshiftio/yeast.git
@fortawesome/fontawesome-free 5.15.3 (CC-BY-4.0 AND OFL-1.1 AND MIT) https://github.com/FortAwesome/Font-Awesome
@fortawesome/fontawesome-free 5.15.4 (CC-BY-4.0 AND OFL-1.1 AND MIT) https://github.com/FortAwesome/Font-Awesome
@sphinxxxx/color-conversion 2.2.2 ISC git+https://github.com/Sphinxxxx/color-conversion.git
@trysound/sax 0.1.1 ISC git://github.com/svg/sax.git
@trysound/sax 0.2.0 ISC git://github.com/svg/sax.git
boolbase 1.0.0 ISC https://github.com/fb55/boolbase
css-color-keywords 1.0.0 ISC https://github.com/sonicdoe/css-color-keywords.git
css-declaration-sorter 6.0.3 ISC https://github.com/Siilwyn/css-declaration-sorter.git
electron-to-chromium 1.3.740 ISC https://github.com/kilian/electron-to-chromium/
icss-utils 5.1.0 ISC git+https://github.com/css-modules/icss-utils.git
@@ -372,13 +477,15 @@ minimatch 3.0.4
postcss-modules-extract-imports 3.0.0 ISC https://github.com/css-modules/postcss-modules-extract-imports.git
postcss-modules-scope 3.0.0 ISC https://github.com/css-modules/postcss-modules-scope.git
postcss-modules-values 4.0.0 ISC git+https://github.com/css-modules/postcss-modules-values.git
semver 7.3.5 ISC https://github.com/npm/node-semver
semver 7.3.4 ISC https://github.com/npm/node-semver
semver 5.7.1 ISC https://github.com/npm/node-semver
semver 6.3.0 ISC https://github.com/npm/node-semver
vanilla-picker 2.11.2 ISC https://github.com/Sphinxxxx/vanilla-picker.git
yallist 4.0.0 ISC git+https://github.com/isaacs/yallist.git
yaml 1.10.2 ISC https://github.com/eemeli/yaml.git
ace-builds 1.4.12 BSD-3-Clause https://github.com/ajaxorg/ace-builds.git
hoist-non-react-statics 3.3.2 BSD-3-Clause git://github.com/mridgway/hoist-non-react-statics.git
hyphenate-style-name 1.0.4 BSD-3-Clause git+ssh://git@github.com/rexxars/hyphenate-style-name.git
istanbul-lib-coverage 1.2.1 BSD-3-Clause git@github.com:istanbuljs/istanbuljs.git
istanbul-lib-coverage 3.0.0 BSD-3-Clause git+ssh://git@github.com/istanbuljs/istanbuljs.git
istanbul-lib-instrument 1.10.2 BSD-3-Clause git@github.com:istanbuljs/istanbuljs.git
@@ -386,34 +493,36 @@ istanbul-lib-instrument 4.0.3
istanbul-lib-report 3.0.0 BSD-3-Clause git+ssh://git@github.com/istanbuljs/istanbuljs.git
istanbul-lib-source-maps 4.0.0 BSD-3-Clause git+ssh://git@github.com/istanbuljs/istanbuljs.git
istanbul-reports 3.0.2 BSD-3-Clause git+ssh://git@github.com/istanbuljs/istanbuljs.git
react-transition-group 4.4.1 BSD-3-Clause https://github.com/reactjs/react-transition-group.git
source-map 0.5.7 BSD-3-Clause http://github.com/mozilla/source-map.git
source-map 0.6.1 BSD-3-Clause http://github.com/mozilla/source-map.git
source-map-js 0.6.2 BSD-3-Clause http://github.com/7rulnik/source-map.git
sprintf-js 1.1.2 BSD-3-Clause https://github.com/alexei/sprintf.js.git
bootstrap-datepicker 1.9.0 Apache-2.0 https://github.com/uxsolutions/bootstrap-datepicker.git
eve 0.5.4 Apache-2.0 git@github.com:adobe-webplatform/eve.git
indefinite-observable 2.0.1 Apache-2.0 git@github.com:material-motion/indefinite-observable-js.git
jmespath 0.15.0 Apache-2.0 git://github.com/jmespath/jmespath.js
jsoneditor 9.5.3 Apache-2.0 https://github.com/josdejong/jsoneditor.git
jsoneditor 9.5.6 Apache-2.0 https://github.com/josdejong/jsoneditor.git
paths-js 0.4.11 Apache-2.0 https://github.com/andreaferretti/paths-js.git
snapsvg 0.5.1 Apache-2.0 git@github.com:adobe-webplatform/Snap.svg.git
caniuse-lite 1.0.30001230 CC-BY-4.0 https://github.com/browserslist/caniuse-lite.git
css-select 3.1.2 BSD-2-Clause git://github.com/fb55/css-select.git
css-what 4.0.0 BSD-2-Clause https://github.com/fb55/css-what
css-select 4.1.3 BSD-2-Clause git://github.com/fb55/css-select.git
css-what 5.1.0 BSD-2-Clause https://github.com/fb55/css-what
domelementtype 2.2.0 BSD-2-Clause git://github.com/fb55/domelementtype.git
domhandler 4.2.0 BSD-2-Clause git://github.com/fb55/domhandler.git
domutils 2.6.0 BSD-2-Clause git://github.com/fb55/domutils.git
entities 2.2.0 BSD-2-Clause git://github.com/fb55/entities.git
esutils 2.0.3 BSD-2-Clause http://github.com/estools/esutils.git
leaflet 1.7.1 BSD-2-Clause git://github.com/Leaflet/Leaflet.git
nth-check 2.0.0 BSD-2-Clause https://github.com/fb55/nth-check
nth-check 2.0.1 BSD-2-Clause https://github.com/fb55/nth-check
uri-js 4.4.1 BSD-2-Clause http://github.com/garycourt/uri-js
FileSaver 0.10.0 UNKNOWN Unknown
heap 0.2.5 UNKNOWN git://github.com/qiao/heap.js.git
mdn-data 2.0.14 CC0-1.0 https://github.com/mdn/data.git
mousetrap 1.6.5 Apache-2.0 WITH LLVM-exception git://github.com/ccampbell/mousetrap.git
pako 1.0.11 (MIT AND Zlib) https://github.com/nodeca/pako.git
precond 0.2.3 MIT* https://github.com/MathieuTurcotte/node-precond.git
webcabin-docker 2.2.5 MIT* Unknown
tablesorter 2.31.3 (MIT OR GPL-2.0) git://github.com/Mottie/tablesorter.git
345 dependencies listed.
452 dependencies listed.
+9 -10
View File
@@ -12,7 +12,7 @@
# and clean up the web/ source code
#########################################################################
FROM alpine:3.14 AS app-builder
FROM alpine:3.15 AS app-builder
RUN apk add --no-cache \
autoconf \
@@ -60,7 +60,7 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
# Next, create the base environment for Python
#########################################################################
FROM alpine:3.14 as env-builder
FROM alpine:3.15 as env-builder
# Install dependencies
COPY requirements.txt /
@@ -76,6 +76,9 @@ RUN apk add --no-cache \
krb5-dev \
rust \
cargo \
zlib-dev \
libjpeg-turbo-dev \
libpng-dev \
python3-dev && \
python3 -m venv --system-site-packages --without-pip /venv && \
/venv/bin/python3 -m pip install --no-cache-dir -r requirements.txt && \
@@ -108,21 +111,15 @@ RUN rm -rf /pgadmin4/docs/en_US/_build/html/_static/*.png
# Create additional builders to get all of the PostgreSQL utilities
#########################################################################
FROM postgres:9.6-alpine as pg96-builder
FROM postgres:10-alpine as pg10-builder
FROM postgres:11-alpine as pg11-builder
FROM postgres:12-alpine as pg12-builder
FROM postgres:13-alpine as pg13-builder
FROM postgres:14-alpine as pg14-builder
FROM alpine:3.14 as tool-builder
FROM alpine:3.15 as tool-builder
# Copy the PG binaries
COPY --from=pg96-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.6/
COPY --from=pg96-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.6/
COPY --from=pg96-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.6/
COPY --from=pg96-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-9.6/
COPY --from=pg10-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-10/
COPY --from=pg10-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-10/
COPY --from=pg10-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-10/
@@ -152,7 +149,7 @@ COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
# Assemble everything into the final container.
#########################################################################
FROM alpine:3.14
FROM alpine:3.15
# Copy in the Python packages
COPY --from=env-builder /venv /venv
@@ -183,9 +180,11 @@ RUN apk add \
py3-pip \
postfix \
krb5-libs \
libjpeg-turbo \
shadow \
sudo \
libedit \
libldap \
libcap && \
/venv/bin/python3 -m pip install --no-cache-dir gunicorn && \
find / -type d -name '__pycache__' -exec rm -rf {} + && \
+1 -1
View File
@@ -1,6 +1,6 @@
pgAdmin 4
Copyright (C) 2013 - 2021, The pgAdmin Development Team
Copyright (C) 2013 - 2022, The pgAdmin Development Team
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose, without fee, and without a written agreement is
+4 -10
View File
@@ -272,17 +272,11 @@ REM Main build sequence Ends
REM YARN END
REM WGET
REM Comment out the below for loop as the latest version (0.57.0) having
REM some problem, so for the time being hardcoded the version to 0.55.0
REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
REM :GET_NW
REM wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
REM IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
:GET_NW
wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
REM tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1
SET "NW_VERSION=0.55.0"
wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1
REM WGET END
+27 -23
View File
@@ -67,8 +67,8 @@ Use the fields in the *General* tab to specify parameters for the backup:
* Use the dropdown listbox next to *Rolename* to specify the role that owns the
backup.
Click the *Dump options* tab to continue. Use the box fields in the *Dump
options* tab to provide options for *pg_dump*.
Click the *Data/Objects* tab to continue. Use the fields in the *Data/Objects*
tab to provide options related to data or pgAdmin objects that correspond to *pg_dump*.
.. image:: images/backup_sections.png
:alt: Sections option on backup dialog
@@ -77,13 +77,13 @@ options* tab to provide options for *pg_dump*.
* Move switches in the **Sections** field box to select a portion of the object
that will be backed up.
* Move the switch next to *Pre-data* to the *Yes* position to include all
* Move the switch next to *Pre-data* towards right position to include all
data definition items not included in the data or post-data item lists.
* Move the switch next to *Data* to the *Yes* position to backup actual table
* Move the switch next to *Data* towards right position to backup actual table
data, large-object contents, and sequence values.
* Move the switch next to *Post-data* to the *Yes* position to include
* Move the switch next to *Post-data* towards right position to include
definitions of indexes, triggers, rules, and constraints other than
validated check constraints.
@@ -94,13 +94,13 @@ options* tab to provide options for *pg_dump*.
* Move switches in the **Type of objects** field box to specify details about
the type of objects that will be backed up.
* Move the switch next to *Only data* to the *Yes* position to limit the back
* Move the switch next to *Only data* towards right position to limit the back
up to data.
* Move the switch next to *Only schema* to limit the back up to schema-level
database objects.
* Move the switch next to *Blobs* to the *No* position to exclude large
* Move the switch next to *Blobs* towards left position to exclude large
objects in the backup.
.. image:: images/backup_do_not_save.png
@@ -110,22 +110,26 @@ options* tab to provide options for *pg_dump*.
* Move switches in the **Do not save** field box to select the objects that will
not be included in the backup.
* Move the switch next to *Owner* to the *Yes* position to exclude commands
* Move the switch next to *Owner* towards right position to exclude commands
that set object ownership.
* Move the switch next to *Privilege* to the *Yes* position to exclude
* Move the switch next to *Privilege* towards right position to exclude
commands that create access privileges.
* Move the switch next to *Tablespace* to the *Yes* position to exclude
* Move the switch next to *Tablespace* towards right position to exclude
tablespaces.
* Move the switch next to *Unlogged table data* to the *Yes* position to
* Move the switch next to *Unlogged table data* towards right position to
exclude the contents of unlogged tables.
* Move the switch next to *Comments* to the *Yes* position to exclude
* Move the switch next to *Comments* towards right position to exclude
commands that set the comments. **Note:** This option is visible only for
database server greater than or equal to 11.
Click the *Options* tab to continue. Use these additional fields to specify
options like including ddl statements, verbose message or using set session
authorization corresponding to *pg_dump* options.
.. image:: images/backup_queries.png
:alt: Queries option on backup dialog
:align: center
@@ -133,24 +137,24 @@ options* tab to provide options for *pg_dump*.
* Move switches in the **Queries** field box to specify the type of statements
that should be included in the backup.
* Move the switch next to *Use Column Inserts* to the *Yes* position to dump
* Move the switch next to *Use Column Inserts* towards right position to dump
the data in the form of INSERT statements and include explicit column
names. Please note: this may make restoration from backup slow.
* Move the switch next to *Use Insert commands* to the *Yes* position to
* Move the switch next to *Use Insert commands* towards right position to
dump the data in the form of INSERT statements rather than using a COPY
command. Please note: this may make restoration from backup slow.
* Move the switch next to *Include CREATE DATABASE statement* to the *Yes*
* Move the switch next to *Include CREATE DATABASE statement* towards right
position to include a command in the backup that creates a new database
when restoring the backup.
* Move the switch next to *Include DROP DATABASE statement* to the *Yes*
* Move the switch next to *Include DROP DATABASE statement* towards right
position to include a command in the backup that will drop any existing
database object with the same name before recreating the object during a
backup.
* Move the switch next to *Load Via Partition Root* to the *Yes* position,
* Move the switch next to *Load Via Partition Root* towards right position,
so when dumping a COPY or INSERT statement for a partitioned table, target
the root of the partitioning hierarchy which contains it rather than the
partition itself. **Note:** This option is visible only for database server
@@ -164,10 +168,10 @@ options* tab to provide options for *pg_dump*.
that should be excluded from the backup.
* Move the switch next to *Trigger* (active when creating a data-only backup)
to the *Yes* position to include commands that will disable triggers on the
towards right position to include commands that will disable triggers on the
target table while the data is being loaded.
* Move the switch next to *$ quoting* to the *Yes* position to enable dollar
* Move the switch next to *$ quoting* towards right position to enable dollar
quoting within function bodies; if disabled, the function body will be
quoted using SQL standard string syntax.
@@ -178,16 +182,16 @@ options* tab to provide options for *pg_dump*.
* Move switches in the **Miscellaneous** field box to specify miscellaneous
backup options.
* Move the switch next to *With OIDs* to the *Yes* position to include object
* Move the switch next to *With OIDs* towards right position to include object
identifiers as part of the table data for each table.
* Move the switch next to *Verbose messages* to the *No* position to instruct
* Move the switch next to *Verbose messages* towards left position to instruct
*pg_dump* to exclude verbose messages.
* Move the switch next to *Force double quotes on identifiers* to the *Yes*
* Move the switch next to *Force double quotes on identifiers* towards right
position to force the quoting of all identifiers.
* Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
* Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
position to include a statement that will use a SET SESSION AUTHORIZATION
command to determine object ownership (instead of an ALTER OWNER command).
+18 -15
View File
@@ -28,10 +28,13 @@ Use the fields in the *General* tab to specify the following:
:alt: Type of objects option on backup server dialog
:align: center
Click the *Data/Objects* tab to continue. Use the fields in the *Data/Objects*
tab to provide options related to data or pgAdmin objects that correspond to *pg_dump*.
* Move switches in the **Type of objects** field box to specify details about
the type of objects that will be backed up.
* Move the switch next to *Only data* to the *Yes* position to limit the back
* Move the switch next to *Only data* towards right position to limit the back
up to data.
* Move the switch next to *Only schema* to limit the back up to schema-level
@@ -44,19 +47,19 @@ Use the fields in the *General* tab to specify the following:
* Move switches in the **Do not save** field box to select the objects that will
not be included in the backup.
* Move the switch next to *Owner* to the *Yes* position to exclude commands
* Move the switch next to *Owner* towards right position to exclude commands
that set object ownership.
* Move the switch next to *Privilege* to the *Yes* position to exclude
* Move the switch next to *Privilege* towards right position to exclude
commands that create access privileges.
* Move the switch next to *Tablespace* to the *Yes* position to exclude
* Move the switch next to *Tablespace* towards right position to exclude
tablespaces.
* Move the switch next to *Unlogged table data* to the *Yes* position to
* Move the switch next to *Unlogged table data* towards right position to
exclude the contents of unlogged tables.
* Move the switch next to *Comments* to the *Yes* position to exclude
* Move the switch next to *Comments* towards right position to exclude
commands that set the comments. **Note:** This option is visible only for
database server greater than or equal to 11.
@@ -67,15 +70,15 @@ Use the fields in the *General* tab to specify the following:
* Move switches in the **Queries** field box to specify the type of statements
that should be included in the backup.
* Move the switch next to *Use Column Inserts* to the *Yes* position to dump
* Move the switch next to *Use Column Inserts* towards right position to dump
the data in the form of INSERT statements and include explicit column
names. Please note: this may make restoration from backup slow.
* Move the switch next to *Use Insert commands* to the *Yes* position to dump
* Move the switch next to *Use Insert commands* towards right position to dump
the data in the form of INSERT statements rather than using a COPY command.
Please note: this may make restoration from backup slow.
* Move the switch next to *Include DROP DATABASE statement* to the *Yes*
* Move the switch next to *Include DROP DATABASE statement* towards right
position to include a command in the backup that will drop any existing
database object with the same name before recreating the object during a
backup.
@@ -89,10 +92,10 @@ Use the fields in the *General* tab to specify the following:
that should be excluded from the backup.
* Move the switch next to *Trigger* (active when creating a data-only backup)
to the *Yes* position to include commands that will disable triggers on the
towards right position to include commands that will disable triggers on the
target table while the data is being loaded.
* Move the switch next to *$ quoting* to the *Yes* position to enable dollar
* Move the switch next to *$ quoting* towards right position to enable dollar
quoting within function bodies; if disabled, the function body will be
quoted using SQL standard string syntax.
@@ -103,16 +106,16 @@ Use the fields in the *General* tab to specify the following:
* Move switches in the **Miscellaneous** field box to specify miscellaneous
backup options.
* Move the switch next to *With OIDs* to the *Yes* position to include object
* Move the switch next to *With OIDs* towards right position to include object
identifiers as part of the table data for each table.
* Move the switch next to *Verbose messages* to the *No* position to instruct
* Move the switch next to *Verbose messages* towards left position to instruct
*pg_dump* to exclude verbose messages.
* Move the switch next to *Force double quotes on identifiers* to the *Yes*
* Move the switch next to *Force double quotes on identifiers* towards right
position to force the quoting of all identifiers.
* Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
* Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
position to include a statement that will use a SET SESSION AUTHORIZATION
command to determine object ownership (instead of an ALTER OWNER command).
+1 -1
View File
@@ -16,7 +16,7 @@ review process for any patches submitted for inclusion in pgAdmin.
bulk updates every year). The start date should always be 2013, and the end year
the current year, e.g.
Copyright (C) 2013 - 2021, The pgAdmin Development Team
Copyright (C) 2013 - 2022, The pgAdmin Development Team
* Ensure there's a blank line immediately following any copyright headers.
+1 -1
View File
@@ -122,7 +122,7 @@ with the required file header is shown below::
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
+1 -3
View File
@@ -17,7 +17,6 @@ maintenance functions to be executed. Multiple versions are included in the
following directories to allow use with different versions of the database
server:
* PostgreSQL 9.6: */usr/local/pgsql-9.6*
* PostgreSQL 10: */usr/local/pgsql-10*
* PostgreSQL 11: */usr/local/pgsql-11*
* PostgreSQL 12: */usr/local/pgsql-12*
@@ -33,8 +32,7 @@ The default binary paths set in the container are as follows:
'pg-13': '/usr/local/pgsql-13',
'pg-12': '/usr/local/pgsql-12',
'pg-11': '/usr/local/pgsql-11',
'pg-10': '/usr/local/pgsql-10',
'pg-9.6': '/usr/local/pgsql-9.6'
'pg-10': '/usr/local/pgsql-10'
}
this may be changed in the :ref:`preferences`.
+1
View File
@@ -33,6 +33,7 @@ Mode is pre-configured for security.
deployment
login
mfa
user_management
change_user_password
restore_locked_user
Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 KiB

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 154 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 98 KiB

+52 -10
View File
@@ -1,4 +1,4 @@
.. _export_import_servers:
.. _import_export_servers:
******************************
`Import/Export Servers`:index:
@@ -6,14 +6,56 @@
Server definitions (and their groups) can be exported to a JSON file and
re-imported to the same or a different system to enable easy pre-configuration
of pgAdmin. The ``setup.py`` script is used for this purpose.
of pgAdmin.
.. note:: To export or import servers, you must use the Python interpreter that
is normally used to run pgAdmin to ensure that the required Python
packages are available. In most packages, this can be found in the
Python Virtual Environment that can be found in the installation
directory. When using platform-native packages, the system installation
of Python may be the one used by pgAdmin.
Using pgAdmin 4 GUI
###################
To launch the *Import/Export Servers...* tool, navigate through *Tools* on the
menu bar to click on the *Import/Export Servers* option.
.. image:: images/import_export_servers_step1.png
:alt: Import/Export Servers step one page
:align: center
* Use the *Import/Export* field to select the Server Groups/Servers
to be imported or exported.
* Use the *Filename* field to select the JSON file to import servers or create the
new file in case of Export where the servers to be exported in the JSON format.
* Use the *Remove all the existing servers?* field to specify whether to remove all the
existing servers or not before importing the new selected servers.
This field is applicable only in case of Import Servers.
Click the *Next* button to continue, or the *X* button to close the wizard.
.. image:: images/import_export_servers_step2.png
:alt: Import/Export Servers step two page
:align: center
* Select the Server Groups/ Servers to be imported/exported.
Click the *Next* button to continue, or the *X* button to close the wizard.
.. image:: images/import_export_servers_step3.png
:alt: Import/Export Servers step three page
:align: center
Check the summary of the servers that are going to be imported/exported on the
Summary page.
Click the *Finish* button to close the wizard.
Using 'setup.py' command line script
####################################
.. note:: To export or import servers using ``setup.py`` script, you must use
the Python interpreter that is normally used to run pgAdmin to ensure
that the required Python packages are available. In most packages, this
can be found in the Python Virtual Environment that can be found in the
installation directory. When using platform-native packages, the system
installation of Python may be the one used by pgAdmin.
Exporting Servers
*****************
@@ -23,7 +65,7 @@ the ``--dump-servers`` command line option, followed by the name (and if require
path) to the desired output file. By default, servers owned by the desktop mode
user will be dumped (pgadmin4@pgadmin.org by default - see the DESKTOP_USER
setting in ``config.py``). This can be overridden with the ``--user`` command
line option. There can be multiple configuations of pgAdmin on the same system.
line option. There can be multiple configurations of pgAdmin on the same system.
To dump the servers from specific pgAdmin config DB file, ``--sqlite-path`` option
can be used. It is also recommended to use this option when running pgAdmin in
desktop mode. By default SQLITE_PATH setting in ``config.py`` is taken.
@@ -56,7 +98,7 @@ the ``--load-servers`` command line option, followed by the name (and if require
path) of the JSON file containing the server definitions. Servers will be owned
by the desktop mode user (pgadmin4@pgadmin.org by default - see the DESKTOP_USER
setting in ``config.py``). This can be overridden with the ``--user`` command
line option. There can be multiple configuations of pgAdmin on the same system.
line option. There can be multiple configurations of pgAdmin on the same system.
The default behaviour is for the imported servers to be added to the existent list,
which might lead to duplicates. This can be overridden with the ``--replace`` command
line option, which will replace the list of servers with the newly imported one.
+4
View File
@@ -27,3 +27,7 @@ of database objects.
contributions
release_notes
licence
.. note:: Postgres, PostgreSQL and the Slonik Logo are trademarks or
registered trademarks of the `PostgreSQL Community Association of Canada
<https://www.postgres.ca/>`_, and used with their permission.
+1 -1
View File
@@ -13,7 +13,7 @@ documentation is attributed to the
.. topic:: pgAdmin 4
Copyright (C) 2013 - 2021, The pgAdmin Development Team
Copyright (C) 2013 - 2022, The pgAdmin Development Team
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose, without fee, and without a written agreement is
+21 -21
View File
@@ -96,40 +96,40 @@ Use the *Tools* menu to access the following options (in alphabetical order):
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| Option | Action |
+===========================+===========================================================================================================================================+
| *Add named restore point* | Click to open the :ref:`Add named restore point... <add_restore_point_dialog>` dialog to take a point-in-time snapshot of the current |
| | server state. |
| *ERD Tool* | Click to open the :ref:`ERD Tool <erd_tool>` and start designing your database. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Backup...* | Click to open the :ref:`Backup... <backup_dialog>` dialog to backup database objects. |
| *Grant Wizard...* | Click to access the :ref:`Grant Wizard <grant_wizard>` tool. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *PSQL Tool* | Click to open the :ref:`PSQL Tool <psql_tool>` and start PSQL in the current database context. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Query tool* | Click to open the :ref:`Query tool <query_tool>` for the currently selected object. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Schema Diff* | Click to open the :ref:`Schema Diff <schema_diff_feature>` and start comparing two database or two schema. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Backup Globals...* | Click to open the :ref:`Backup Globals... <backup_globals_dialog>` dialog to backup cluster objects. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Backup Server...* | Click to open the :ref:`Backup Server... <backup_server_dialog>` dialog to backup a server. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Grant Wizard...* | Click to access the :ref:`Grant Wizard <grant_wizard>` tool. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Import/Export...* | Click to open the :ref:`Import/Export data... <import_export_data>` dialog to import or export data from a table. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Maintenance...* | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Pause replay of WAL* | Click to pause the replay of the WAL log. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Query tool* | Click to open the :ref:`Query tool <query_tool>` for the currently selected object. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Reload Configuration...* | Click to update configuration files without restarting the server. |
| *Backup...* | Click to open the :ref:`Backup... <backup_dialog>` dialog to backup database objects. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Restore...* | Click to access the :ref:`Restore <restore_dialog>` dialog to restore database files from a backup. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Resume replay of WAL* | Click to resume the replay of the WAL log. |
| *Import/Export Data...* | Click to open the :ref:`Import/Export data... <import_export_data>` dialog to import or export data from a table. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Storage Manager* | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *New ERD Project* | Click to open the :ref:`ERD Tool <erd_tool>` and start designing your database. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Schema Diff* | Click to open the :ref:`Schema Diff <schema_diff_feature>` and start comparing two database or two schema. |
| *Maintenance...* | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Search Objects...* | Click to open the :ref:`Search Objects... <search_objects>` and start searching any kind of objects in a database. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *PSQL Tool* | Click to open the :ref:`PSQL Tool <psql_tool>` and start PSQL in the current database context. |
| *Add named restore point* | Click to open the :ref:`Add named restore point... <add_restore_point_dialog>` dialog to take a point-in-time snapshot of the current |
| | server state. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Pause replay of WAL* | Click to pause the replay of the WAL log. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Resume replay of WAL* | Click to resume the replay of the WAL log. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Reload Configuration...* | Click to update configuration files without restarting the server. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
| *Storage Manager* | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files. |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
The Help Menu
+57
View File
@@ -0,0 +1,57 @@
.. _mfa:
*************************************************
`Enabling two-factor authentication (2FA)`:index:
*************************************************
About two-factor authentication
===============================
Two-factor authentication (2FA) is an extra layer of security used when logging
into websites or apps. With 2FA, you have to log in with your username and
password and provide another form of authentication that only you know or have
access to.
Setup two-factor authentication
===============================
To set up 2FA for pgAdmin 4, you must configure the Two-factor Authentication
settings in *config_local.py* or *config_system.py* (see the
:ref:`config.py <config_py>` documentation) on the system where pgAdmin is
installed in Server mode. You can copy these settings from *config.py* file and
modify the values for the following parameters.
.. csv-table::
:header: "**Parameter**", "**Description**"
:class: longtable
:widths: 35, 55
"MFA_ENABLED","The default value for this parameter is True.
To disable 2FA, set the value to *False*"
"SUPPORTED_MFA_LIST", "Set the authentication methods to be supported "
"MFA_EMAIL_SUBJECT", "<APP_NAME> - Verification Code e.g. pgAdmin 4 -
Verification Code"
"MFA_FORCE_REGISTRATION", "Force the user to configure the authentication
method on login (if no authentication is already configured)."
*NOTE: You must set the 'Mail server settings' in config_local.py or
config_system.py in order to use 'email' as two-factor authentication method
(see the* :ref:`config.py <config_py>` *documentation).*
Configure two-factor authentication
===================================
To configure 2FA for a user, you must click on 'Two-factor Authentication'
in the `User` menu in right-top corner. It will list down all the supported
multi factor authentication methods. Click on 'Setup' of one of those methods
and follow the steps for each authentication method. You will see the `Delete`
button for the authentication method, which is already been configured.
Clicking on `Delete` button will deregister the authentication method for the
current user.
.. image:: images/mfa_registration.png
:alt: Configure two-factor authentication
:align: center
You can also force users to configure the two-factor
authentication methods on login by setting *MFA_FORCE_REGISTRATION* parameter
to *True*.
+1 -1
View File
@@ -207,7 +207,7 @@ the *Data Output* tab.
* Table
*Table* tab shows the plan details in table format, it generates table format
similar to *explain.depsez.com*. Each row of the table represent the data for a
similar to *explain.depesz.com*. Each row of the table represent the data for a
*Explain Plan Node*. It may contain the node information, exclusive timing,
inclusive timing, actual vs planned rows differences, actual rows, planned
rows, loops.
+3
View File
@@ -11,6 +11,9 @@ notes for it.
.. toctree::
:maxdepth: 1
release_notes_6_4
release_notes_6_3
release_notes_6_2
release_notes_6_1
release_notes_6_0
release_notes_5_7
+41
View File
@@ -0,0 +1,41 @@
************
Version 6.2
************
Release date: 2021-11-18
This release contains a number of bug fixes and new features since the release of pgAdmin4 6.1.
New features
************
| `Issue #3834 <https://redmine.postgresql.org/issues/3834>`_ - Added support of Aggregate and Operator node in view-only mode.
| `Issue #6953 <https://redmine.postgresql.org/issues/6953>`_ - Ensure that users should be able to modify the REMOTE_USER environment variable as per their environment by introducing the new config parameter WEBSERVER_REMOTE_USER.
Housekeeping
************
Bug fixes
*********
| `Issue #5427 <https://redmine.postgresql.org/issues/5427>`_ - Fixed pgAdmin freezing issue by providing the error message for the operation that can't perform due to lock on the particular table.
| `Issue #6780 <https://redmine.postgresql.org/issues/6780>`_ - Ensure that columns should be merged if the newly added column is present in the parent table.
| `Issue #6809 <https://redmine.postgresql.org/issues/6809>`_ - Fixed an issue where pgAdmin is not opening properly.
| `Issue #6832 <https://redmine.postgresql.org/issues/6832>`_ - Ensure that internal authentication when combined with other authentication providers, the order of internal source should not matter while picking up the provider.
| `Issue #6845 <https://redmine.postgresql.org/issues/6845>`_ - Ensure that inherit table icon should be visible properly in the tree view.
| `Issue #6859 <https://redmine.postgresql.org/issues/6859>`_ - Fixed an issue where properties panel is not updated when any object is added from the browser tree.
| `Issue #6896 <https://redmine.postgresql.org/issues/6896>`_ - Ensure that the user should be able to navigate browser tree objects using arrow keys from keyboard.
| `Issue #6905 <https://redmine.postgresql.org/issues/6905>`_ - Fixed an issue where database nodes are not getting loaded behind a reverse proxy with SSL.
| `Issue #6925 <https://redmine.postgresql.org/issues/6925>`_ - Fixed SQL syntax error if select "Custom auto-vacuum" option and not set Autovacuum option to Yes or No.
| `Issue #6939 <https://redmine.postgresql.org/issues/6939>`_ - Fixed an issue where older server group name displayed in the confirmation pop-up when the user removes server group.
| `Issue #6944 <https://redmine.postgresql.org/issues/6944>`_ - Fixed an issue where JSON editor preview colours have inappropriate contrast in dark mode.
| `Issue #6945 <https://redmine.postgresql.org/issues/6945>`_ - Fixed JSON Editor scrolling issue in code mode.
| `Issue #6940 <https://redmine.postgresql.org/issues/6940>`_ - Fixed an issue where user details are not shown when the non-admin user tries to connect to the shared server.
| `Issue #6949 <https://redmine.postgresql.org/issues/6949>`_ - Ensure that dialog should be opened when clicking on Reassign/Drop owned menu.
| `Issue #6954 <https://redmine.postgresql.org/issues/6954>`_ - Ensure that changing themes should work on Windows when system high contrast mode is enabled.
| `Issue #6972 <https://redmine.postgresql.org/issues/6972>`_ - Ensure that the Binary path for PG14 should be visible in the preferences.
| `Issue #6974 <https://redmine.postgresql.org/issues/6974>`_ - Added operators and aggregates in search objects.
| `Issue #6976 <https://redmine.postgresql.org/issues/6976>`_ - Fixed an issue where textarea should be allowed to resize and have more than 255 chars.
| `Issue #6981 <https://redmine.postgresql.org/issues/6981>`_ - Fixed an issue where SQL for index shows the same column multiple times.
| `Issue #6988 <https://redmine.postgresql.org/issues/6988>`_ - Reset the layout if pgAdmin4 detects the layout is in an inconsistent state.
+50
View File
@@ -0,0 +1,50 @@
************
Version 6.3
************
Release date: 2021-12-16
This release contains a number of bug fixes and new features since the release of pgAdmin4 6.2.
New features
************
| `Issue #6543 <https://redmine.postgresql.org/issues/6543>`_ - Added support for Two-factor authentication for improving security.
| `Issue #6872 <https://redmine.postgresql.org/issues/6872>`_ - Include GSSAPI support in the PostgreSQL libraries and utilities on macOS.
| `Issue #7039 <https://redmine.postgresql.org/issues/7039>`_ - Added support to disable the auto-discovery of the database servers.
Housekeeping
************
| `Issue #6088 <https://redmine.postgresql.org/issues/6088>`_ - Replace Flask-BabelEx with Flask-Babel.
| `Issue #6984 <https://redmine.postgresql.org/issues/6984>`_ - Port Backup Global, Backup Server, and Backup object dialog in React.
| `Issue #7004 <https://redmine.postgresql.org/issues/7004>`_ - Replaced alertifyjs notifiers with React-based notistack.
| `Issue #7010 <https://redmine.postgresql.org/issues/7010>`_ - Upgrade Flask to version 2.
| `Issue #7053 <https://redmine.postgresql.org/issues/7053>`_ - Replace Alertify alert and confirm with React-based model dialog.
Bug fixes
*********
| `Issue #6840 <https://redmine.postgresql.org/issues/6840>`_ - Fixed an issue where tooltip data are not displaying on downloaded graphical explain plan.
| `Issue #6877 <https://redmine.postgresql.org/issues/6877>`_ - Fixed schema diff owner related issue.
| `Issue #6906 <https://redmine.postgresql.org/issues/6906>`_ - Fixed an issue where referenced table drop-down should be disabled in foreign key -> columns after one row is added.
| `Issue #6955 <https://redmine.postgresql.org/issues/6955>`_ - Ensure that sort order should be maintained when renaming a server group.
| `Issue #6957 <https://redmine.postgresql.org/issues/6957>`_ - Fixed schema diff related some issues.
| `Issue #6963 <https://redmine.postgresql.org/issues/6963>`_ - Ensure that the user should be allowed to set the schema of an extension while creating it.
| `Issue #6978 <https://redmine.postgresql.org/issues/6978>`_ - Increase the width of the scrollbars.
| `Issue #6986 <https://redmine.postgresql.org/issues/6986>`_ - Fixed an issue where the user can't debug function with timestamp parameter.
| `Issue #6989 <https://redmine.postgresql.org/issues/6989>`_ - Fixed an issue where the Change Password menu option is missing for internal authentication source when more than one authentication source is defined.
| `Issue #7005 <https://redmine.postgresql.org/issues/7005>`_ - Fixed an issue where On-demand rows throw an error when any row cell is edited and saved it then scroll to get more rows.
| `Issue #7006 <https://redmine.postgresql.org/issues/7006>`_ - Ensure that Python 3.10 and the latest eventlet dependency should not break the application.
| `Issue #7013 <https://redmine.postgresql.org/issues/7013>`_ - Fix an RPM build issue that could lead to a conflict with python3 at installation.
| `Issue #7015 <https://redmine.postgresql.org/issues/7015>`_ - Fixed an issue where the error is thrown while creating a new server using Add New Server from the dashboard while tree item is not selected.
| `Issue #7020 <https://redmine.postgresql.org/issues/7020>`_ - Ensure that statue message should not hide the last line of messages when running a long query.
| `Issue #7024 <https://redmine.postgresql.org/issues/7024>`_ - Fixed an issue where reverse engineering SQL is wrong for Aggregate.
| `Issue #7029 <https://redmine.postgresql.org/issues/7029>`_ - Correct the SQL definition for function/procedure with the Atomic keyword in PG14.
| `Issue #7031 <https://redmine.postgresql.org/issues/7031>`_ - Fixed an issue where SQLite database definition is wrong because the USER_ID FK references the table user_old which is not available.
| `Issue #7040 <https://redmine.postgresql.org/issues/7040>`_ - Add "section" to the Debian package control files.
| `Issue #7044 <https://redmine.postgresql.org/issues/7044>`_ - Update the dropzone version to 5.9.3 and Flask-SQLAlchemy to 2.5.*.
| `Issue #7046 <https://redmine.postgresql.org/issues/7046>`_ - Fixed some accessibility issues.
| `Issue #7048 <https://redmine.postgresql.org/issues/7048>`_ - Fixed unhashable type issue while opening the about dialog.
| `Issue #7064 <https://redmine.postgresql.org/issues/7064>`_ - Ensure that the Owner should not be disabled while creating the procedure.
| `Issue #7071 <https://redmine.postgresql.org/issues/7071>`_ - Fixed an issue where confirmation pop-up is hidden behind Reassign/Drop Owned Dialog.
+32
View File
@@ -0,0 +1,32 @@
************
Version 6.4
************
Release date: 2021-01-13
This release contains a number of bug fixes and new features since the release of pgAdmin4 6.3.
New features
************
| `Issue #4803 <https://redmine.postgresql.org/issues/4803>`_ - Added support to import/export server groups and servers from GUI.
Housekeeping
************
| `Issue #7018 <https://redmine.postgresql.org/issues/7018>`_ - Port Restore dialog to React.
| `Issue #7019 <https://redmine.postgresql.org/issues/7019>`_ - Port Maintenance dialog to React.
Bug fixes
*********
| `Issue #6745 <https://redmine.postgresql.org/issues/6745>`_ - Fixed an issue where Tablespace is created though an error is shown on the dialog.
| `Issue #7003 <https://redmine.postgresql.org/issues/7003>`_ - Fixed an issue where Explain Analyze shows negative exclusive time.
| `Issue #7034 <https://redmine.postgresql.org/issues/7034>`_ - Fixed an issue where Columns with default value not showing when adding a new row.
| `Issue #7075 <https://redmine.postgresql.org/issues/7075>`_ - Ensure that help should be visible properly for Procedures.
| `Issue #7077 <https://redmine.postgresql.org/issues/7077>`_ - Fixed an issue where the Owner is not displayed in the reverse engineering SQL for Procedures.
| `Issue #7078 <https://redmine.postgresql.org/issues/7078>`_ - Fixed an issue where an operation error message pop up showing the database object's name incorrectly.
| `Issue #7081 <https://redmine.postgresql.org/issues/7081>`_ - Fixed an issue in SQL generation for PostgreSQL-14 functions.
| `Issue #7093 <https://redmine.postgresql.org/issues/7093>`_ - Fixed an issue where SubPlans may overlap other nodes & make them inaccessible in Graphical EXPLAIN View.
| `Issue #7096 <https://redmine.postgresql.org/issues/7096>`_ - Ensure that Truncate and Reset statistics should work.
| `Issue #7102 <https://redmine.postgresql.org/issues/7102>`_ - Fixed a schema diff issue where generated script adds unwanted line endings for Functions/Procedures/Trigger Functions.
+25 -21
View File
@@ -38,8 +38,9 @@ restore process:
* Use the drop-down listbox next to *Rolename* to specify the role that will be
used to authenticate with the server during the restore process.
Click the *Restore options* tab to continue. Use the fields on the *Restore
options* tab to specify options that correspond to *pg_restore* options.
Click the *Data/Objects* tab to continue. Use the fields on the *Data/Objects*
tab to specify options related to data or pgAdmin objects that correspond to
*pg_restore* options.
.. image:: images/restore_sections.png
:alt: Restore dialog options section
@@ -48,11 +49,11 @@ options* tab to specify options that correspond to *pg_restore* options.
* Use the switches in the **Sections** box to specify the content that will be
restored:
* Move the switch next to *Pre-data* to the *Yes* position to restore all
* Move the switch next to *Pre-data* towards right position to restore all
data definition items not included in the data or post-data item lists.
* Move the switch next to *Data* to the *Yes* position to restore actual
* Move the switch next to *Data* towards right position to restore actual
table data, large-object contents, and sequence values.
* Move the switch next to *Post-data* to the *Yes* position to restore
* Move the switch next to *Post-data* towards right position position to restore
definitions of indexes, triggers, rules, and constraints (other than
validated check constraints).
@@ -63,7 +64,7 @@ options* tab to specify options that correspond to *pg_restore* options.
* Use the switches in the **Type of objects** box to specify the objects that
will be restored:
* Move the switch next to *Only data* to the *Yes* position to limit the
* Move the switch next to *Only data* towards right position to limit the
restoration to data.
* Move the switch next to *Only schema* to limit the restoration to
schema-level database objects.
@@ -75,16 +76,20 @@ options* tab to specify options that correspond to *pg_restore* options.
* Use the switches in the **Do not save** box to specify which objects will not
be restored:
* Move the switch next to *Owner* to the *Yes* position to exclude commands
* Move the switch next to *Owner* towards right position to exclude commands
that set object ownership.
* Move the switch next to *Privilege* to the *Yes* position to exclude
* Move the switch next to *Privilege* towards right position to exclude
commands that create access privileges.
* Move the switch next to *Tablespace* to the *Yes* position to exclude
* Move the switch next to *Tablespace* towards right position to exclude
tablespaces.
* Move the switch next to *Comments* to the *Yes* position to exclude
* Move the switch next to *Comments* towards right position to exclude
commands that set the comments. **Note:** This option is visible only for
database server greater than or equal to 11.
Click the *Options* tab to continue. Use these additional fields to specify
options like cleaning before restore, verbose message or using set session
authorization that correspond to *pg_restore* options.
.. image:: images/restore_queries.png
:alt: Restore dialog queries section
:align: center
@@ -92,12 +97,11 @@ options* tab to specify options that correspond to *pg_restore* options.
* Use the switches in the **Queries** box to specify the type of statements that
should be included in the restore:
* Move the switch next to *Include CREATE DATABASE statement* to the *Yes*
position to include a command that creates a new database before performing
the restore.
* Move the switch next to *Clean before restore* to the *Yes* position to
* Move the switch next to *Include CREATE DATABASE statement* towards right position
to include a command that creates a new database before performing the restore.
* Move the switch next to *Clean before restore* towards right position to
drop each existing database object (and data) before restoring.
* Move the switch next to *Single transaction* to the *Yes* position to
* Move the switch next to *Single transaction* towards right position to
execute the restore as a single transaction (that is, wrap the emitted
commands in *BEGIN/COMMIT*). This ensures that either all the commands
complete successfully, or no changes are applied. This option implies
@@ -111,9 +115,9 @@ options* tab to specify options that correspond to *pg_restore* options.
should be excluded from the restore:
* Move the switch next to *Trigger* (active when creating a data-only
restore) to the *Yes* position to include commands that will disable
restore) towards right position to include commands that will disable
triggers on the target table while the data is being loaded.
* Move the switch next to *No data for Failed Tables* to the *Yes* position
* Move the switch next to *No data for Failed Tables* towards right position
to ignore data that fails a trigger.
.. image:: images/restore_miscellaneous.png
@@ -123,13 +127,13 @@ options* tab to specify options that correspond to *pg_restore* options.
* Use the switches in the **Miscellaneous/Behavior** box to specify
miscellaneous restore options:
* Move the switch next to *Verbose messages* to the *No* position to instruct
* Move the switch next to *Verbose messages* towards left to instruct
*pg_restore* to exclude verbose messages.
* Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
position to include a statement that will use a SET SESSION AUTHORIZATION
* Move the switch next to *Use SET SESSION AUTHORIZATION* towards right position
to include a statement that will use a SET SESSION AUTHORIZATION
command to determine object ownership (instead of an ALTER OWNER command).
* Move the switch next to *Exit on error* to the *Yes* position to instruct
* Move the switch next to *Exit on error* towards right position to instruct
*pg_restore* to exit restore if there is an error in sending SQL commands.
The default is to continue and to display a count of errors at the end of
the restore.
+1 -1
View File
@@ -79,7 +79,7 @@ The context-sensitive menus associated with *Tables* and nested *Table* nodes pr
+-------------------------+------------------------------------------------------------------------------------------------------------------------------+
| Option | Action |
+=========================+==============================================================================================================================+
| *Import/Export...* | Click open the :ref:`Import/Export... <import_export_data>` dialog to import data to or export data from the selected table. |
| *Import/Export Data...* | Click open the :ref:`Import/Export... <import_export_data>` dialog to import data to or export data from the selected table. |
+-------------------------+------------------------------------------------------------------------------------------------------------------------------+
| *Reset Statistics* | Click to reset statistics for the selected table. |
+-------------------------+------------------------------------------------------------------------------------------------------------------------------+
+3
View File
@@ -32,6 +32,9 @@ and modify the values for the following parameters:
"WEBSERVER_AUTO_CREATE_USER", "Set the value to *True* if you want to automatically
create a pgAdmin user corresponding to a successfully authenticated Webserver user.
Please note that password is not stored in the pgAdmin database."
"WEBSERVER_REMOTE_USER", "The default value is REMOTE_USER, set this variable to any header
or environemnt variable to get the webserver remote user details. Possible values: REMOTE_USER,
HTTP_X_FORWARDED_USER, X-Forwarded-User."
Master Password
+4
View File
@@ -34,6 +34,7 @@ cat << EOF > "${SERVERROOT}/DEBIAN/control"
Package: ${APP_NAME}-server
Version: ${APP_LONG_VERSION}
Architecture: ${OS_ARCH}
Section: database
Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2
Recommends: postgresql-client | postgresql-client-14 | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
@@ -55,6 +56,7 @@ cat << EOF > "${DESKTOPROOT}/DEBIAN/control"
Package: ${APP_NAME}-desktop
Version: ${APP_LONG_VERSION}
Architecture: ${OS_ARCH}
Section: database
Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), libatomic1, xdg-utils
Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
Description: The desktop user interface for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -79,6 +81,7 @@ cat << EOF > "${WEBROOT}/DEBIAN/control"
Package: ${APP_NAME}-web
Version: ${APP_LONG_VERSION}
Architecture: all
Section: database
Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), apache2, libapache2-mod-wsgi-py3
Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
Description: The web interface for pgAdmin, hosted under Apache HTTPD. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -102,6 +105,7 @@ cat << EOF > "${METAROOT}/DEBIAN/control"
Package: ${APP_NAME}
Version: ${APP_LONG_VERSION}
Architecture: all
Section: database
Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), ${APP_NAME}-desktop (= ${APP_LONG_VERSION}), ${APP_NAME}-web (= ${APP_LONG_VERSION})
Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
Description: Installs all required components to run pgAdmin in desktop and web modes. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
+1 -2
View File
@@ -15,8 +15,7 @@ DEFAULT_BINARY_PATHS = {
'pg-13': '/usr/local/pgsql-13',
'pg-12': '/usr/local/pgsql-12',
'pg-11': '/usr/local/pgsql-11',
'pg-10': '/usr/local/pgsql-10',
'pg-9.6': '/usr/local/pgsql-9.6'
'pg-10': '/usr/local/pgsql-10'
}
EOF
+5 -5
View File
@@ -125,10 +125,8 @@ _build_runtime() {
# YARN END
# WGET:
# Comment out the below line as the latest version (0.57.0) having some
# problem, so for the time being hardcoded the version to 0.55.0
# NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
NW_VERSION="0.55.0"
NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
pushd "${BUILDROOT}" > /dev/null
while true;do
wget https://dl.nwjs.io/v${NW_VERSION}/nwjs-v${NW_VERSION}-linux-x64.tar.gz && break
@@ -215,12 +213,14 @@ _copy_code() {
mkdir -p "${WEBROOT}/usr/${APP_NAME}/bin/"
cp "${SOURCEDIR}/pkg/linux/setup-web.sh" "${WEBROOT}/usr/${APP_NAME}/bin/"
# Ensure our venv will use the correct Python interpretor, even if the
# Ensure our venv will use the correct Python interpreter, even if the
# user has configured an alternative default.
# DO THIS LAST!
cd "${SERVERROOT}/usr/${APP_NAME}/venv/bin"
PYTHON_INTERPRETER=$(/usr/bin/python3 -c "import os, sys; print(os.path.realpath(sys.executable))")
PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('%d.%d' % (sys.version_info.major, sys.version_info.minor))")
rm python && ln -s python3 python
rm python${PYTHON_VERSION} && ln -s python3 python${PYTHON_VERSION}
rm python3 && ln -s "${PYTHON_INTERPRETER}" python3
}
+10 -11
View File
@@ -1,10 +1,11 @@
_setup_env() {
APP_RELEASE=`grep "^APP_RELEASE" web/config.py | cut -d"=" -f2 | sed 's/ //g'`
APP_REVISION=`grep "^APP_REVISION" web/config.py | cut -d"=" -f2 | sed 's/ //g'`
APP_NAME=`grep "^APP_NAME" web/config.py | cut -d"=" -f2 | sed "s/'//g" | sed 's/^ //'`
FUNCS_DIR=$(cd `dirname $0` && pwd)/../..
APP_RELEASE=`grep "^APP_RELEASE" ${FUNCS_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g'`
APP_REVISION=`grep "^APP_REVISION" ${FUNCS_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g'`
APP_NAME=`grep "^APP_NAME" ${FUNCS_DIR}/web/config.py | cut -d"=" -f2 | sed "s/'//g" | sed 's/^ //'`
APP_LONG_VERSION=${APP_RELEASE}.${APP_REVISION}
APP_SHORT_VERSION=`echo ${APP_LONG_VERSION} | cut -d . -f1,2`
APP_SUFFIX=`grep "^APP_SUFFIX" web/config.py | cut -d"=" -f2 | sed 's/ //g' | sed "s/'//g"`
APP_SUFFIX=`grep "^APP_SUFFIX" ${FUNCS_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g' | sed "s/'//g"`
if [ ! -z ${APP_SUFFIX} ]; then
APP_LONG_VERSION=${APP_LONG_VERSION}-${APP_SUFFIX}
fi
@@ -32,10 +33,8 @@ _build_runtime() {
# YARN END
# WGET:
# Comment out the below line as the latest version (0.57.0) having some
# problem, so for the time being hardcoded the version to 0.55.0
# NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
NW_VERSION="0.55.0"
NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
pushd "${BUILD_ROOT}" > /dev/null
while true;do
wget https://dl.nwjs.io/v${NW_VERSION}/nwjs-v${NW_VERSION}-osx-x64.zip && break
@@ -182,7 +181,7 @@ _fixup_imports() {
for LIB in $(
otool -L ${TODO_OBJ} | \
sed -n 's|^.*[[:space:]]\([^[:space:]]*\.dylib\).*$|\1|p' | \
egrep -v '^(/usr/lib)|(/System)|@executable_path' \
egrep -v '^(/usr/lib)|(/System)|@executable_path|@loader_path|/DLC/PIL/' \
); do
# Copy in any required dependencies
LIB_BN="$(basename "${LIB}")" ;
@@ -242,8 +241,8 @@ _complete_bundle() {
sed -i '' "s/%APPVER%/${APP_LONG_VERSION}/g" "${BUNDLE_DIR}/Contents/Info.plist"
sed -i '' "s/%APPID%/org.pgadmin.pgadmin4/g" "${BUNDLE_DIR}/Contents/Info.plist"
for FILE in "${BUNDLE_DIR}"/Contents/Resources/*.lproj/InfoPlist.strings; do
sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2021, The pgAdmin Development Team";/g' "${FILE}"
sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2021, The pgAdmin Development Team";/g' "${FILE}"
sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2022, The pgAdmin Development Team";/g' "${FILE}"
sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2022, The pgAdmin Development Team";/g' "${FILE}"
echo CFBundleDisplayName = \"${APP_NAME}\"\; >> "${FILE}"
done
+1 -1
View File
@@ -10,7 +10,7 @@
\fs22 \
\
\f1\i Copyright (C) 2013 - 2021, The pgAdmin Development Team
\f1\i Copyright (C) 2013 - 2022, The pgAdmin Development Team
\f0\i0 \
\
Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.\
+1 -1
View File
@@ -4,7 +4,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
#########################################################################
+9 -4
View File
@@ -2,7 +2,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
@@ -56,8 +56,12 @@ setup(
version=config.APP_VERSION,
description='PostgreSQL Tools',
long_description='Administration and management tools for '
'the PostgreSQL database.',
long_description='pgAdmin is the most popular and feature rich Open '
'Source administration and development platform for '
'PostgreSQL, the most advanced Open Source database in '
'the world.\n\npgAdmin may be used on Linux, Unix, '
'macOS and Windows to manage PostgreSQL and EDB '
'Advanced Server 10 and above.',
url='https://www.pgadmin.org/',
@@ -74,7 +78,8 @@ setup(
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9'
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10'
],
keywords='pgadmin4,postgresql,postgres',
+6 -2
View File
@@ -41,6 +41,7 @@ echo "Creating the server package..."
cat << EOF > "${BUILDROOT}/server.spec"
%global __requires_exclude_from ^/.*$
%global __provides_exclude_from ^/.*$
%global _build_id_links none
# Bytecompiling Python 3 doesn't work on RHEL/CentOS 7, so make it a no-op
%if 0%{?rhel} && 0%{?rhel} == 7
@@ -84,6 +85,7 @@ echo "Creating the desktop package..."
cat << EOF > "${BUILDROOT}/desktop.spec"
%global __requires_exclude_from ^/.*$
%global __provides_exclude_from ^/.*$
%global _build_id_links none
%undefine __brp_mangle_shebangs
%undefine __brp_ldconfig
@@ -131,6 +133,7 @@ echo "Creating the web package..."
cat << EOF > "${BUILDROOT}/web.spec"
%global __requires_exclude_from ^/.*$
%global __provides_exclude_from ^/.*$
%global _build_id_links none
%undefine __brp_mangle_shebangs
%undefine __brp_ldconfig
@@ -178,6 +181,7 @@ echo "Creating the meta package..."
cat << EOF > "${BUILDROOT}/meta.spec"
%global __requires_exclude_from ^/.*$
%global __provides_exclude_from ^/.*$
%global _build_id_links none
%undefine __brp_mangle_shebangs
%undefine __brp_ldconfig
@@ -211,7 +215,7 @@ rpmbuild --define "pga_build_root ${BUILDROOT}" -bb "${BUILDROOT}/meta.spec"
if [ ${OS_VERSION} == 7 ]; then
cp "${SOURCEDIR}/pkg/redhat/pgadmin4-python3-mod_wsgi-exports.patch" ${HOME}/rpmbuild/SOURCES
cp "${SOURCEDIR}/pkg/redhat/pgadmin4-python3-mod_wsgi.conf" ${HOME}/rpmbuild/SOURCES
curl -o ${HOME}/rpmbuild/SOURCES/mod_wsgi-4.7.1.tar.gz https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.7.1
curl -o ${HOME}/rpmbuild/SOURCES/mod_wsgi-4.9.0.tar.gz https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.9.0
rpmbuild -bb "${SOURCEDIR}/pkg/redhat/pgadmin4-python-mod_wsgi.spec"
fi
@@ -224,7 +228,7 @@ yumdownloader -y --downloadonly --destdir=$DISTROOT postgresql14-libs
cp ${HOME}/rpmbuild/RPMS/${OS_ARCH}/${APP_NAME}-*${RPM_VERSION}-*.${OS_ARCH}.rpm "${DISTROOT}/"
cp ${HOME}/rpmbuild/RPMS/noarch/${APP_NAME}-*${RPM_VERSION}-*.noarch.rpm "${DISTROOT}/"
if [ ${OS_VERSION} == 7 ]; then
cp ${HOME}/rpmbuild/RPMS/${OS_ARCH}/pgadmin4-python3-mod_wsgi-4.7.1-2.el7.x86_64.rpm "${DISTROOT}/"
cp ${HOME}/rpmbuild/RPMS/${OS_ARCH}/pgadmin4-python3-mod_wsgi-4.9.0-1.el7.x86_64.rpm "${DISTROOT}/"
fi
echo "Completed. RPMs created in ${DISTROOT}."
+2 -2
View File
@@ -11,8 +11,8 @@
%global debug_package %{nil}
Name: pgadmin4-python3-%{sname}
Version: 4.7.1
Release: 2%{?dist}
Version: 4.9.0
Release: 1%{?dist}
Summary: A WSGI interface for Python web applications in Apache (customized for pgAdmin4)
License: ASL 2.0
URL: https://modwsgi.readthedocs.io/
+1 -1
View File
@@ -4,7 +4,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
#########################################################################
Binary file not shown.
+17 -15
View File
@@ -8,38 +8,40 @@
#
###############################################################################
Flask==1.*
Flask==2.*
Flask-Gravatar==0.*
Flask-Login==0.*
Flask-Mail==0.*
Flask-Migrate==2.*
Flask-SQLAlchemy==2.*
Flask-WTF==0.*
Flask-Migrate==3.*
Flask-SQLAlchemy==2.5.*
Flask-WTF==1.*
Flask-Compress==1.*
Flask-Paranoid==0.*
Flask-Babel==2.*
Flask-Security-Too==4.*
Flask-SocketIO>=5.0.1
WTForms==3.*
passlib==1.*
pytz==2021.*
simplejson==3.*
six==1.*
speaklater3==1.*
sqlparse==0.*
WTForms==2.*
Flask-Paranoid==0.*
psutil==5.*
psycopg2==2.8.*
psycopg2==2.9.*
python-dateutil==2.*
SQLAlchemy==1.3.*
itsdangerous<=1.1.0
Flask-Security-Too==4.*
SQLAlchemy==1.4.*
bcrypt==3.*
cryptography==3.*
sshtunnel==0.*
ldap3==2.*
Flask-BabelEx==0.*
gssapi==1.6.*
flask-socketio>=5.0.1
eventlet==0.31.0
gssapi==1.7.*
eventlet==0.33.0
httpagentparser==1.9.*
user-agents==2.2.0
pywinpty==1.1.1; sys_platform=="win32"
pywinpty==1.1.*; sys_platform=="win32"
Authlib==0.15.*
requests==2.25.*
pyotp==2.*
qrcode==7.*
Pillow==8.3.*
+1 -1
View File
@@ -2,7 +2,7 @@
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2021, The pgAdmin Development Team
// Copyright (C) 2013 - 2022, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
+1 -1
View File
@@ -24,7 +24,7 @@
},
"devDependencies": {
"eslint": "^6.3.0",
"nw": "0.55.0"
"nw": "^0.59.0"
},
"scripts": {
"linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js ."
+5
View File
@@ -11,6 +11,11 @@
font-size: 14px;
background-color: #ebeef3;
}
@media screen and (forced-colors: active) {
body {
forced-color-adjust: none !important;
}
}
</style>
</head>
<body>
+5
View File
@@ -27,6 +27,11 @@
margin-right: auto;
margin-bottom: 10px;
}
@media screen and (forced-colors: active) {
body {
forced-color-adjust: none !important;
}
}
</style>
<!-- Disable/block all password saving in nw.js -->
+5
View File
@@ -11,6 +11,11 @@
font-size: 14px;
background-color: #ebeef3;
}
@media screen and (forced-colors: active) {
body {
forced-color-adjust: none !important;
}
}
</style>
</head>
<body>
+5
View File
@@ -11,6 +11,11 @@
font-size: 14px;
background-color: #ebeef3;
}
@media screen and (forced-colors: active) {
body {
forced-color-adjust: none !important;
}
}
</style>
</head>
<body>
+1 -1
View File
@@ -2,7 +2,7 @@
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2021, The pgAdmin Development Team
// Copyright (C) 2013 - 2022, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
+1 -1
View File
@@ -2,7 +2,7 @@
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2021, The pgAdmin Development Team
// Copyright (C) 2013 - 2022, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
+1 -1
View File
@@ -2,7 +2,7 @@
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2021, The pgAdmin Development Team
// Copyright (C) 2013 - 2022, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
+1 -1
View File
@@ -2,7 +2,7 @@
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2021, The pgAdmin Development Team
// Copyright (C) 2013 - 2022, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
+1 -1
View File
@@ -2,7 +2,7 @@
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2021, The pgAdmin Development Team
// Copyright (C) 2013 - 2022, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
+4 -4
View File
@@ -1008,10 +1008,10 @@ number-is-nan@^1.0.0:
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
nw@0.55.0:
version "0.55.0"
resolved "https://registry.yarnpkg.com/nw/-/nw-0.55.0.tgz#fd5785c40fde1391ea558a73c2efff0c9e8cde3c"
integrity sha512-/EYsT55LJraJCZeSCpJoXnftsLtR+8lbhEXABlhye/n+0//F+v9kYsGLbnC+SS3JN7NQksnv/WcnoLVjL1WXcg==
nw@^0.59.0:
version "0.59.0"
resolved "https://registry.yarnpkg.com/nw/-/nw-0.59.0.tgz#c7eff1622c917834b2b31581ba5c386816d98db1"
integrity sha512-cLGZgP+u+nDfgT956Z7timXuyQN8OOi5Ele6OF3yVEkk6CNiMC6m2rblb5aB8y4QNwLf6O+tkt64XxSUPxvutQ==
dependencies:
chalk "~1.1.3"
decompress "^4.2.0"
+1 -1
View File
@@ -4,7 +4,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
+1 -1
View File
@@ -4,7 +4,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
+1 -1
View File
@@ -4,7 +4,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
+1 -1
View File
@@ -4,7 +4,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
+1 -1
View File
@@ -2,7 +2,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
# #########################################################################
+1
View File
@@ -4,3 +4,4 @@ vendor
templates/
templates\
ycache
regression/htmlcov
+6 -1
View File
@@ -2,7 +2,7 @@
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2021, The pgAdmin Development Team
// Copyright (C) 2013 - 2022, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
@@ -17,6 +17,11 @@ module.exports = {
'extends': [
'eslint:recommended',
'plugin:react/recommended',
/* Uncomment the below line to use linter error for React Hooks.
By Default commented so that builds are generated successfully.
Once all the errors will be resolved will uncomment it and commit it.
*/
// "plugin:react-hooks/recommended",
],
'parser': '@babel/eslint-parser',
'parserOptions': {
+42 -4
View File
@@ -4,7 +4,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
# config.py - Core application configuration settings
@@ -43,7 +43,7 @@ APP_ICON = 'pg-icon'
# Application version number components
APP_RELEASE = 6
APP_REVISION = 1
APP_REVISION = 4
# Application version suffix, e.g. 'beta1', 'dev'. Usually an empty string
# for GA releases.
@@ -52,7 +52,7 @@ APP_SUFFIX = ''
# Numeric application version for upgrade checks. Should be in the format:
# [X]XYYZZ, where X is the release version, Y is the revision, with a leading
# zero if needed, and Z represents the suffix, with a leading zero if needed
APP_VERSION_INT = 60100
APP_VERSION_INT = 60400
# DO NOT CHANGE!
# The application version string, constructed from the components
@@ -62,7 +62,7 @@ else:
APP_VERSION = '%s.%s-%s' % (APP_RELEASE, APP_REVISION, APP_SUFFIX)
# Copyright string for display in the app
APP_COPYRIGHT = 'Copyright (C) 2013 - 2021, The pgAdmin Development Team'
APP_COPYRIGHT = 'Copyright (C) 2013 - 2022, The pgAdmin Development Team'
##########################################################################
# Misc stuff
@@ -736,6 +736,36 @@ OAUTH2_AUTO_CREATE_USER = True
WEBSERVER_AUTO_CREATE_USER = True
# REMOTE_USER variable will be used to check the environment variable
# is set or not first, if not available,
# request header will be checked for the same.
# Possible values: REMOTE_USER, HTTP_X_FORWARDED_USER, X-Forwarded-User
WEBSERVER_REMOTE_USER = 'REMOTE_USER'
##########################################################################
# Two-factor Authentication Configuration
##########################################################################
# Set it to True, to enable the two-factor authentication
MFA_ENABLED = True
# Set it to True, to ask the users to register forcefully for the
# two-authentication methods on logged-in.
MFA_FORCE_REGISTRATION = False
# pgAdmin supports Two-factor authentication by either sending an one-time code
# to an email, or using the TOTP based application like Google Authenticator.
MFA_SUPPORTED_METHODS = ["email", "authenticator"]
# NOTE: Please set the 'Mail server settings' to use 'email' as two-factor
# authentication method.
# Subject for the email verification code
# Default: <APP_NAME> - Verification Code
# e.g. pgAdmin 4 - Verification Code
MFA_EMAIL_SUBJECT = None
##########################################################################
# PSQL tool settings
##########################################################################
@@ -752,6 +782,14 @@ ENABLE_PSQL = False
##########################################################################
ENABLE_BINARY_PATH_BROWSING = False
#############################################################################
# AUTO_DISCOVER_SERVERS setting is used to enable the pgAdmin to discover the
# database server automatically on the local machine.
# When it is set to False, pgAdmin will not discover servers installed on
# the local machine.
#############################################################################
AUTO_DISCOVER_SERVERS = True
##########################################################################
# Local config settings
##########################################################################
+1 -1
View File
@@ -2,7 +2,7 @@
//
// pgAdmin 4 - PostgreSQL Tools
//
// Copyright (C) 2013 - 2021, The pgAdmin Development Team
// Copyright (C) 2013 - 2022, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
//////////////////////////////////////////////////////////////
+1 -1
View File
@@ -2,7 +2,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
+1 -1
View File
@@ -2,7 +2,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
+2 -3
View File
@@ -2,7 +2,7 @@
##
## pgAdmin 4 - PostgreSQL Tools
##
## Copyright (C) 2013 - 2021, The pgAdmin Development Team
## Copyright (C) 2013 - 2022, The pgAdmin Development Team
## This software is released under the PostgreSQL Licence
##
##########################################################################
@@ -14,8 +14,7 @@ Revises: ${down_revision | comma,n}
Create Date: ${create_date}
"""
from alembic import op
import sqlalchemy as sa
from pgadmin.model import db
${imports if imports else ""}
# revision identifiers, used by Alembic.
+1 -1
View File
@@ -2,7 +2,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
+16 -5
View File
@@ -2,7 +2,7 @@
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2021, The pgAdmin Development Team
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
@@ -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,
@@ -209,8 +217,11 @@ def upgrade():
os.urandom(32)).decode()
db.engine.execute(sql)
sql = "INSERT INTO keys (name, value) VALUES ('SECRET_KEY', '%s')" % base64.urlsafe_b64encode(
os.urandom(32)).decode()
if hasattr(config, 'SECRET_KEY'):
sql = "INSERT INTO keys (name, value) VALUES ('SECRET_KEY', '%s')" % config.SECRET_KEY
else:
sql = "INSERT INTO keys (name, value) VALUES ('SECRET_KEY', '%s')" % base64.urlsafe_b64encode(
os.urandom(32)).decode()
db.engine.execute(sql)
# If SECURITY_PASSWORD_SALT is not in the config, but we're upgrading, then it must (unless the
+44
View File
@@ -0,0 +1,44 @@
##########################################################################
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2022, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
##########################################################################
"""Update DB to version 31
Added a table `user_mfa` for saving the options on MFA for different sources.
Revision ID: 15c88f765bc8
Revises: 6650c52670c2
Create Date: 2021-11-24 17:33:12.533825
"""
from pgadmin.model import db
# revision identifiers, used by Alembic.
revision = '15c88f765bc8'
down_revision = '3ce25f562f3b'
branch_labels = None
depends_on = None
def upgrade():
db.engine.execute("""
CREATE TABLE user_mfa(
user_id INTEGER NOT NULL,
mfa_auth VARCHAR(256) NOT NULL,
options TEXT,
PRIMARY KEY (user_id, mfa_auth),
FOREIGN KEY(user_id) REFERENCES user (id)
)
""")
# ### end Alembic commands ###
def downgrade():
# pgAdmin only upgrades, downgrade not implemented.
pass
+4 -1
View File
@@ -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 (
+43
View File
@@ -0,0 +1,43 @@
##########################################################################
#
# pgAdmin 4 - PostgreSQL Tools
#
# Copyright (C) 2013 - 2022, 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():
# 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("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.
pass
Loaded 100 of 1578 files, more files were not shown because too many files have changed in this diff. Show more