diff --git a/LICENSE b/LICENSE index 203e6d85a..02193a258 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ pgAdmin 4 -Copyright (C) 2013 - 2020, The pgAdmin Development Team +Copyright (C) 2013 - 2019, 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 diff --git a/docs/en_US/code_review.rst b/docs/en_US/code_review.rst index c179bdc72..c02398bb0 100644 --- a/docs/en_US/code_review.rst +++ b/docs/en_US/code_review.rst @@ -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 - 2020, The pgAdmin Development Team + Copyright (C) 2013 - 2019, The pgAdmin Development Team * Ensure there's a blank line immediately following any copyright headers. diff --git a/docs/en_US/coding_standards.rst b/docs/en_US/coding_standards.rst index bd61efe0c..30f42f132 100644 --- a/docs/en_US/coding_standards.rst +++ b/docs/en_US/coding_standards.rst @@ -170,7 +170,7 @@ with the required file header is shown below:: # # pgAdmin 4 - PostgreSQL Tools # - # Copyright (C) 2013 - 2020, The pgAdmin Development Team + # Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/docs/en_US/container_deployment.rst b/docs/en_US/container_deployment.rst index 76ad91773..b6c1e81df 100644 --- a/docs/en_US/container_deployment.rst +++ b/docs/en_US/container_deployment.rst @@ -122,17 +122,6 @@ instances. sudo chown -R 5050:5050 - On some filesystems that do not support extended attributes, it may not be - possible to run pgAdmin without specifying a value for *PGADMIN_LISTEN_PORT* - that is greater than 1024. In such cases, specify an alternate port when - launching the container by adding the environment variable, for example: - - .. code-block:: bash - - -e 'PGADMIN_LISTEN_PORT=5050' - - Don't forget to adjust any host-container port mapping accordingly. - **/var/lib/pgadmin** This is the working directory in which pgAdmin stores session data, user files, diff --git a/docs/en_US/licence.rst b/docs/en_US/licence.rst index e020a17a3..9b38017d4 100644 --- a/docs/en_US/licence.rst +++ b/docs/en_US/licence.rst @@ -13,7 +13,7 @@ documentation is attributed to the .. topic:: pgAdmin 4 - Copyright (C) 2013 - 2020, The pgAdmin Development Team + Copyright (C) 2013 - 2019, 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 diff --git a/docs/en_US/release_notes_4_17.rst b/docs/en_US/release_notes_4_17.rst index 4d425d89b..74feab25b 100644 --- a/docs/en_US/release_notes_4_17.rst +++ b/docs/en_US/release_notes_4_17.rst @@ -10,30 +10,25 @@ New features ************ | `Issue #4764 `_ - Allow screen-reader to read relationship attributes in nested elements. -| `Issue #5060 `_ - Ensure all binaries are securely signed and linked with the hardened runtime in the macOS bundle Housekeeping ************ | `Issue #4988 `_ - Refactored SQL of Table's and it's child nodes. +| `Issue #5017 `_ - Use cheroot as default production server for pgAdmin4. | `Issue #5023 `_ - Refactored SQL of Views and Materialized Views. | `Issue #5024 `_ - Refactored SQL of Functions and Procedures. | `Issue #5038 `_ - Added support for on-demand loading of items in Select2. -| `Issue #5048 `_ - Added code coverage tool for pgAdmin. Bug fixes ********* | `Issue #4198 `_ - Fix syntax highlighting in code mirror for backslash and escape constant. | `Issue #4506 `_ - Fix an issue where clicking on an empty textbox like fill factor or comments, considers it as change and enabled the save button. -| `Issue #4633 `_ - Added support to view multilevel partitioned tables. | `Issue #4842 `_ - Ensure that constraints, indexes, rules, triggers, and compound triggers should be created on partitions. | `Issue #4943 `_ - Added more information to the 'Database connected/disconnected' message. -| `Issue #4950 `_ - Ensure that the user should be able to select/modify tablespace for the partitioned table on v12 and above. | `Issue #4999 `_ - Rename some internal environment variables that could conflict with Kubernetes. | `Issue #5004 `_ - Fix vulnerability issues reported by 'yarn audit'. Replace the deprecated uglifyjs-webpack-plugin with a terser-webpack-plugin. | `Issue #5008 `_ - Ensure that the error message should not be displayed if Tablespace is not selected while creating the index. | `Issue #5009 `_ - Fix an issue where operator, access method and operator class is not visible for exclusion constraints. -| `Issue #5013 `_ - Add a note to the documentation about the use of non-privileged ports on filesystems that don't support extended attributes when running the container. | `Issue #5047 `_ - Added tab navigation for tabs under explain panel in query tool. -| `Issue #5068 `_ - Fix an issue where the table is not created with autovacuum_enabled and toast.autovacuum_enabled for PG/EPAS 12. \ No newline at end of file diff --git a/pkg/mac/build.sh b/pkg/mac/build.sh index c8b443b70..2e6c574aa 100755 --- a/pkg/mac/build.sh +++ b/pkg/mac/build.sh @@ -223,22 +223,6 @@ _framework_config() { ./framework-config.sh "${BUILDROOT}/${APP_BUNDLE_NAME}" || { echo "framework-config.sh failed"; exit 1; } } -_codesign_binaries() { - cd ${SOURCEDIR}/pkg/mac - - if [ ! -f codesign.conf ]; then - echo - echo "******************************************************************" - echo "* codesign.conf not found. NOT signing the binaries." - echo "******************************************************************" - echo - sleep 5 - return - fi - - ./codesign-binaries.sh "${BUILDROOT}/${APP_BUNDLE_NAME}" || { echo codesign-binaries.sh failed; exit 1; } -} - _codesign_bundle() { cd ${SOURCEDIR}/pkg/mac @@ -284,7 +268,6 @@ _build_runtime || { echo Runtime build failed; exit 1; } _build_doc _complete_bundle _framework_config -_codesign_binaries _codesign_bundle _create_dmg _codesign_dmg diff --git a/pkg/mac/codesign-binaries.sh b/pkg/mac/codesign-binaries.sh deleted file mode 100755 index 4bd00b4a6..000000000 --- a/pkg/mac/codesign-binaries.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -BUNDLE="$1" - -if ! test -d "${BUNDLE}" ; then - echo "${BUNDLE} is no bundle!" >&2 - exit 1 -fi - -# Get the config -source codesign.conf - -if [ -z "${DEVELOPER_ID}" ] ; then - echo "Developer ID Application not found in codesign.conf" >&2 - exit 1 -fi - -if [ -z "${DEVELOPER_BUNDLE_ID}" ]; then - echo "Developer Bundle Identifier not found in codesign.conf" >&2 -fi - -echo Signing ${BUNDLE} binaries -IFS=$'\n' -for i in $(find "${BUNDLE}" -type f) -do - file "${i}" | grep -E "Mach-O executable|Mach-O 64-bit executable|Mach-O 64-bit bundle" - if [ $? -eq 0 ] ; then - codesign --deep -f -i "${DEVELOPER_BUNDLE_ID}" -s "${DEVELOPER_ID}" --options runtime ${i} - fi -done - -echo Signing ${BUNDLE} libraries -for i in $(find "${BUNDLE}" -type f -name "*.dylib*") -do - codesign --deep -f -i "${DEVELOPER_BUNDLE_ID}" -s "${DEVELOPER_ID}" --options runtime ${i} -done - diff --git a/pkg/mac/codesign.conf.in b/pkg/mac/codesign.conf.in index a0b2077b3..9951ee947 100644 --- a/pkg/mac/codesign.conf.in +++ b/pkg/mac/codesign.conf.in @@ -2,4 +2,3 @@ # codesign.conf, and edit the value below to reflect your developer ID DEVELOPER_ID="Developer ID Application: My Name (12345ABCD)" -DEVELOPER_BUNDLE_ID="Developer Bundle Identifier (pgadmin4-4)" diff --git a/pkg/mac/licence.rtf b/pkg/mac/licence.rtf index 0f1f119f7..1b51b6c86 100644 --- a/pkg/mac/licence.rtf +++ b/pkg/mac/licence.rtf @@ -10,7 +10,7 @@ \fs22 \ \ -\f1\i Copyright (C) 2013 - 2020, The pgAdmin Development Team +\f1\i Copyright (C) 2013 - 2019, 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.\ diff --git a/pkg/pip/build.sh b/pkg/pip/build.sh index 8a6eefe8a..7ad11ad01 100755 --- a/pkg/pip/build.sh +++ b/pkg/pip/build.sh @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ######################################################################### diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py index a616fb6bb..81f90a449 100644 --- a/pkg/pip/setup_pip.py +++ b/pkg/pip/setup_pip.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/pkg/src/build.sh b/pkg/src/build.sh index 85d60a194..1f623a371 100755 --- a/pkg/src/build.sh +++ b/pkg/src/build.sh @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ######################################################################### diff --git a/pkg/win32/Resources/license.rtf b/pkg/win32/Resources/license.rtf index 75e4389c2a614f99e8e912a491179f24f117add3..53d95acd53fb40f47dc875bafafb7194321ccf50 100644 GIT binary patch delta 13 UcmaFI`HpkKb0$N}jW1bQ04qrabpQYW delta 13 UcmaFI`HpkKb0#B$jW1bQ04pK|Z2$lO diff --git a/requirements.txt b/requirements.txt index dae5436d6..b2e00d610 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,7 @@ # ignored when building a PIP Wheel. ############################################################################## blinker==1.4 +cheroot==8.2.1 Flask==1.0.2 Werkzeug>=0.15.0 Flask-Gravatar==0.5.0 diff --git a/runtime/ConfigWindow.cpp b/runtime/ConfigWindow.cpp index 275d6b440..3368067cb 100644 --- a/runtime/ConfigWindow.cpp +++ b/runtime/ConfigWindow.cpp @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // ConfigWindow.h - Configuration window diff --git a/runtime/ConfigWindow.h b/runtime/ConfigWindow.h index ed948d603..91af88493 100644 --- a/runtime/ConfigWindow.h +++ b/runtime/ConfigWindow.h @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // ConfigWindow.h - Configuration window diff --git a/runtime/FloatingWindow.cpp b/runtime/FloatingWindow.cpp index 6e2f2348a..6235cb40d 100644 --- a/runtime/FloatingWindow.cpp +++ b/runtime/FloatingWindow.cpp @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // FloatingWindow.cpp - For GNOME 3.26 and above floating window will be used. diff --git a/runtime/FloatingWindow.h b/runtime/FloatingWindow.h index 8b91bf5ce..51d3b8de7 100644 --- a/runtime/FloatingWindow.h +++ b/runtime/FloatingWindow.h @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // FloatingWindow.h - For GNOME 3.26 and above floating window will be used. diff --git a/runtime/Info.plist b/runtime/Info.plist index 0621dcde0..b670eeec8 100644 --- a/runtime/Info.plist +++ b/runtime/Info.plist @@ -8,13 +8,13 @@ CFBundleName pgAdmin 4 CFBundleShortVersionString - 4.17.0 + 4.16.0 CFBundleVersion - 4.17.0 + 4.16.0 LSMinimumSystemVersion 10.10 NSHumanReadableCopyright - Copyright (C) 2013 - 2020, The pgAdmin Development Team + Copyright (C) 2013 - 2019, The pgAdmin Development Team CFBundleIconFile @ICON@ CFBundlePackageType diff --git a/runtime/LogWindow.cpp b/runtime/LogWindow.cpp index 4d9d6962e..d64ac266c 100644 --- a/runtime/LogWindow.cpp +++ b/runtime/LogWindow.cpp @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // LogWindow.cpp - Log viewer window diff --git a/runtime/LogWindow.h b/runtime/LogWindow.h index 5f7bc8633..4f088b996 100644 --- a/runtime/LogWindow.h +++ b/runtime/LogWindow.h @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // LogWindow.h - Log viewer window diff --git a/runtime/Logger.cpp b/runtime/Logger.cpp index acd9f5dcb..e227f97ee 100644 --- a/runtime/Logger.cpp +++ b/runtime/Logger.cpp @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // Logger.cpp - Logger Utility diff --git a/runtime/Logger.h b/runtime/Logger.h index c97aa8832..71d78fb59 100644 --- a/runtime/Logger.h +++ b/runtime/Logger.h @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // Logger.h - Logger Utility diff --git a/runtime/MenuActions.cpp b/runtime/MenuActions.cpp index 5115a429c..8c2bfcf5a 100644 --- a/runtime/MenuActions.cpp +++ b/runtime/MenuActions.cpp @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // MenuActions.cpp - Common file for menu actions. diff --git a/runtime/MenuActions.h b/runtime/MenuActions.h index 2d9403712..6557de388 100644 --- a/runtime/MenuActions.h +++ b/runtime/MenuActions.h @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // MenuActions.h - Common file for menu actions. diff --git a/runtime/Server.cpp b/runtime/Server.cpp index b8e924ae0..76ee95d6b 100644 --- a/runtime/Server.cpp +++ b/runtime/Server.cpp @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // Server.cpp - Thread in which the web server will run. diff --git a/runtime/Server.h b/runtime/Server.h index 1094f84bd..37068dab9 100644 --- a/runtime/Server.h +++ b/runtime/Server.h @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // Server.h - Thread in which the web server will run. diff --git a/runtime/TrayIcon.cpp b/runtime/TrayIcon.cpp index 9e583eac0..754585942 100644 --- a/runtime/TrayIcon.cpp +++ b/runtime/TrayIcon.cpp @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // TrayIcon.cpp - Manages the tray icon diff --git a/runtime/TrayIcon.h b/runtime/TrayIcon.h index 5c84e414b..d317d30e1 100644 --- a/runtime/TrayIcon.h +++ b/runtime/TrayIcon.h @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // TrayIcon.h - Manages the tray icon diff --git a/runtime/pgAdmin4.cpp b/runtime/pgAdmin4.cpp index e4d164bb7..4d03eca86 100644 --- a/runtime/pgAdmin4.cpp +++ b/runtime/pgAdmin4.cpp @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // pgAdmin4.cpp - Main application entry point diff --git a/runtime/pgAdmin4.h b/runtime/pgAdmin4.h index 96efdd8de..b7c76dd33 100644 --- a/runtime/pgAdmin4.h +++ b/runtime/pgAdmin4.h @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // // pgAdmin4.h - Main application header diff --git a/runtime/pgAdmin4.pro b/runtime/pgAdmin4.pro index 9947fbc69..00002d858 100644 --- a/runtime/pgAdmin4.pro +++ b/runtime/pgAdmin4.pro @@ -1,8 +1,8 @@ -VERSION = 4.17.0.0 +VERSION = 4.16.0.0 QMAKE_TARGET_COMPANY = "The pgAdmin Development Team" QMAKE_TARGET_PRODUCT = "pgAdmin 4" QMAKE_TARGET_DESCRIPTION = "pgAdmin 4 Desktop Runtime" -QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2013 - 2020, The pgAdmin Development Team" +QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2013 - 2019, The pgAdmin Development Team" # Configure QT modules for the appropriate version of QT greaterThan(QT_MAJOR_VERSION, 4) { diff --git a/tools/copyright_updater.py b/tools/copyright_updater.py index 4af08aa1b..4ab8540e7 100644 --- a/tools/copyright_updater.py +++ b/tools/copyright_updater.py @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/tools/dependency_inventory.py b/tools/dependency_inventory.py index ef6938910..c2f493382 100644 --- a/tools/dependency_inventory.py +++ b/tools/dependency_inventory.py @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/tools/get_chromedriver.py b/tools/get_chromedriver.py index 48c6cc131..dfd62afe3 100644 --- a/tools/get_chromedriver.py +++ b/tools/get_chromedriver.py @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/tools/sql_keywords.py b/tools/sql_keywords.py index 9f1d466c2..1c9eba3f3 100644 --- a/tools/sql_keywords.py +++ b/tools/sql_keywords.py @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/.eslintrc.js b/web/.eslintrc.js index 795c8bcd0..a9d7437fd 100644 --- a/web/.eslintrc.js +++ b/web/.eslintrc.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/config.py b/web/config.py index f24373e4a..416454f6e 100644 --- a/web/config.py +++ b/web/config.py @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # # config.py - Core application configuration settings @@ -51,7 +51,7 @@ APP_ICON = 'pg-icon' # Application version number components APP_RELEASE = 4 -APP_REVISION = 17 +APP_REVISION = 16 # Application version suffix, e.g. 'beta1', 'dev'. Usually an empty string # for GA releases. @@ -60,7 +60,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 = 41700 +APP_VERSION_INT = 41600 # DO NOT CHANGE! # The application version string, constructed from the components @@ -71,7 +71,7 @@ else: # Copyright string for display in the app # Any changes made here must also be made in runtime/pgAdmin4.pro -APP_COPYRIGHT = 'Copyright (C) 2013 - 2020, The pgAdmin Development Team' +APP_COPYRIGHT = 'Copyright (C) 2013 - 2019, The pgAdmin Development Team' ########################################################################## # Misc stuff diff --git a/web/karma.conf.js b/web/karma.conf.js index f41512575..9ed1be861 100644 --- a/web/karma.conf.js +++ b/web/karma.conf.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/migrations/alembic.ini b/web/migrations/alembic.ini index 68e529342..7755852db 100644 --- a/web/migrations/alembic.ini +++ b/web/migrations/alembic.ini @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/migrations/env.py b/web/migrations/env.py index 15f6c3c5b..c2145ab71 100644 --- a/web/migrations/env.py +++ b/web/migrations/env.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/migrations/script.py.mako b/web/migrations/script.py.mako index c8b4c12d3..eadf9cc40 100644 --- a/web/migrations/script.py.mako +++ b/web/migrations/script.py.mako @@ -2,7 +2,7 @@ ## ## pgAdmin 4 - PostgreSQL Tools ## -## Copyright (C) 2013 - 2020, The pgAdmin Development Team +## Copyright (C) 2013 - 2019, The pgAdmin Development Team ## This software is released under the PostgreSQL Licence ## ########################################################################## diff --git a/web/migrations/versions/02b9dccdcfcb_.py b/web/migrations/versions/02b9dccdcfcb_.py index 185eb2156..613772a02 100644 --- a/web/migrations/versions/02b9dccdcfcb_.py +++ b/web/migrations/versions/02b9dccdcfcb_.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/migrations/versions/09d53fca90c7_.py b/web/migrations/versions/09d53fca90c7_.py index 55678c882..a9d696d93 100644 --- a/web/migrations/versions/09d53fca90c7_.py +++ b/web/migrations/versions/09d53fca90c7_.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/migrations/versions/aa86fb60b73d_.py b/web/migrations/versions/aa86fb60b73d_.py index 1581af4c5..df369da36 100644 --- a/web/migrations/versions/aa86fb60b73d_.py +++ b/web/migrations/versions/aa86fb60b73d_.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/migrations/versions/b5b87fdfcb30_.py b/web/migrations/versions/b5b87fdfcb30_.py index 124606fc9..fdb2a8d9c 100644 --- a/web/migrations/versions/b5b87fdfcb30_.py +++ b/web/migrations/versions/b5b87fdfcb30_.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/migrations/versions/ca00ec32581b_.py b/web/migrations/versions/ca00ec32581b_.py index cd6bf6877..a20b90426 100644 --- a/web/migrations/versions/ca00ec32581b_.py +++ b/web/migrations/versions/ca00ec32581b_.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/migrations/versions/ece2e76bf60e_.py b/web/migrations/versions/ece2e76bf60e_.py index 2142f65f8..a91abdd56 100644 --- a/web/migrations/versions/ece2e76bf60e_.py +++ b/web/migrations/versions/ece2e76bf60e_.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/migrations/versions/fdc58d9bd449_.py b/web/migrations/versions/fdc58d9bd449_.py index b9906c100..fdfc49413 100644 --- a/web/migrations/versions/fdc58d9bd449_.py +++ b/web/migrations/versions/fdc58d9bd449_.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgAdmin4.py b/web/pgAdmin4.py index 81ef6c396..5cfd61253 100644 --- a/web/pgAdmin4.py +++ b/web/pgAdmin4.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -13,6 +13,7 @@ to start a web server.""" import os import sys +from cheroot.wsgi import Server as CherootServer if sys.version_info[0] >= 3: import builtins @@ -190,15 +191,29 @@ if __name__ == '__main__': # Reference: # https://github.com/pallets/werkzeug/issues/220#issuecomment-11176538 try: - app.run( - host=config.DEFAULT_SERVER, - port=server_port, - use_reloader=( - (not PGADMIN_RUNTIME) and app.debug and - os.environ.get("WERKZEUG_RUN_MAIN") is not None - ), - threaded=config.THREADED_MODE - ) - + if config.DEBUG: + app.run( + host=config.DEFAULT_SERVER, + port=server_port, + use_reloader=( + (not PGADMIN_RUNTIME) and app.debug and + os.environ.get("WERKZEUG_RUN_MAIN") is not None + ), + threaded=config.THREADED_MODE + ) + else: + # Can use cheroot instead of flask dev server when not in debug + # 10 is default thread count in CherootServer + num_threads = 10 if config.THREADED_MODE else 1 + prod_server = CherootServer( + (config.DEFAULT_SERVER, server_port), + wsgi_app=app, + numthreads=num_threads, + server_name=config.APP_NAME) + try: + print("Using production server...") + prod_server.start() + except KeyboardInterrupt: + prod_server.stop() except IOError: app.logger.error("Error starting the app server: %s", sys.exc_info()) diff --git a/web/pgAdmin4.wsgi b/web/pgAdmin4.wsgi index cf3ad0c21..6daaefbeb 100644 --- a/web/pgAdmin4.wsgi +++ b/web/pgAdmin4.wsgi @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index 820c8015a..f60ddf374 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index fd545b09e..18b634818 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/about/static/js/about.js b/web/pgadmin/about/static/js/about.js index 5b711d4cc..9186f65c3 100644 --- a/web/pgadmin/about/static/js/about.js +++ b/web/pgadmin/about/static/js/about.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 5aee341fd..63753c64e 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/collection.py b/web/pgadmin/browser/collection.py index 309e914a5..658f23a42 100644 --- a/web/pgadmin/browser/collection.py +++ b/web/pgadmin/browser/collection.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/register_browser_preferences.py b/web/pgadmin/browser/register_browser_preferences.py index 09f472795..48857b202 100644 --- a/web/pgadmin/browser/register_browser_preferences.py +++ b/web/pgadmin/browser/register_browser_preferences.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/__init__.py b/web/pgadmin/browser/server_groups/__init__.py index e10c1949b..25addfd0e 100644 --- a/web/pgadmin/browser/server_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index a93e70a86..9117a4cc4 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -28,6 +28,7 @@ from pgadmin.model import db, Server, ServerGroup, User from pgadmin.utils.driver import get_driver from pgadmin.utils.master_password import get_crypt_key from pgadmin.utils.exception import CryptKeyMissing +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry from psycopg2 import Error as psycopg2_Error, OperationalError @@ -1627,4 +1628,5 @@ class ServerNode(PGChildNodeView): ) +SchemaDiffRegistry(blueprint.node_type, ServerNode) ServerNode.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/__init__.py index 29eb7721e..ca046d08c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -30,6 +30,8 @@ from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error, unauthorized from pgadmin.utils.driver import get_driver from pgadmin.tools.sqleditor.utils.query_history import QueryHistory + +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry from pgadmin.model import Server @@ -1111,4 +1113,5 @@ class DatabaseView(PGChildNodeView): ) +SchemaDiffRegistry(blueprint.node_type, DatabaseView) DatabaseView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py index 582bac163..eec197e42 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js index bc266260a..711d3ad33 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/__init__.py index d80fccdc6..be323b387 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_add.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_add.py index 19228afcb..b11c096b1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py index d67273472..9afd37556 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py index 6f4146b5f..87c3a76a8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py index b168a7318..13b0141af 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py index 402e288eb..9d7321e0a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py index 97b788850..f18b5d494 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py index 4206f47cf..6e2fd1a5a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js index 8a9b5b71e..8f8c2ad8d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/__init__.py index ed15d66bf..4ba0dafe9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py index a671fd353..616dad5f6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py index 8122c15a8..4882efe94 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py index 8893b78a9..e4b8747a4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py index fcd695803..695ce27da 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py index 467ceab1c..09bec020c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py index 1e147123f..ca9171764 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py index 525243add..89b1a1183 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js index 3c6adddad..8fcb442f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/__init__.py index dc2d34275..2a57f398e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py index a18d4f223..23b538f46 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py index 03c897f4d..3f7f4559e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py index c9770eea5..a88b0a627 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py index baf2ae9f9..9b0e486dc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py index 7f60d94db..e95c7f487 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py index b0eb66020..9aa0d1b63 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py index 6bb6a415e..979d278d1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py index 53a472331..92388f73c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/properties.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/properties.py index 88f20a15d..ec0221b90 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/properties.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/reverse_engineer_ddl.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/reverse_engineer_ddl.py index 9daa2cce3..68df11795 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/reverse_engineer_ddl.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/reverse_engineer_ddl.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py index 97e873ee0..a666aded2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py index 570767e7d..762c33ef2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_mapping_utils.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_mapping_utils.py index 023be143f..84a141248 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_mapping_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_mapping_utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py index b8eed3696..989c95c6b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py index 2d41cb327..87c698ed6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py index 94ac89b0e..f9966975e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py index 90487dff3..3ab1f4dd4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js index 5ac9f0b34..e392cc413 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/__init__.py index 088aadfd7..92cbd6a64 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py index 7b07e01f6..fc1b02eab 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py index e7ee2c90f..d7850331d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py index a4074a430..6a0136276 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py index ee19b536e..880455c63 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py index b7a1cc663..003ad6f83 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py index 596c95792..871944117 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py index ee7648fd4..ed7de23ac 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js index b7df1158c..b3b66f710 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/__init__.py index c3aefd2e3..3a7590170 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py index a208f93e0..10321f139 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py index fbd9f98dd..9766d14f0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py index 726a9ba0d..2d046c8b1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py index 980d58f0f..77a47c4c5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py index f008442fc..92ba4f5d3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py index ef767fc8a..17a432818 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js index 6fd09f0bd..2fd5c915f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/__init__.py index b4d9ce707..4d0c00d15 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py index ec6f09216..dec5df810 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py index f4fea98de..a5e95ef6d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py index f707f0123..4b6d9213d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py index cd0212fab..b90033a13 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py index 238d98550..bfd47263a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py index dac2ba209..b4fe00822 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py index 341743c57..2b03d5c60 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js index 6ca60391d..0d7cea194 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/__init__.py index a69b8844c..58c1b3cf9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py index ed285477a..6ab8d731e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py index 487595267..1354d6cbe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py index 95f8574e8..084e57a41 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py index f6a70c01d..405d5b870 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py index babf00a80..8df25bb5f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py index 660d2750c..6d8fa0a56 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py index 3d223f4f3..4ef560b61 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -23,6 +23,7 @@ from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone, bad_request from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry """ This module is responsible for generating two nodes @@ -1023,5 +1024,6 @@ It may have been removed by another user. return ajax_response(response=SQL.strip("\n")) +SchemaDiffRegistry(schema_blueprint.node_type, SchemaView) SchemaView.register_node_view(schema_blueprint) CatalogView.register_node_view(catalog_blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py index 1bf2a4af3..e56f488e5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py index add698f6a..75bce58b7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js index a9df3a7eb..1682b04d5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js index 225934541..efdafbb96 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py index 6611a52d8..fac184fd5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -25,6 +25,8 @@ from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.compile_template_name import compile_template_path from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -92,7 +94,7 @@ class CollationModule(SchemaChildModule): blueprint = CollationModule(__name__) -class CollationView(PGChildNodeView): +class CollationView(PGChildNodeView, SchemaDiffObjectCompare): """ This class is responsible for generating routes for Collation node @@ -144,6 +146,10 @@ class CollationView(PGChildNodeView): * dependent(gid, sid, did, scid): - This function will generate dependent list to show it in dependent pane for the selected Collation node. + + * compare(**kwargs): + - This function will compare the collation nodes from two different + schemas. """ node_type = blueprint.node_type @@ -172,7 +178,8 @@ class CollationView(PGChildNodeView): 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], 'get_collations': [{'get': 'get_collation'}, - {'get': 'get_collation'}] + {'get': 'get_collation'}], + 'compare': [{'get': 'compare'}, {'get': 'compare'}] }) def check_precondition(f): @@ -318,23 +325,36 @@ class CollationView(PGChildNodeView): JSON of selected collation node """ + status, res = self._fetch_properties(scid, coid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, coid): + """ + This function fetch the properties for the specified object. + + :param scid: Schema ID + :param coid: Collation ID + """ + SQL = render_template("/".join([self.template_path, 'properties.sql']), scid=scid, coid=coid) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone( - gettext("Could not find the collation object in the database.") - ) + return False, gone(gettext("Could not find the collation " + "object in the database.")) - return ajax_response( - response=res['rows'][0], - status=200 - ) + return True, res['rows'][0] @check_precondition def get_collation(self, gid, sid, did, scid, coid=None): @@ -748,5 +768,30 @@ class CollationView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the collations for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + + return res + CollationView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js index 5ee1a5787..407f82f08 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/__init__.py index 1939f0989..b2e45097d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py index 68616b10d..63a879ba2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py index 57db8a323..c56d64769 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py index 310a8e437..a68656e42 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py index 3c9dbed70..c9f64b730 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py index a4324bd4c..7466ffd61 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py index 2259e7da2..0f28c4c35 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py index 8de988ccf..6fdcace84 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -27,6 +27,8 @@ from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.compile_template_name import compile_template_path from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -79,7 +81,7 @@ class DomainModule(SchemaChildModule): blueprint = DomainModule(__name__) -class DomainView(PGChildNodeView, DataTypeReader): +class DomainView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): """ class DomainView @@ -138,6 +140,10 @@ class DomainView(PGChildNodeView, DataTypeReader): * types(gid, sid, did, scid, fnid=None): - Returns Data Types. + + * compare(**kwargs): + - This function will compare the domain nodes from two different + schemas. """ node_type = blueprint.node_type @@ -169,7 +175,8 @@ class DomainView(PGChildNodeView, DataTypeReader): 'get_collations': [ {'get': 'get_collations'}, {'get': 'get_collations'} - ] + ], + 'compare': [{'get': 'compare'}, {'get': 'compare'}] }) def validate_request(f): @@ -369,15 +376,31 @@ class DomainView(PGChildNodeView, DataTypeReader): scid: Schema Id doid: Domain Id """ + status, res = self._fetch_properties(did, scid, doid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + def _fetch_properties(self, did, scid, doid): + """ + This function is used to fecth the properties of specified object. + :param did: + :param scid: + :param doid: + :return: + """ SQL = render_template("/".join([self.template_path, 'properties.sql']), scid=scid, doid=doid) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone(gettext(""" + return False, gone(gettext(""" Could not find the domain in the database. It may have been removed by another user or moved to another schema. """)) @@ -393,7 +416,7 @@ It may have been removed by another user or moved to another schema. doid=doid) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) data['constraints'] = res['rows'] @@ -406,10 +429,7 @@ It may have been removed by another user or moved to another schema. if doid <= self.manager.db_info[did]['datlastsysoid']: data['sysdomain'] = True - return ajax_response( - response=data, - status=200 - ) + return True, data def _parse_type(self, basetype): """ @@ -664,7 +684,7 @@ AND relkind != 'c'))""" ) @check_precondition - def sql(self, gid, sid, did, scid, doid=None): + def sql(self, gid, sid, did, scid, doid=None, return_ajax_response=True): """ Returns the SQL for the Domain object. @@ -674,6 +694,7 @@ AND relkind != 'c'))""" did: Database Id scid: Schema Id doid: Domain Id + return_ajax_response: """ SQL = render_template("/".join([self.template_path, @@ -716,6 +737,9 @@ AND relkind != 'c'))""" """.format(self.qtIdent(self.conn, data['basensp'], data['name'])) SQL = sql_header + SQL + if not return_ajax_response: + return SQL.strip('\n') + return ajax_response(response=SQL.strip('\n')) @check_precondition @@ -846,5 +870,40 @@ AND relkind != 'c'))""" status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the domains for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'node.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(did, scid, row['oid']) + + if status: + if 'constraints' in data and len(data['constraints']) > 0: + for item in data['constraints']: + # Remove keys that should not be the part + # of comparision. + if 'conoid' in item: + item.pop('conoid') + if 'nspname' in item: + item.pop('nspname') + + res[row['name']] = data + + return res + DomainView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py index 38c686a3b..f402a79e7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js index 704353bbf..a7f0a91d6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js index a4cb9b220..14a48f3cf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/9.2_plus/get_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/9.2_plus/get_constraints.sql index df956bf9a..676c5a6e2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/9.2_plus/get_constraints.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/9.2_plus/get_constraints.sql @@ -8,7 +8,7 @@ JOIN JOIN pg_namespace nl ON nl.oid=typnamespace LEFT OUTER JOIN - pg_description des ON (des.objoid=t.oid AND des.classoid='pg_constraint'::regclass) + pg_description des ON (des.objoid=c.oid AND des.classoid='pg_constraint'::regclass) WHERE contype = 'c' AND contypid = {{doid}}::oid ORDER BY diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/default/get_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/default/get_constraints.sql index 897fb2477..b99f855a8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/default/get_constraints.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/default/get_constraints.sql @@ -8,7 +8,7 @@ JOIN JOIN pg_namespace nl ON nl.oid=typnamespace LEFT OUTER JOIN - pg_description des ON (des.objoid=t.oid AND des.classoid='pg_constraint'::regclass) + pg_description des ON (des.objoid=c.oid AND des.classoid='pg_constraint'::regclass) WHERE contype = 'c' AND contypid = {{doid}}::oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/__init__.py index 2cb00a3ec..740967bea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py index 2208181b3..6d081119f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py index ec2ce6690..c3192b19d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py index fef60ddab..8121e8f69 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py index e3d2f6286..0672c2d2b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py index 2701a9c16..ba51bbf70 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py index 8f106dbd0..7d41ed183 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py index 342bd6552..3bd9a27f8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py index 8541e1b7b..1be76c906 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -32,6 +32,8 @@ from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.compile_template_name import compile_template_path from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -93,7 +95,8 @@ class ForeignTableModule(SchemaChildModule): blueprint = ForeignTableModule(__name__) -class ForeignTableView(PGChildNodeView, DataTypeReader): +class ForeignTableView(PGChildNodeView, DataTypeReader, + SchemaDiffObjectCompare): """ class ForeignTableView(PGChildNodeView) @@ -174,6 +177,9 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): * delete_sql(gid, sid, did, scid, foid): - Returns sql for Script + * compare(**kwargs): + - This function will compare the foreign table nodes from two different + schemas. """ node_type = blueprint.node_type @@ -213,7 +219,8 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): 'select_sql': [{'get': 'select_sql'}], 'insert_sql': [{'get': 'insert_sql'}], 'update_sql': [{'get': 'update_sql'}], - 'delete_sql': [{'get': 'delete_sql'}] + 'delete_sql': [{'get': 'delete_sql'}], + 'compare': [{'get': 'compare'}, {'get': 'compare'}] }) def validate_request(f): @@ -447,11 +454,9 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): scid: Schema Id foid: Foreign Table Id """ - data = self._fetch_properties(gid, sid, did, scid, foid) - if data is False: - return gone( - gettext("Could not find the foreign table on the server.") - ) + status, data = self._fetch_properties(gid, sid, did, scid, foid) + if not status: + return data return ajax_response( response=data, @@ -814,11 +819,10 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): scid: Schema Id foid: Foreign Table Id """ - data = self._fetch_properties(gid, sid, did, scid, foid, inherits=True) - if data is False: - return gone( - gettext("Could not find the foreign table on the server.") - ) + status, data = self._fetch_properties(gid, sid, did, scid, foid, + inherits=True) + if not status: + return data col_data = [] for c in data['columns']: @@ -891,12 +895,10 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): foid: Foreign Table Id """ if foid is not None: - old_data = self._fetch_properties(gid, sid, did, scid, foid, - inherits=True) - if old_data is False: - return gone( - gettext("Could not find the foreign table on the server.") - ) + status, old_data = self._fetch_properties(gid, sid, did, scid, + foid, inherits=True) + if not status: + return old_data # Prepare dict of columns with key = column's attnum # Will use this in the update template when any column is @@ -1051,10 +1053,10 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): scid=scid, foid=foid) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return False + return False, False data = res['rows'][0] @@ -1064,7 +1066,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): foid=foid) status, aclres = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=aclres) + return False, internal_server_error(errormsg=aclres) # Get Formatted Privileges data.update(self._format_proacl_from_db(aclres['rows'])) @@ -1082,7 +1084,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): 'get_constraints.sql']), foid=foid) status, cons = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=cons) + return False, internal_server_error(errormsg=cons) if cons and 'rows' in cons: data['constraints'] = cons['rows'] @@ -1091,7 +1093,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): 'get_columns.sql']), foid=foid) status, cols = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=cols) + return False, internal_server_error(errormsg=cols) # The Length and the precision of the Datatype should be separated. # The Format we getting from database is: numeric(1,1) @@ -1128,12 +1130,12 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if 'inherits' in res['rows'][0]: data['inherits'] = res['rows'][0]['inherits'] - return data + return True, data @staticmethod def convert_precision_to_int(typlen): @@ -1222,11 +1224,9 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): Returns: SELECT Script sql for the object """ - data = self._fetch_properties(gid, sid, did, scid, foid) - if data is False: - return gone( - gettext("Could not find the foreign table on the server.") - ) + status, data = self._fetch_properties(gid, sid, did, scid, foid) + if not status: + return data columns = [] for c in data['columns']: @@ -1259,11 +1259,9 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): Returns: INSERT Script sql for the object """ - data = self._fetch_properties(gid, sid, did, scid, foid) - if data is False: - return gone( - gettext("Could not find the foreign table on the server.") - ) + status, data = self._fetch_properties(gid, sid, did, scid, foid) + if not status: + return data columns = [] values = [] @@ -1301,11 +1299,9 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): Returns: UPDATE Script sql for the object """ - data = self._fetch_properties(gid, sid, did, scid, foid) - if data is False: - return gone( - gettext("Could not find the foreign table on the server.") - ) + status, data = self._fetch_properties(gid, sid, did, scid, foid) + if not status: + return data columns = [] @@ -1346,11 +1342,9 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): Returns: DELETE Script sql for the object """ - data = self._fetch_properties(gid, sid, did, scid, foid) - if data is False: - return gone( - gettext("Could not find the foreign table on the server.") - ) + status, data = self._fetch_properties(gid, sid, did, scid, foid) + if not status: + return data sql = u"DELETE FROM {0}\n\tWHERE ;".format( self.qtIdent(self.conn, data['basensp'], data['name']) @@ -1358,5 +1352,37 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): return ajax_response(response=sql) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the foreign tables for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'node.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(0, sid, did, scid, + row['oid']) + if status: + if 'constraints' in data and data['constraints'] is not None \ + and len(data['constraints']) > 0: + for item in data['constraints']: + if 'conoid' in item: + item.pop('conoid') + + res[row['name']] = data + + return res + ForeignTableView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js index d20d43f60..d34fa8384 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/__init__.py index 08a55e1f5..23915a897 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py index c989b0caa..2e5ee60f7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py index 9f8f84fb6..1b1871c73 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py index 9b3289e6e..f07a9bb34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py index 4449892e7..c42ec3538 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py index 17beda009..cbf160ade 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py index 078baceca..b78670be1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py index ada12c419..4e65961de 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -24,6 +24,8 @@ from pgadmin.utils import IS_PY2 from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -93,7 +95,7 @@ class FtsConfigurationModule(SchemaChildModule): blueprint = FtsConfigurationModule(__name__) -class FtsConfigurationView(PGChildNodeView): +class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare): """ class FtsConfigurationView(PGChildNodeView) @@ -167,6 +169,9 @@ class FtsConfigurationView(PGChildNodeView): * dependencies(self, gid, sid, did, scid, cfgid): - This function get the dependencies and return ajax response for node. + * compare(**kwargs): + - This function will compare the fts configuration nodes from two + different schemas. """ node_type = blueprint.node_type @@ -202,6 +207,7 @@ class FtsConfigurationView(PGChildNodeView): {'get': 'copyConfig'}], 'tokens': [{'get': 'tokens'}, {'get': 'tokens'}], 'dictionaries': [{}, {'get': 'dictionaries'}], + 'compare': [{'get': 'compare'}, {'get': 'compare'}] }) def _init_(self, **kwargs): @@ -343,7 +349,22 @@ class FtsConfigurationView(PGChildNodeView): scid: Schema Id cfgid: fts Configuration id """ + status, res = self._fetch_properties(scid, cfgid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + def _fetch_properties(self, scid, cfgid): + """ + This function is used to fetch property of specified object. + :param scid: + :param cfgid: + :return: + """ sql = render_template( "/".join([self.template_path, 'properties.sql']), scid=scid, @@ -352,10 +373,10 @@ class FtsConfigurationView(PGChildNodeView): status, res = self.conn.execute_dict(sql) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone( + return False, gone( _( "Could not find the FTS Configuration node in the " "database node.") @@ -370,14 +391,11 @@ class FtsConfigurationView(PGChildNodeView): status, rset = self.conn.execute_dict(sql) if not status: - return internal_server_error(errormsg=rset) + return False, internal_server_error(errormsg=rset) res['rows'][0]['tokens'] = rset['rows'] - return ajax_response( - response=res['rows'][0], - status=200 - ) + return True, res['rows'][0] @check_precondition def create(self, gid, sid, did, scid): @@ -927,5 +945,30 @@ class FtsConfigurationView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the fts configurations for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), scid=scid) + status, fts_cfg = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in fts_cfg['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + + return res + FtsConfigurationView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js index 3c37cd592..5b526903c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/__init__.py index a5bb9899d..7bf1ce3c4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py index 2ca767cbc..e9bdf47f1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py index 0a06b626f..48fb3b82b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py index 3afaf7b36..46cd96be3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py index 52d447616..17e820d99 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py index 3faa0678a..98e20153f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py index 0e4b5503d..5a333ba40 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py index 7b0fab5f9..358882cdb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -24,6 +24,8 @@ from pgadmin.utils import IS_PY2 from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -91,7 +93,7 @@ class FtsDictionaryModule(SchemaChildModule): blueprint = FtsDictionaryModule(__name__) -class FtsDictionaryView(PGChildNodeView): +class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare): """ class FtsDictionaryView(PGChildNodeView) @@ -159,6 +161,9 @@ class FtsDictionaryView(PGChildNodeView): * dependencies(self, gid, sid, did, scid, dcid): - This function get the dependencies and return ajax response for node. + * compare(**kwargs): + - This function will compare the fts dictionaries nodes from two + different schemas. """ node_type = blueprint.node_type @@ -189,7 +194,7 @@ class FtsDictionaryView(PGChildNodeView): 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], 'fetch_templates': [{'get': 'fetch_templates'}, - {'get': 'fetch_templates'}], + {'get': 'fetch_templates'}] }) def _init_(self, **kwargs): @@ -353,7 +358,23 @@ class FtsDictionaryView(PGChildNodeView): scid: Schema Id dcid: fts dictionary id """ + status, res = self._fetch_properties(scid, dcid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, dcid): + """ + This function is used to fetch the properties of specified object. + :param scid: + :param dcid: + :return: + """ sql = render_template( "/".join([self.template_path, 'properties.sql']), scid=scid, @@ -362,10 +383,10 @@ class FtsDictionaryView(PGChildNodeView): status, res = self.conn.execute_dict(sql) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone(_( + return False, gone(_( "Could not find the FTS Dictionary node in the database node." )) @@ -382,10 +403,7 @@ class FtsDictionaryView(PGChildNodeView): res['rows'][0]['options'] ) - return ajax_response( - response=res['rows'][0], - status=200 - ) + return True, res['rows'][0] @check_precondition def create(self, gid, sid, did, scid): @@ -854,5 +872,30 @@ class FtsDictionaryView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the fts dictionaries for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + + return res + FtsDictionaryView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js index 5f807cc1d..1fbdf8e2b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/__init__.py index f20314d4a..47f6754fb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py index a3eb527ff..30c95c50e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py index dcf12bb1e..274f12132 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py index f8a78724e..883b5c3ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py index 270385c99..20feb070e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py index d4487ea5e..70764c2e2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py index 61a0448a5..635ad61cf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py index 0500ce161..09a445723 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -24,6 +24,8 @@ from pgadmin.utils import IS_PY2 from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -84,7 +86,7 @@ class FtsParserModule(SchemaChildModule): blueprint = FtsParserModule(__name__) -class FtsParserView(PGChildNodeView): +class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare): """ class FtsParserView(PGChildNodeView) @@ -161,6 +163,9 @@ class FtsParserView(PGChildNodeView): - This function get the dependencies and return ajax response for FTS Parser node. + * compare(**kwargs): + - This function will compare the fts parser nodes from two + different schemas. """ node_type = blueprint.node_type @@ -198,7 +203,7 @@ class FtsParserView(PGChildNodeView): 'lextype_functions': [{'get': 'lextype_functions'}, {'get': 'lextype_functions'}], 'headline_functions': [{'get': 'headline_functions'}, - {'get': 'headline_functions'}], + {'get': 'headline_functions'}] }) def _init_(self, **kwargs): @@ -303,6 +308,32 @@ class FtsParserView(PGChildNodeView): @check_precondition def properties(self, gid, sid, did, scid, pid): + """ + + :param gid: + :param sid: + :param did: + :param scid: + :param pid: + :return: + """ + status, res = self._fetch_properties(scid, pid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, pid): + """ + This function is used to fetch the properties of specified object. + + :param scid: + :param pid: + :return: + """ sql = render_template( "/".join([self.template_path, 'properties.sql']), scid=scid, @@ -311,16 +342,13 @@ class FtsParserView(PGChildNodeView): status, res = self.conn.execute_dict(sql) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone( + return False, gone( _("Could not find the FTS Parser node in the database node.")) - return ajax_response( - response=res['rows'][0], - status=200 - ) + return True, res['rows'][0] @check_precondition def create(self, gid, sid, did, scid): @@ -862,5 +890,30 @@ class FtsParserView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the fts parsers for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + + return res + FtsParserView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js index 6f94e70d4..e1bb184a5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/__init__.py index f20314d4a..47f6754fb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py index 350179c36..dff662a85 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py index 3ab813cc3..8ddf8ea7b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py index fc32a9097..9d861c477 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py index 593b4132c..3833581a1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py index d9e21f9c0..51ec2e437 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/utils.py index 89bff20dc..074194c2d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py index d51b4e5fb..6b7627db0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -24,6 +24,8 @@ from pgadmin.utils import IS_PY2 from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -90,7 +92,7 @@ class FtsTemplateModule(SchemaChildModule): blueprint = FtsTemplateModule(__name__) -class FtsTemplateView(PGChildNodeView): +class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare): """ class FtsTemplateView(PGChildNodeView) @@ -154,6 +156,9 @@ class FtsTemplateView(PGChildNodeView): - This function get the dependencies and return ajax response for the FTS Template node. + * compare(**kwargs): + - This function will compare the fts template nodes from two + different schemas. """ node_type = blueprint.node_type @@ -184,7 +189,7 @@ class FtsTemplateView(PGChildNodeView): 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], 'get_lexize': [{'get': 'get_lexize'}, {'get': 'get_lexize'}], - 'get_init': [{'get': 'get_init'}, {'get': 'get_init'}], + 'get_init': [{'get': 'get_init'}, {'get': 'get_init'}] }) def _init_(self, **kwargs): @@ -281,25 +286,47 @@ class FtsTemplateView(PGChildNodeView): @check_precondition def properties(self, gid, sid, did, scid, tid): + """ + + :param gid: + :param sid: + :param did: + :param scid: + :param tid: + :return: + """ + status, res = self._fetch_properties(scid, tid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, tid): + """ + This function is used to fetch the properties of specified object. + + :param scid: + :param pid: + :return: + """ sql = render_template( "/".join([self.template_path, 'properties.sql']), scid=scid, tid=tid ) status, res = self.conn.execute_dict(sql) - if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone( + return False, gone( gettext("Could not find the requested FTS template.") ) - return ajax_response( - response=res['rows'][0], - status=200 - ) + return True, res['rows'][0] @check_precondition def create(self, gid, sid, did, scid): @@ -734,5 +761,30 @@ class FtsTemplateView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the fts templates for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + + return res + FtsTemplateView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js index c3c225e45..2d89f9957 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/__init__.py index f20314d4a..47f6754fb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py index 0314c3f21..494332075 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py index 56e245566..cbd8d771e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py index 0f61ef9b9..9223715d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py index e741bda9a..c43425d50 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py index b404ba4a0..2977663f9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py index d384fd31c..28495ae33 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py index 53b88f1e3..ca8d50c8d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -21,7 +21,7 @@ from flask import render_template, make_response, request, jsonify, \ current_app from flask_babelex import gettext from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ - SchemaChildModule, DataTypeReader + SchemaChildModule, DataTypeReader, get_schema from pgadmin.browser.server_groups.servers.databases.utils import \ parse_sec_labels_from_db, parse_variables_from_db from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ @@ -30,8 +30,10 @@ from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.driver import get_driver - from config import PG_DEFAULT_DRIVER +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.model import SchemaDiffModel +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare class FunctionModule(SchemaChildModule): @@ -115,7 +117,7 @@ class FunctionModule(SchemaChildModule): blueprint = FunctionModule(__name__) -class FunctionView(PGChildNodeView, DataTypeReader): +class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): """ class FunctionView(PGChildNodeView) @@ -177,6 +179,10 @@ class FunctionView(PGChildNodeView, DataTypeReader): * exec_sql(gid, sid, did, scid, fnid): - Returns sql for Script + + * compare(**kwargs): + - This function will compare the function nodes from two + different schemas. """ node_type = blueprint.node_type @@ -213,6 +219,9 @@ class FunctionView(PGChildNodeView, DataTypeReader): {'get': 'get_support_functions'}] }) + keys_to_ignore = ['oid', 'proowner', 'typnsp', 'xmin', 'prokind', + 'proisagg', 'pronamespace', 'proargdefaults'] + @property def required_args(self): """ @@ -790,7 +799,7 @@ class FunctionView(PGChildNodeView, DataTypeReader): ) @check_precondition - def delete(self, gid, sid, did, scid, fnid=None): + def delete(self, gid, sid, did, scid, fnid=None, only_sql=False): """ Drop the Function. @@ -841,6 +850,8 @@ class FunctionView(PGChildNodeView, DataTypeReader): func_args=res['rows'][0]['func_args'], nspname=res['rows'][0]['nspname'], cascade=cascade) + if only_sql: + return SQL status, res = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=res) @@ -915,7 +926,8 @@ class FunctionView(PGChildNodeView, DataTypeReader): ) @check_precondition - def sql(self, gid, sid, did, scid, fnid=None): + def sql(self, gid, sid, did, scid, fnid=None, diff_schema=None, + json_resp=True): """ Returns the SQL for the Function object. @@ -989,6 +1001,8 @@ class FunctionView(PGChildNodeView, DataTypeReader): if not status: return internal_server_error(errormsg=res) + if diff_schema: + res['rows'][0]['nspname'] = diff_schema name_with_default_args = self.qtIdent( self.conn, res['rows'][0]['nspname'], @@ -1040,6 +1054,10 @@ class FunctionView(PGChildNodeView, DataTypeReader): if not status: return internal_server_error(errormsg=res) + if diff_schema: + res['rows'][0]['nspname'] = diff_schema + resp_data['pronamespace'] = diff_schema + name_with_default_args = self.qtIdent( self.conn, res['rows'][0]['nspname'], @@ -1071,6 +1089,9 @@ class FunctionView(PGChildNodeView, DataTypeReader): resp_data['proname']), resp_data['proargtypenames'].lstrip('(').rstrip(')')) + if not json_resp: + return re.sub('\n{2,}', '\n\n', func_def) + SQL = sql_header + func_def SQL = re.sub('\n{2,}', '\n\n', SQL) @@ -1597,7 +1618,66 @@ class FunctionView(PGChildNodeView, DataTypeReader): status=200 ) + def get_sql_from_diff(self, gid, sid, did, scid, oid, data=None, + diff_schema=None, drop_sql=False): + sql = '' + if data: + if diff_schema: + data['schema'] = diff_schema + status, sql = self._get_sql(gid, sid, did, scid, data, oid) + else: + if drop_sql: + sql = self.delete(gid=gid, sid=sid, did=did, + scid=scid, fnid=oid, only_sql=True) + elif diff_schema: + sql = self.sql(gid=gid, sid=sid, did=did, scid=scid, fnid=oid, + diff_schema=diff_schema, json_resp=False) + else: + sql = self.sql(gid=gid, sid=sid, did=did, scid=scid, fnid=oid, + json_resp=False) + return sql + + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid, oid=None): + """ + This function will fetch the list of all the functions for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + server_type = self.manager.server_type + server_version = self.manager.sversion + + if server_type == 'pg' and self.blueprint.min_ver is not None and \ + server_version < self.blueprint.min_ver: + return res + if server_type == 'ppas' and self.blueprint.min_ppasver is not None \ + and server_version < self.blueprint.min_ppasver: + return res + + if not oid: + SQL = render_template("/".join([self.sql_template_path, + 'node.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + data = self._fetch_properties(0, sid, did, scid, row['oid']) + if isinstance(data, dict): + res[row['name']] = data + else: + data = self._fetch_properties(0, sid, did, scid, oid) + res = data + + return res + +SchemaDiffRegistry(blueprint.node_type, FunctionView) FunctionView.register_node_view(blueprint) @@ -1698,6 +1778,7 @@ class ProcedureView(FunctionView): 'prosrc'] +SchemaDiffRegistry(procedure_blueprint.node_type, ProcedureView) ProcedureView.register_node_view(procedure_blueprint) @@ -1796,4 +1877,5 @@ class TriggerFunctionView(FunctionView): 'prosrc'] +SchemaDiffRegistry(trigger_function_blueprint.node_type, TriggerFunctionView) TriggerFunctionView.register_node_view(trigger_function_blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js index e828adc79..ee7fa02fa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js index 5f93d9788..1dc8988f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js index 9888ad979..25dc5171a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/__init__.py index 5c464f025..c505ba66b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py index 0f308f37f..15adf5ebe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py index 6dd6bf806..a6c45f32d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py index d822e4e21..61d0e8c10 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py index a44a22f81..555411f8a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py index 8c3ca5f1e..870528dfa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py index c3940f566..1f833ee7c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py index cc6c189ee..9622cbcf5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py index 0402a0dbc..7c415c27d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py index a9b4eb0a8..4424b4a8d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py index 678346878..1d654d99f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py index 9c17a8795..e21f67f77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py index c90453d2b..7efb14873 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py index 261488dfb..a07baac4a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py index d6d1cd037..4e8924bab 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py index 30cca310f..689e741cc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py index 7bbe3c2d9..722567f3d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py index 5ee0892b2..a1d3c2850 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py index 0a8f20f47..05bcbceb1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -27,6 +27,8 @@ from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error, \ precondition_required, gone from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -83,7 +85,7 @@ class PackageModule(SchemaChildModule): blueprint = PackageModule(__name__) -class PackageView(PGChildNodeView): +class PackageView(PGChildNodeView, SchemaDiffObjectCompare): node_type = blueprint.node_type parent_ids = [ @@ -111,6 +113,8 @@ class PackageView(PGChildNodeView): 'dependent': [{'get': 'dependents'}] }) + keys_to_ignore = ['oid', 'schema', 'xmin'] + def check_precondition(action=None): """ This function will behave as a decorator which will checks @@ -297,16 +301,32 @@ class PackageView(PGChildNodeView): Returns: + """ + status, res = self._fetch_properties(scid, pkgid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, pkgid): + """ + This function is used to fetch the properties of specified object. + :param scid: + :param pkgid: + :return: """ SQL = render_template("/".join([self.template_path, 'properties.sql']), scid=scid, pkgid=pkgid) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone( + return False, gone( errormsg=_("Could not find the package in the database.") ) @@ -321,16 +341,13 @@ class PackageView(PGChildNodeView): status, rset1 = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=rset1) + return False, internal_server_error(errormsg=rset1) for row in rset1['rows']: priv = parse_priv_from_db(row) res['rows'][0].setdefault(row['deftype'], []).append(priv) - return ajax_response( - response=res['rows'][0], - status=200 - ) + return True, res['rows'][0] @check_precondition(action="create") def create(self, gid, sid, did, scid): @@ -396,7 +413,7 @@ class PackageView(PGChildNodeView): ) @check_precondition(action='delete') - def delete(self, gid, sid, did, scid, pkgid=None): + def delete(self, gid, sid, did, scid, pkgid=None, only_sql=False): """ This function will drop the object @@ -453,6 +470,9 @@ class PackageView(PGChildNodeView): data=res['rows'][0], cascade=cascade) + if only_sql: + return SQL + status, res = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=res) @@ -552,7 +572,8 @@ class PackageView(PGChildNodeView): status=200 ) - def getSQL(self, gid, sid, did, data, scid, pkgid=None, sqltab=False): + def getSQL(self, gid, sid, did, data, scid, pkgid=None, sqltab=False, + diff_schema=None): """ This function will generate sql from model data. @@ -621,6 +642,9 @@ class PackageView(PGChildNodeView): if arg not in data: data[arg] = old_data[arg] + if diff_schema: + data['schema'] = diff_schema + SQL = render_template("/".join([self.template_path, 'update.sql']), data=data, o_data=old_data, conn=self.conn) return SQL, data['name'] if 'name' in data else old_data['name'] @@ -635,7 +659,8 @@ class PackageView(PGChildNodeView): return SQL, data['name'] @check_precondition(action="sql") - def sql(self, gid, sid, did, scid, pkgid): + def sql(self, gid, sid, did, scid, pkgid, diff_schema=None, + json_resp=True): """ This function will generate sql for sql panel @@ -645,6 +670,8 @@ class PackageView(PGChildNodeView): did: Database ID scid: Schema ID pkgid: Package ID + diff_schema: Schema diff target schema name + json_resp: json response or plain text response """ try: SQL = render_template( @@ -676,13 +703,18 @@ class PackageView(PGChildNodeView): res['rows'][0].setdefault(row['deftype'], []).append(priv) result = res['rows'][0] - sql, name = self.getSQL(gid, sid, did, result, scid, pkgid, True) + sql, name = self.getSQL(gid, sid, did, result, scid, pkgid, True, + diff_schema) # Most probably this is due to error if not isinstance(sql, (str, unicode)): return sql sql = sql.strip('\n').strip(' ') + # Return sql for schema diff + if not json_resp: + return sql + sql_header = u"-- Package: {}\n\n-- ".format( self.qtIdent(self.conn, self.schema, result['name']) ) @@ -756,5 +788,54 @@ class PackageView(PGChildNodeView): return sql[start:end].strip("\n") + @check_precondition(action="fetch_objects_to_compare") + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the packages for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + if self.manager.server_type != 'ppas': + return res + + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + + return res + + def get_sql_from_diff(self, gid, sid, did, scid, oid, data=None, + diff_schema=None, drop_sql=False): + sql = '' + if data: + if diff_schema: + data['schema'] = diff_schema + status, sql = self.getSQL(gid, sid, did, data, scid, oid) + else: + if drop_sql: + sql = self.delete(gid=gid, sid=sid, did=did, + scid=scid, pkgid=oid, only_sql=True) + + elif diff_schema: + sql = self.sql(gid=gid, sid=sid, did=did, scid=scid, pkgid=oid, + diff_schema=diff_schema, json_resp=False) + else: + sql = self.sql(gid=gid, sid=sid, did=did, scid=scid, pkgid=oid, + json_resp=False) + return sql + +SchemaDiffRegistry(blueprint.node_type, PackageView) PackageView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py index 48ba5a938..f97994468 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -161,6 +161,8 @@ class EdbFuncView(PGChildNodeView, DataTypeReader): * dependencies(gid, sid, did, scid, pkgid, edbfnid): - Returns the dependencies for the Functions object. + * compare(**kwargs): + - This function will compare the nodes from two different schemas. """ node_type = blueprint.node_type @@ -184,7 +186,8 @@ class EdbFuncView(PGChildNodeView, DataTypeReader): 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}] + 'dependent': [{'get': 'dependents'}], + 'compare': [{'get': 'compare'}, {'get': 'compare'}] }) def check_precondition(f): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js index 7af9a12e2..6b9ed6484 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js index e9cc0ae8f..df791dca3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/__init__.py index 53f01ba67..0ddf14f90 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py index 87a6ed16d..c89daa646 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py index 37410aa11..e82660dde 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -137,6 +137,8 @@ class EdbVarView(PGChildNodeView, DataTypeReader): * sql(gid, sid, did, scid, pkgid, varid): - Returns the SQL for the Functions object. + * compare(**kwargs): + - This function will compare the nodes from two different schemas. """ node_type = blueprint.node_type @@ -158,7 +160,8 @@ class EdbVarView(PGChildNodeView, DataTypeReader): {'get': 'list'} ], 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], - 'sql': [{'get': 'sql'}] + 'sql': [{'get': 'sql'}], + 'compare': [{'get': 'compare'}, {'get': 'compare'}] }) def check_precondition(f): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js index 8e3fd02a1..8d38baedc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js index 5ead6f2be..b1cd08227 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/__init__.py index 1713dfc7f..f93e9cf6c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py index 2e55c29a3..6906d363b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py index 9df1c2b4a..5db7514d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py index de0ccdaca..9393d8776 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py index 27ba4d89b..3cd371c92 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py index 831bf944c..4aaac21cc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py index e92a40194..290a8c3c6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py index 7e10d989d..3dbe7422e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -24,6 +24,9 @@ from pgadmin.utils.ajax import make_json_response, internal_server_error, \ from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER from pgadmin.utils import IS_PY2 +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare + # If we are in Python3 if not IS_PY2: unicode = str @@ -88,7 +91,7 @@ class SequenceModule(SchemaChildModule): blueprint = SequenceModule(__name__) -class SequenceView(PGChildNodeView): +class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): node_type = blueprint.node_type parent_ids = [ @@ -273,6 +276,23 @@ class SequenceView(PGChildNodeView): Returns: """ + status, res = self._fetch_properties(scid, seid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, seid): + """ + This function is used to fetch the properties of the specified object. + :param scid: + :param seid: + :return: + """ + SQL = render_template( "/".join([self.template_path, 'properties.sql']), scid=scid, seid=seid @@ -280,10 +300,11 @@ class SequenceView(PGChildNodeView): status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone(_("Could not find the sequence in the database.")) + return False, gone( + _("Could not find the sequence in the database.")) for row in res['rows']: SQL = render_template( @@ -292,7 +313,7 @@ class SequenceView(PGChildNodeView): ) status, rset1 = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=rset1) + return False, internal_server_error(errormsg=rset1) row['current_value'] = rset1['rows'][0]['last_value'] row['minimum'] = rset1['rows'][0]['min_value'] @@ -319,7 +340,7 @@ class SequenceView(PGChildNodeView): ) status, dataclres = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) for row in dataclres['rows']: priv = parse_priv_from_db(row) @@ -328,10 +349,7 @@ class SequenceView(PGChildNodeView): else: res['rows'][0][row['deftype']] = [priv] - return ajax_response( - response=res['rows'][0], - status=200 - ) + return True, res['rows'][0] @check_precondition(action="create") def create(self, gid, sid, did, scid): @@ -869,5 +887,30 @@ class SequenceView(PGChildNodeView): status=200 ) + @check_precondition(action="fetch_objects_to_compare") + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the sequences for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + + return res + SequenceView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js index bcc8c088a..abe88aaa3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/__init__.py index 512b71da3..2f139058d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py index 7c1e8aaac..90891c83a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py index 294bc4d63..52652ffc5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py index f5cadd8d5..71b68de52 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py index 9120a8900..73260b6ba 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py index 1eeedd106..f121e6206 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py index ebf64ea2b..7eef8cbd0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js index 1052b5de6..f9c88489b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/child.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/child.js index e499053ff..429654d0d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/child.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/child.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ///////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js index 5b98d51b0..5f4be0e32 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema_child_tree_node.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema_child_tree_node.js index 658a0d99b..c3dd4fb1f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema_child_tree_node.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema_child_tree_node.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ///////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py index ce7e31c3c..145ccf69b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -24,6 +24,8 @@ from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER from pgadmin.utils import IS_PY2 +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -91,7 +93,7 @@ class SynonymModule(SchemaChildModule): blueprint = SynonymModule(__name__) -class SynonymView(PGChildNodeView): +class SynonymView(PGChildNodeView, SchemaDiffObjectCompare): """ This class is responsible for generating routes for Synonym node @@ -143,6 +145,10 @@ class SynonymView(PGChildNodeView): * dependent(gid, sid, did, scid): - This function will generate dependent list to show it in dependent pane for the selected Synonym node. + + * compare(**kwargs): + - This function will compare the synonyms nodes from two + different schemas. """ node_type = blueprint.node_type @@ -385,26 +391,36 @@ class SynonymView(PGChildNodeView): Returns: JSON of selected synonym node """ + status, res = self._fetch_properties(scid, syid) + if not status: + return res + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, syid): + """ + This function is used to fetch the properties of the specified object + :param scid: + :param syid: + :return: + """ try: SQL = render_template("/".join([self.template_path, 'properties.sql']), scid=scid, syid=syid) status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) - if len(res['rows']) > 0: - return ajax_response( - response=res['rows'][0], - status=200 - ) - else: - return gone( + if len(res['rows']) == 0: + return False, gone( gettext('The specified synonym could not be found.') ) + return True, res['rows'][0] except Exception as e: return internal_server_error(errormsg=str(e)) @@ -707,5 +723,33 @@ class SynonymView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the synonyms for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + if self.manager.server_type != 'ppas': + return res + + SQL = render_template("/".join([self.template_path, + 'properties.sql']), scid=scid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(scid, row['name']) + if status: + res[row['name']] = data + + return res + SynonymView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js index 2c301b0ec..0104ce753 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/__init__.py index f7426acd9..24a1790d5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py index 986435bec..644237f2b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py index 88d749aec..43501d2e0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py index e5b17469f..f07108321 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py index 60f565b35..579771fde 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py index df0ab0000..b6f7ddfc3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py index a62cd706e..ef273325b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py index f5368c36a..4337dc44a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -11,9 +11,11 @@ import simplejson as json import re +import copy +import random import pgadmin.browser.server_groups.servers.databases as database -from flask import render_template, request, jsonify, url_for +from flask import render_template, request, jsonify, url_for, current_app from flask_babelex import gettext from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule, DataTypeReader, VacuumSettings @@ -22,8 +24,15 @@ from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from .utils import BaseTableView from pgadmin.utils.preferences import Preferences +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.directory_compare import compare_dictionaries,\ + directory_diff +from pgadmin.tools.schema_diff.model import SchemaDiffModel +from pgadmin.utils.driver import get_driver +from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ constraints.foreign_key import utils as fkey_utils +from .schema_diff_utils import SchemaDiffTableCompare from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ columns import utils as column_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ @@ -132,7 +141,8 @@ class TableModule(SchemaChildModule): blueprint = TableModule(__name__) -class TableView(BaseTableView, DataTypeReader, VacuumSettings): +class TableView(BaseTableView, DataTypeReader, VacuumSettings, + SchemaDiffTableCompare): """ This class is responsible for generating routes for Table node @@ -229,6 +239,10 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): * delete_sql(gid, sid, did, scid, foid): - Returns sql for Script + + * compare(**kwargs): + - This function will compare the table nodes from two + different schemas. """ node_type = blueprint.node_type @@ -277,7 +291,8 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): 'insert_sql': [{'get': 'insert_sql'}], 'update_sql': [{'get': 'update_sql'}], 'delete_sql': [{'get': 'delete_sql'}], - 'count_rows': [{'get': 'count_rows'}] + 'count_rows': [{'get': 'count_rows'}], + 'compare': [{'get': 'compare'}, {'get': 'compare'}] }) @BaseTableView.check_precondition @@ -464,9 +479,9 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): - setting values """ - res = self.get_vacuum_table_settings(self.conn) + res = self.get_vacuum_table_settings(self.conn, sid) return ajax_response( - response=res['rows'], + response=res, status=200 ) @@ -480,9 +495,9 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): - setting values """ - res = self.get_vacuum_toast_settings(self.conn) + res = self.get_vacuum_toast_settings(self.conn, sid) return ajax_response( - response=res['rows'], + response=res, status=200 ) @@ -582,7 +597,22 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): Returns: JSON of selected table node """ + status, res = self._fetch_properties(did, scid, tid) + if not status: + return res + return super(TableView, self).properties( + gid, sid, did, scid, tid, res + ) + + def _fetch_properties(self, did, scid, tid): + """ + This function is used to fetch the properties of the specified object + :param did: + :param scid: + :param tid: + :return: + """ SQL = render_template( "/".join([self.table_template_path, 'properties.sql']), did=did, scid=scid, tid=tid, @@ -590,10 +620,11 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): ) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone(gettext("The specified table could not be found.")) + return False, gone( + gettext("The specified table could not be found.")) # We will check the threshold set by user before executing # the query because that can cause performance issues @@ -620,7 +651,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): status, count = self.conn.execute_scalar(SQL) if not status: - return internal_server_error(errormsg=count) + return False, internal_server_error(errormsg=count) res['rows'][0]['rows_cnt'] = count @@ -628,9 +659,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): elif not estimated_row_count: res['rows'][0]['rows_cnt'] = estimated_row_count - return super(TableView, self).properties( - gid, sid, did, scid, tid, res - ) + return True, res @BaseTableView.check_precondition def types(self, gid, sid, did, scid, tid=None, clid=None): @@ -1168,6 +1197,69 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): """ return BaseTableView.reset_statistics(self, scid, tid) + @BaseTableView.check_precondition + def get_sql_from_table_diff(self, **kwargs): + """ + This function will create sql on the basis the difference of 2 tables + """ + data = dict() + res = None + sid = kwargs['sid'] + did = kwargs['did'] + scid = kwargs['scid'] + tid = kwargs['tid'] + diff_data = kwargs['diff_data'] if 'diff_data' in kwargs else None + json_resp = kwargs['json_resp'] if 'json_resp' in kwargs else True + diff_schema = kwargs['diff_schema'] if 'diff_schema' in kwargs else\ + None + schema_diff_table = kwargs['schema_diff_table'] if\ + 'schema_diff_table' in kwargs else None + + if diff_data: + return self._fetch_sql(did, scid, tid, diff_data, json_resp) + else: + main_sql = [] + + SQL = render_template( + "/".join([self.table_template_path, 'properties.sql']), + did=did, scid=scid, tid=tid, + datlastsysoid=self.datlastsysoid + ) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) + + if len(res['rows']) == 0: + return gone(gettext("The specified table could not be found." + )) + + if status: + data = res['rows'][0] + + if diff_schema: + data['schema'] = diff_schema + + if schema_diff_table: + data['orig_name'] = data['name'] + data['name'] = 'schema_diff_temp_{0}'.format( + random.randint(1, 9999999)) + + sql, partition_sql = BaseTableView.get_reverse_engineered_sql( + self, did, scid, tid, main_sql, data, json_resp, + diff_partition_sql=True) + else: + sql, partition_sql = BaseTableView.get_reverse_engineered_sql( + self, did, scid, tid, main_sql, data, json_resp) + + if schema_diff_table: + # If partition tables have different partitions + sql += render_template( + "/".join([self.table_template_path, 'schema_diff.sql']), + conn=self.conn, data=data, partition_sql=partition_sql + ) + + return sql + @BaseTableView.check_precondition def msql(self, gid, sid, did, scid, tid=None): """ @@ -1181,7 +1273,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): tid: Table ID """ data = dict() - res = None + SQL = '' for k, v in request.args.items(): try: # comments should be taken as is because if user enters a @@ -1193,6 +1285,11 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): except (ValueError, TypeError, KeyError): data[k] = v + return self._fetch_sql(did, scid, tid, data) + + def _fetch_sql(self, did, scid, tid, data, json_resp=True): + res = None + if tid is not None: SQL = render_template( "/".join([self.table_template_path, 'properties.sql']), @@ -1201,13 +1298,18 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): ) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return internal_server_error(errormsg=SQL) SQL, name = self.get_sql(did, scid, tid, data, res) SQL = re.sub('\n{2,}', '\n\n', SQL) SQL = SQL.strip('\n') + + if not json_resp: + return SQL + if SQL == '': SQL = "--modified SQL" + return make_json_response( data=SQL, status=200 @@ -1419,7 +1521,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): return ajax_response(response=sql) @BaseTableView.check_precondition - def delete_sql(self, gid, sid, did, scid, tid): + def delete_sql(self, gid, sid, did, scid, tid, json_resp=True): """ DELETE script sql for the object @@ -1448,6 +1550,9 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): self.qtIdent(self.conn, data['schema'], data['name']) ) + if not json_resp: + return sql + return ajax_response(response=sql) @BaseTableView.check_precondition @@ -1502,5 +1607,60 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): data={'total_rows': count} ) + def get_delete_sql(self, res): + self.cmd = 'delete' + sql = super(TableView, self).get_delete_sql(res) + self.cmd = None + return sql + + @BaseTableView.check_precondition + def fetch_tables(self, sid, did, scid, tid=None, keys_to_remove=None): + """ + This function will fetch the list of all the tables + and will be used by schema diff. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :param tid: Table Id + :param keys_to_remove: Table columns to be removed from the dataset + :return: Table dataset + """ + if tid: + status, data = self._fetch_properties(did, scid, tid) + + if not status: + current_app.logger.error(data) + return False + + data = super(TableView, self).properties( + 0, sid, did, scid, tid, data, False + ) + self.remove_keys_for_comparision(data, keys_to_remove) + return data + + else: + res = dict() + SQL = render_template("/".join([self.table_template_path, + 'nodes.sql']), scid=scid) + status, tables = self.conn.execute_2darray(SQL) + if not status: + current_app.logger.error(tables) + return False + + for row in tables['rows']: + status, data = self._fetch_properties(did, scid, row['oid']) + + if status: + data = super(TableView, self).properties( + 0, sid, did, scid, row['oid'], data, False + ) + + self.remove_keys_for_comparision(data, keys_to_remove) + res[row['name']] = data + + return res + +SchemaDiffRegistry(blueprint.node_type, TableView) TableView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/base_partition_table.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/base_partition_table.py index d210b8672..5885a8c84 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/base_partition_table.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/base_partition_table.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py index 9891d00c4..3346af8d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -29,6 +29,7 @@ from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER from pgadmin.utils import IS_PY2 from pgadmin.utils.ajax import ColParamsJSONDecoder + # If we are in Python3 if not IS_PY2: unicode = str diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js index 6f8721b12..62086583d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/__init__.py index 8a99957e2..edeb01b23 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_add.py index e7094cb9f..756fb510c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_delete.py index aa03afd51..c70fba9d0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_delete_multiple.py index 07e27c651..b769e1218 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_get.py index 34e696934..200a88878 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py index ef832a340..6a6dd1ac9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_put.py index bfdcef2eb..8bb89b649 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py index 828076cab..27f9a4300 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/utils.py index 5b2aa4236..6593a7a0c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py index 08b0be68c..5e91569a5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -26,6 +26,10 @@ from pgadmin.browser.server_groups.servers.databases.schemas.utils \ from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER from pgadmin.utils import IS_PY2 +from pgadmin.utils.compile_template_name import compile_template_path +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare + # If we are in Python3 if not IS_PY2: unicode = str @@ -155,7 +159,7 @@ class CompoundTriggerModule(CollectionNodeModule): blueprint = CompoundTriggerModule(__name__) -class CompoundTriggerView(PGChildNodeView): +class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare): """ This class is responsible for generating routes for Compound Trigger node @@ -245,6 +249,10 @@ class CompoundTriggerView(PGChildNodeView): 'enable': [{'put': 'enable_disable_trigger'}] }) + # Schema Diff: Keys to ignore while comparing + keys_to_ignore = ['oid', 'xmin', 'nspname', 'tfunction', + 'tgrelid', 'tgfoid'] + def check_precondition(f): """ This function will behave as a decorator which will checks @@ -267,6 +275,12 @@ class CompoundTriggerView(PGChildNodeView): ]['datlastsysoid'] if self.manager.db_info is not None and \ kwargs['did'] in self.manager.db_info else 0 + self.table_template_path = compile_template_path( + 'tables/sql', + self.manager.server_type, + self.manager.version + ) + # we will set template path for sql scripts self.template_path = 'compound_triggers/sql/{0}/#{1}#'.format( self.manager.server_type, self.manager.version) @@ -417,6 +431,18 @@ class CompoundTriggerView(PGChildNodeView): JSON of selected compound trigger node """ + data = self._fetch_properties(tid, trid) + + if not status: + return data + + return ajax_response( + response=data, + status=200 + ) + + def _fetch_properties(self, tid, trid): + SQL = render_template("/".join([self.template_path, 'properties.sql']), tid=tid, trid=trid, @@ -440,10 +466,7 @@ class CompoundTriggerView(PGChildNodeView): data = trigger_definition(data) - return ajax_response( - response=data, - status=200 - ) + return True, data @check_precondition def create(self, gid, sid, did, scid, tid): @@ -519,7 +542,7 @@ class CompoundTriggerView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, trid=None): + def delete(self, gid, sid, did, scid, tid, trid=None, only_sql=False): """ This function will updates existing the compound trigger object @@ -579,6 +602,9 @@ class CompoundTriggerView(PGChildNodeView): conn=self.conn, cascade=cascade ) + if only_sql: + return SQL + status, res = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=res) @@ -846,5 +872,109 @@ class CompoundTriggerView(PGChildNodeView): status=200 ) + @check_precondition + def get_sql_from_diff(self, gid, sid, did, scid, tid, oid, + data=None, diff_schema=None, drop_sql=False): + if data: + sql, name = self.get_sql(scid, tid, oid, data) + if not isinstance(sql, (str, unicode)): + return sql + sql = sql.strip('\n').strip(' ') + else: + if drop_sql: + SQL = self.delete(gid=gid, sid=sid, did=did, + scid=scid, tid=tid, + trid=oid, only_sql=True) + else: + SQL = render_template("/".join([self.template_path, + 'properties.sql']), + tid=tid, trid=oid, + datlastsysoid=self.datlastsysoid) + + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) + if len(res['rows']) == 0: + return gone(gettext("""Could not find the compound + trigger in the table.""")) + + data = dict(res['rows'][0]) + # Adding parent into data dict, + # will be using it while creating sql + data['schema'] = self.schema + data['table'] = self.table + + if len(data['tgattr']) >= 1: + columns = ', '.join(data['tgattr'].split(' ')) + data['columns'] = self._column_details(tid, columns) + + data = self._trigger_definition(data) + + if diff_schema: + data['schema'] = diff_schema + + SQL, name = self.get_sql(scid, tid, None, data) + + sql_header = u"-- Compound Trigger: {0}\n\n-- ".format( + data['name']) + + sql_header += render_template("/".join([self.template_path, + 'delete.sql']), + data=data, conn=self.conn) + + SQL = sql_header + '\n\n' + SQL.strip('\n') + + # If compound trigger is disbaled then add sql + # code for the same + if not data['is_enable_trigger']: + SQL += '\n\n' + SQL += render_template("/".join([ + self.template_path, + 'enable_disable_trigger.sql']), + data=data, conn=self.conn) + + return SQL + + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid, tid, oid=None, + ignore_keys=False): + """ + This function will fetch the list of all the triggers for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :param tid: Table Id + :return: + """ + res = dict() + + if oid: + status, data = self._fetch_properties(tid, oid) + if not status: + current_app.logger.error(data) + return False + res = data + else: + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), tid=tid) + status, triggers = self.conn.execute_2darray(SQL) + if not status: + current_app.logger.error(triggers) + return False + + for row in triggers['rows']: + status, data = self._fetch_properties(tid, row['oid']) + if status: + if ignore_keys: + for key in self.keys_to_ignore: + if key in data: + del data[key] + res[row['name']] = data + + return res + +SchemaDiffRegistry(blueprint.node_type, CompoundTriggerView, 'table') CompoundTriggerView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js index f9fac6d7a..1d7efeb45 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/__init__.py index 1bf2bca6a..e9206708f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py index 2fafcfdba..ed0b4bf87 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py index 0e874eb50..e55698566 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py index 1fd6b90d6..d7019224b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py index 90135bb5f..296f99757 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/utils.py index dacdf2ecd..483d172d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py index ea1984920..70117528f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py index 3205bb58c..ebc96454a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py index 484e7dcce..5af6da7e5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js index 8ddcb8ba2..fed717ac2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/__init__.py index 1fe3f0b85..3dcb7b892 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_add.py index b9d0e70c8..15473d725 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_delete.py index 90cedf5d1..ffc861522 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_get.py index a2c6721bb..fa2878ca9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_put.py index 8ebe5f4e9..adaa015ec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py index 1ec26a290..6172ea64d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/utils.py index c1f274a14..ca6b9ef93 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py index 96045bac1..8362cdb04 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js index 1e1381a27..db1286f88 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/__init__.py index 7af45b1b5..168bc2e9b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_add.py index a521b49c5..d69d1e5bd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_delete.py index dca48e036..20cd7f71d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_get.py index 62b9f59cc..d775eb3b1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_put.py index 924d64088..d875a85c2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/test_exclusion_constraint_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/utils.py index 9dbf2fb23..96a996220 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py index 1db68c81b..0f38889cc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py index 6a3d70afe..e4a74a93a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js index 2e75562f9..12a940e34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/__init__.py index d94f8603b..1775bd8ff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_add.py index b3eef6ea9..835616053 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_delete.py index 63260043a..56e9cf432 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_get.py index 8ee86d889..780413683 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_put.py index b887323b8..5b392cd8a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py index 836b3bc00..852dedfc5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/utils.py index b1cd2829c..546865055 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py index 2984a58e4..3e32d1be1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js index a7dd27d22..ee0206d99 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js index c2baa4059..fbec7b8fc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/__init__.py index 42009ac95..60555f4b3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_add.py index 3cd6b3b86..7b076cad0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_delete.py index 7eea5e9bb..030922e6b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_get.py index c08c2acb3..8ddf5079e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_put.py index 87289a620..74939a418 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py index d175de5c6..0122e1d10 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py index 1360a16ce..04237d645 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -152,7 +152,8 @@ def get_index_constraint_sql(conn, did, tid, data, template_path=None): modified_sql, name = get_sql(conn, c, did, tid, ctype, c['oid']) - sql.append(modified_sql.strip('\n')) + if modified_sql: + sql.append(modified_sql.strip('\n')) if 'added' in constraint: for c in constraint['added']: @@ -183,6 +184,7 @@ def get_sql(conn, data, did, tid, ctype, cid=None, template_path=None): :return: """ name = data['name'] if 'name' in data else None + sql = None if cid is not None: sql = render_template("/".join([template_path, 'properties.sql']), did=did, tid=tid, cid=cid, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js index 9239085ee..7634f7a92 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/tests/__init__.py index 057fd5112..fd23f6786 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/type.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/type.py index e6357dcd3..83625f7ee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/type.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/type.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py index be868d7b6..6a896e079 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -13,7 +13,7 @@ import simplejson as json from functools import wraps import pgadmin.browser.server_groups.servers.databases as database -from flask import render_template, request, jsonify +from flask import render_template, request, jsonify, current_app from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ @@ -25,8 +25,14 @@ from pgadmin.utils.compile_template_name import compile_template_path from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER from pgadmin.utils import IS_PY2 +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.directory_compare import compare_dictionaries,\ + directory_diff +from pgadmin.tools.schema_diff.model import SchemaDiffModel +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare from pgadmin.browser.server_groups.servers.databases.schemas. \ tables.indexes import utils as index_utils + # If we are in Python3 if not IS_PY2: unicode = str @@ -135,7 +141,7 @@ class IndexesModule(CollectionNodeModule): blueprint = IndexesModule(__name__) -class IndexesView(PGChildNodeView): +class IndexesView(PGChildNodeView, SchemaDiffObjectCompare): """ This class is responsible for generating routes for Index node @@ -227,6 +233,11 @@ class IndexesView(PGChildNodeView): {'get': 'get_op_class'}] }) + # Schema Diff: Keys to ignore while comparing + keys_to_ignore = ['oid', 'relowner', 'schema', + 'indrelid', 'nspname' + ] + def check_precondition(f): """ This function will behave as a decorator which will checks @@ -248,6 +259,12 @@ class IndexesView(PGChildNodeView): ]['datlastsysoid'] if self.manager.db_info is not None and \ kwargs['did'] in self.manager.db_info else 0 + self.table_template_path = compile_template_path( + 'tables/sql', + self.manager.server_type, + self.manager.version + ) + # we will set template path for sql scripts self.template_path = compile_template_path( 'indexes/sql/', @@ -485,19 +502,35 @@ class IndexesView(PGChildNodeView): Returns: JSON of selected schema node """ + status, data = self._fetch_properties(did, tid, idx) + if not status: + return data + return ajax_response( + response=data, + status=200 + ) + + def _fetch_properties(self, did, tid, idx): + """ + This function is used to fetch the properties of specified object. + :param did: + :param tid: + :param idx: + :return: + """ SQL = render_template( "/".join([self.template_path, 'properties.sql']), did=did, tid=tid, idx=idx, datlastsysoid=self.datlastsysoid ) status, res = self.conn.execute_dict(SQL) - if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone(gettext("""Could not find the index in the table.""")) + return False, gone( + gettext("""Could not find the index in the table.""")) # Making copy of output for future use data = dict(res['rows'][0]) @@ -509,10 +542,7 @@ class IndexesView(PGChildNodeView): if self.manager.version >= 110000: data = index_utils.get_include_details(self.conn, idx, data) - return ajax_response( - response=data, - status=200 - ) + return True, data @check_precondition def create(self, gid, sid, did, scid, tid): @@ -620,7 +650,8 @@ class IndexesView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, idx=None): + def delete(self, gid, sid, did, scid, tid, idx=None, + only_sql=False): """ This function will updates existing the schema object @@ -676,6 +707,9 @@ class IndexesView(PGChildNodeView): "/".join([self.template_path, 'delete.sql']), data=data, conn=self.conn, cascade=cascade ) + + if only_sql: + return SQL status, res = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=res) @@ -792,6 +826,32 @@ class IndexesView(PGChildNodeView): return ajax_response(response=SQL) + @check_precondition + def get_sql_from_index_diff(self, sid, did, scid, tid, idx, data=None, + diff_schema=None, drop_req=False): + + tmp_idx = idx + schema = '' + if data: + schema = self.schema + elif diff_schema: + schema = diff_schema + + sql = index_utils.get_reverse_engineered_sql( + self.conn, schema, + self.table, did, tid, idx, + self.datlastsysoid, + template_path=None, with_header=False) + + drop_sql = '' + if drop_req: + drop_sql = '\n' + render_template( + "/".join([self.template_path, 'delete.sql']), + data=data, conn=self.conn + ) + + return drop_sql + '\n\n' + sql + @check_precondition def dependents(self, gid, sid, did, scid, tid, idx): """ @@ -914,5 +974,129 @@ class IndexesView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid, tid, oid=None, + ignore_keys=False): + """ + This function will fetch the list of all the indexes for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + + res = dict() + + if not oid: + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), tid=tid) + status, indexes = self.conn.execute_2darray(SQL) + if not status: + current_app.logger.error(indexes) + return False + + for row in indexes['rows']: + status, data = self._fetch_properties(did, tid, + row['oid']) + if status: + if ignore_keys: + for key in self.keys_to_ignore: + if key in data: + del data[key] + res[row['name']] = data + else: + status, data = self._fetch_properties(did, tid, + oid) + if not status: + current_app.logger.error(data) + return False + res = data + + return res + + def ddl_compare(self, **kwargs): + """ + This function will compare index properties and + return the difference of SQL + """ + + src_sid = kwargs.get('source_sid') + src_did = kwargs.get('source_did') + src_scid = kwargs.get('source_scid') + src_tid = kwargs.get('source_tid') + src_oid = kwargs.get('source_oid') + tar_sid = kwargs.get('target_sid') + tar_did = kwargs.get('target_did') + tar_scid = kwargs.get('target_scid') + tar_tid = kwargs.get('target_tid') + tar_oid = kwargs.get('target_oid') + comp_status = kwargs.get('comp_status') + + source = '' + target = '' + diff = '' + + status, target_schema = self.get_schema(tar_sid, + tar_did, + tar_scid + ) + if not status: + return internal_server_error(errormsg=target_schema) + + if comp_status == SchemaDiffModel.COMPARISON_STATUS['source_only']: + diff = self.get_sql_from_index_diff(sid=src_sid, + did=src_did, scid=src_scid, + tid=src_tid, idx=src_oid, + diff_schema=target_schema) + + elif comp_status == SchemaDiffModel.COMPARISON_STATUS['target_only']: + diff = self.delete(gid=1, sid=tar_sid, did=tar_did, + scid=tar_scid, tid=tar_tid, + idx=tar_oid, only_sql=True) + + else: + source = self.fetch_objects_to_compare(sid=src_sid, did=src_did, + scid=src_scid, tid=src_tid, + oid=src_oid) + target = self.fetch_objects_to_compare(sid=tar_sid, did=tar_did, + scid=tar_scid, tid=tar_tid, + oid=tar_oid) + + if not (source or target): + return None + + diff_dict = directory_diff( + source, target, ignore_keys=self.keys_to_ignore, + difference={} + ) + + required_create_keys = ['columns'] + create_req = False + + for key in required_create_keys: + if key in diff_dict: + create_req = True + + if create_req: + diff = self.get_sql_from_index_diff(sid=src_sid, + did=src_did, + scid=src_scid, + tid=src_tid, + idx=src_oid, + diff_schema=target_schema, + drop_req=True) + else: + diff = self.get_sql_from_index_diff(sid=tar_sid, + did=tar_did, + scid=tar_scid, + tid=tar_tid, + idx=tar_oid, + data=diff_dict) + + return diff + +SchemaDiffRegistry(blueprint.node_type, IndexesView, 'table') IndexesView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js index 186b73e7d..df2a7184a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/__init__.py index 953d0f7f7..e7025ce7c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_add.py index 328e67302..9fef4b67a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete.py index 29ea46912..35652a7ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete_multiple.py index b5855983a..22e6f9f87 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_get.py index 5a5cf4169..b03647283 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_put.py index 2c807ee16..5fdaea24d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py index 2ba5a3aeb..9c853c9b9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py index ab49ab8e9..eb9001f0a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -26,7 +26,7 @@ def get_template_path(f): def wrap(*args, **kwargs): # Here args[0] will hold the connection object conn_obj = args[0] - if 'template_path' not in kwargs: + if 'template_path' not in kwargs or kwargs['template_path'] is None: kwargs['template_path'] = \ 'indexes/sql/#{0}#'.format(conn_obj.manager.version) @@ -229,7 +229,7 @@ def get_sql(conn, data, did, tid, idx, datlastsysoid, @get_template_path def get_reverse_engineered_sql(conn, schema, table, did, tid, idx, datlastsysoid, - template_path=None): + template_path=None, with_header=True): """ This function will return reverse engineered sql for specified trigger. @@ -240,6 +240,8 @@ def get_reverse_engineered_sql(conn, schema, table, did, tid, idx, :param idx: Index ID :param datlastsysoid: :param template_path: Optional template path + :param with_header: Optional parameter to decide whether the SQL will be + returned with header or not :return: """ SQL = render_template("/".join([template_path, 'properties.sql']), @@ -267,11 +269,12 @@ def get_reverse_engineered_sql(conn, schema, table, did, tid, idx, SQL, name = get_sql(conn, data, did, tid, None, datlastsysoid) - sql_header = u"-- Index: {0}\n\n-- ".format(data['name']) + if with_header: + sql_header = u"-- Index: {0}\n\n-- ".format(data['name']) - sql_header += render_template("/".join([template_path, 'delete.sql']), - data=data, conn=conn) + sql_header += render_template("/".join([template_path, 'delete.sql']), + data=data, conn=conn) - SQL = sql_header + '\n\n' + SQL + SQL = sql_header + '\n\n' + SQL return SQL diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py index f32b878cf..2794bbf09 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -24,6 +24,11 @@ from pgadmin.browser.collection import CollectionNodeModule from pgadmin.utils.ajax import make_json_response, precondition_required from config import PG_DEFAULT_DRIVER from pgadmin.browser.utils import PGChildModule +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.directory_compare import compare_dictionaries,\ + directory_diff +from pgadmin.tools.schema_diff.model import SchemaDiffModel +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare def backend_supported(module, manager, **kwargs): @@ -152,7 +157,8 @@ class PartitionsModule(CollectionNodeModule): blueprint = PartitionsModule(__name__) -class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings): +class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings, + SchemaDiffObjectCompare): """ This class is responsible for generating routes for Partition node @@ -200,27 +206,56 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings): }) - def get_children_nodes(self, manager, **kwargs): - nodes = [] - # treat partition table as normal table. - # replace tid with ptid and pop ptid from kwargs - if 'ptid' in kwargs: - ptid = kwargs.pop('ptid') - kwargs['tid'] = ptid + # Schema Diff: Keys to ignore while comparing + keys_to_ignore = ['oid', 'schema', 'vacuum_table', + 'vacuum_toast', 'edit_types'] + + def children(self, **kwargs): + """Build a list of treeview nodes from the child nodes.""" + + if 'sid' not in kwargs: + return precondition_required( + gettext('Required properties are missing.') + ) + + from pgadmin.utils.driver import get_driver + manager = get_driver(PG_DEFAULT_DRIVER).connection_manager( + sid=kwargs['sid'] + ) + + did = None + if 'did' in kwargs: + did = kwargs['did'] + + conn = manager.connection(did=did) + + if not conn.connected(): + return precondition_required( + gettext( + "Connection to the server has been lost." + ) + ) + nodes = [] for module in self.blueprint.submodules: if isinstance(module, PGChildModule): if manager is not None and \ module.BackendSupported(manager, **kwargs): + # treat partition table as normal table. + # replace tid with ptid and pop ptid from kwargs + if 'ptid' in kwargs: + ptid = kwargs.pop('ptid') + kwargs['tid'] = ptid nodes.extend(module.get_nodes(**kwargs)) else: nodes.extend(module.get_nodes(**kwargs)) - if manager is not None and \ - self.blueprint.BackendSupported(manager, **kwargs): - nodes.extend(self.blueprint.get_nodes(**kwargs)) - - return nodes + # Return sorted nodes based on label + return make_json_response( + data=sorted( + nodes, key=lambda c: c['label'] + ) + ) @BaseTableView.check_precondition def list(self, gid, sid, did, scid, tid): @@ -270,7 +305,7 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings): """ SQL = render_template( "/".join([self.partition_template_path, 'nodes.sql']), - scid=scid, tid=tid, ptid=ptid + scid=scid, tid=tid ) status, rset = self.conn.execute_2darray(SQL) if not status: @@ -342,6 +377,63 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings): return super(PartitionsView, self).properties( gid, sid, did, scid, ptid, res) + @BaseTableView.check_precondition + def fetch_objects_to_compare(self, sid, did, scid, tid, ptid=None): + """ + This function will fetch the list of all the tables for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :param tid: Table Id + :param ptif: Partition table Id + :return: + """ + res = {} + + if ptid: + SQL = render_template("/".join([self.partition_template_path, + 'properties.sql']), + did=did, scid=scid, tid=tid, + ptid=ptid, datlastsysoid=self.datlastsysoid) + status, result = self.conn.execute_dict(SQL) + if not status: + current_app.logger.error(result) + return False + + res = super(PartitionsView, self).properties( + 0, sid, did, scid, ptid, result) + + else: + SQL = render_template( + "/".join([self.partition_template_path, 'nodes.sql']), + scid=scid, tid=tid + ) + status, partitions = self.conn.execute_2darray(SQL) + if not status: + current_app.logger.error(partitions) + return False + + for row in partitions['rows']: + SQL = render_template("/".join([self.partition_template_path, + 'properties.sql']), + did=did, scid=scid, tid=tid, + ptid=row['oid'], + datlastsysoid=self.datlastsysoid) + status, result = self.conn.execute_dict(SQL) + + if not status: + current_app.logger.error(result) + return False + + data = super(PartitionsView, self).properties( + 0, sid, did, scid, row['oid'], result, False + ) + res[row['name']] = data + + return res + @BaseTableView.check_precondition def sql(self, gid, sid, did, scid, tid, ptid): """ @@ -375,6 +467,62 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings): return BaseTableView.get_reverse_engineered_sql(self, did, scid, ptid, main_sql, data) + @BaseTableView.check_precondition + def get_sql_from_diff(self, **kwargs): + """ + This function will create sql on the basis the difference of 2 tables + """ + data = dict() + res = None + sid = kwargs['sid'] + did = kwargs['did'] + scid = kwargs['scid'] + tid = kwargs['tid'] + ptid = kwargs['ptid'] + diff_data = kwargs['diff_data'] if 'diff_data' in kwargs else None + json_resp = kwargs['json_resp'] if 'json_resp' in kwargs else True + diff_schema = kwargs['diff_schema'] if 'diff_schema' in kwargs else\ + None + + if diff_data: + SQL = render_template("/".join([self.partition_template_path, + 'properties.sql']), + did=did, scid=scid, tid=tid, + ptid=ptid, datlastsysoid=self.datlastsysoid) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) + + SQL, name = self.get_sql(did, scid, ptid, diff_data, res) + SQL = re.sub('\n{2,}', '\n\n', SQL) + SQL = SQL.strip('\n') + return SQL + else: + main_sql = [] + + SQL = render_template("/".join([self.partition_template_path, + 'properties.sql']), + did=did, scid=scid, tid=tid, + ptid=ptid, datlastsysoid=self.datlastsysoid) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) + + if len(res['rows']) == 0: + return gone(gettext( + "The specified partitioned table could not be found.")) + + data = res['rows'][0] + + if diff_schema: + data['schema'] = diff_schema + data['parent_schema'] = diff_schema + + return BaseTableView.get_reverse_engineered_sql(self, did, + scid, ptid, + main_sql, data, + False) + @BaseTableView.check_precondition def detach(self, gid, sid, did, scid, tid, ptid): """ @@ -576,7 +724,7 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings): return internal_server_error(errormsg=str(e)) @BaseTableView.check_precondition - def delete(self, gid, sid, did, scid, tid, ptid=None): + def delete(self, gid, sid, did, scid, tid, ptid=None, only_sql=False): """ This function will delete the table object @@ -631,5 +779,61 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings): except Exception as e: return internal_server_error(errormsg=str(e)) + def ddl_compare(self, **kwargs): + """ + This function will compare index properties and + return the difference of SQL + """ + + src_sid = kwargs.get('source_sid') + src_did = kwargs.get('source_did') + src_scid = kwargs.get('source_scid') + src_tid = kwargs.get('source_tid') + src_oid = kwargs.get('source_oid') + tar_sid = kwargs.get('target_sid') + tar_did = kwargs.get('target_did') + tar_scid = kwargs.get('target_scid') + tar_tid = kwargs.get('target_tid') + tar_oid = kwargs.get('target_oid') + comp_status = kwargs.get('comp_status') + + source = '' + target = '' + diff = '' + + status, target_schema = self.get_schema_for_schema_diff(tar_sid, + tar_did, + tar_scid + ) + if not status: + return internal_server_error(errormsg=target_schema) + + if comp_status == SchemaDiffModel.COMPARISON_STATUS['source_only']: + diff = self.get_sql_from_diff(sid=src_sid, + did=src_did, scid=src_scid, + tid=src_tid, ptid=src_oid, + diff_schema=target_schema) + + elif comp_status == SchemaDiffModel.COMPARISON_STATUS['target_only']: + SQL = render_template("/".join([self.partition_template_path, + 'properties.sql']), + did=did, scid=scid, tid=tid, + ptid=ptid, datlastsysoid=self.datlastsysoid) + status, res = self.conn.execute_dict(SQL) + + SQL = render_template( + "/".join([self.table_template_path, 'properties.sql']), + did=tar_did, scid=tar_scid, tid=tar_oid, + datlastsysoid=self.datlastsysoid + ) + status, res = self.conn.execute_dict(SQL) + if status: + self.cmd = 'delete' + diff = super(PartitionsView, self).get_delete_sql(res) + self.cmd = None + + return diff + +SchemaDiffRegistry(blueprint.node_type, PartitionsView, 'table') PartitionsView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js index 04a693ead..a10b39768 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// @@ -49,7 +49,8 @@ function( sqlCreateHelp: 'sql-createtable.html', dialogHelp: url_for('help.static', {'filename': 'table_dialog.html'}), hasScriptTypes: ['create'], - width: '650px', + height: '95%', + width: '85%', Init: function() { /* Avoid mulitple registration of menus */ if (this.initialized) @@ -864,7 +865,7 @@ function( canEdit: false, canDelete: true, customDeleteTitle: gettext('Detach Partition'), customDeleteMsg: gettext('Are you sure you wish to detach this partition?'), - columns:['is_attach', 'partition_name', 'is_default', 'values_from', 'values_to', 'values_in', 'values_modulus', 'values_remainder'], + columns:['is_attach', 'partition_name', 'values_from', 'values_to', 'values_in'], control: Backform.SubNodeCollectionControl.extend({ row: Backgrid.PartitionRow, initialize: function() { @@ -929,30 +930,10 @@ function( },{ id: 'partition_note', label: gettext('Partition'), type: 'note', group: 'partition', - text: [ - '
  • ', - '', gettext('Create a table: '), '', - gettext('User can create multiple partitions while creating new partitioned table. Operation switch is disabled in this scenario.'), - '
  • ', - '', gettext('Edit existing table: '), '', - gettext('User can create/attach/detach multiple partitions. In attach operation user can select table from the list of suitable tables to be attached.'), - '
  • ', - '', gettext('Default: '), '', - gettext('The default partition can store rows that do not fall into any existing partition’s range or list.'), - '
  • ', - '', gettext('From/To/In input: '), '', - gettext('From/To/In input: Values for these fields must be quoted with single quote. For more than one partition key values must be comma(,) separated.'), - '
  • ', - '', gettext('Example: From/To: '), '', - gettext('Enabled for range partition. Consider partitioned table with multiple keys of type Integer, then values should be specified like \'100\',\'200\'.'), - '
  • ', - '', gettext('In: '), '', - gettext('Enabled for list partition. Values must be comma(,) separated and quoted with single quote.'), - '
  • ', - '', gettext('Modulus/Remainder: '), '', - gettext('Enabled for hash partition.'), - '
', - ].join(''), + text: gettext('The control above is used to Create/Attach/Detach partitions.
' + + '
  • Create Mode: User will be able to create N number of partitions. Mode switch control is disabled in this scenario.
  • ' + + '
  • Edit Mode: User will be able to create/attach/detach N number of partitions. ' + + 'In attach mode there will be list of suitable tables to be attached.
'), visible: function(m) { if(!_.isUndefined(m.node_info) && !_.isUndefined(m.node_info.server) && !_.isUndefined(m.node_info.server.version) && diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py index bf92e5f01..d0a3b98ee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py index 5e2d5af89..2b9f476f3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -13,7 +13,8 @@ import simplejson as json from functools import wraps import pgadmin.browser.server_groups.servers.databases.schemas as schemas -from flask import render_template, make_response, request, jsonify +from flask import render_template, make_response, request, jsonify,\ + current_app from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ @@ -23,7 +24,11 @@ from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER +from pgadmin.utils.compile_template_name import compile_template_path from pgadmin.utils import IS_PY2 +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare + # If we are in Python3 if not IS_PY2: unicode = str @@ -134,7 +139,7 @@ class RuleModule(CollectionNodeModule): blueprint = RuleModule(__name__) -class RuleView(PGChildNodeView): +class RuleView(PGChildNodeView, SchemaDiffObjectCompare): """ This is a class for rule node which inherits the properties and methods from PGChildNodeView class and define @@ -178,6 +183,9 @@ class RuleView(PGChildNodeView): 'configs': [{'get': 'configs'}] }) + # Schema Diff: Keys to ignore while comparing + keys_to_ignore = ['oid', 'schema', 'definition'] + def check_precondition(f): """ This function will behave as a decorator which will check the @@ -197,6 +205,12 @@ class RuleView(PGChildNodeView): ]['datlastsysoid'] if self.manager.db_info is not None and \ kwargs['did'] in self.manager.db_info else 0 self.template_path = 'rules/sql' + self.table_template_path = compile_template_path( + 'tables/sql', + self.manager.server_type, + self.manager.version + ) + return f(*args, **kwargs) return wrap @@ -278,6 +292,21 @@ class RuleView(PGChildNodeView): """ Fetch the properties of an individual rule and render in properties tab + """ + status, data = self._fetch_properties(rid) + if not status: + return data + + return ajax_response( + response=data, + status=200 + ) + + def _fetch_properties(self, rid): + """ + This function is used to fetch the properties of the specified object + :param rid: + :return: """ SQL = render_template("/".join( [self.template_path, 'properties.sql'] @@ -285,15 +314,13 @@ class RuleView(PGChildNodeView): status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone(gettext("""Could not find the rule in the table.""")) + return False, gone( + gettext("""Could not find the rule in the table.""")) - return ajax_response( - response=parse_rule_definition(res), - status=200 - ) + return True, parse_rule_definition(res) @check_precondition def create(self, gid, sid, did, scid, tid): @@ -369,7 +396,7 @@ class RuleView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, rid=None): + def delete(self, gid, sid, did, scid, tid, rid=None, only_sql=False): """ This function will drop a rule object """ @@ -412,6 +439,8 @@ class RuleView(PGChildNodeView): nspname=rset['nspname'], cascade=cascade ) + if only_sql: + return SQL status, res = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=res) @@ -489,6 +518,44 @@ class RuleView(PGChildNodeView): [self.template_path, 'create.sql']), data=data) return SQL, data['name'] if 'name' in data else old_data['name'] + @check_precondition + def get_sql_from_diff(self, gid, sid, did, scid, tid, oid, data=None, + diff_schema=None, drop_sql=False): + + if drop_sql: + SQL = self.delete(gid=gid, sid=sid, did=did, + scid=scid, tid=tid, + rid=oid, only_sql=True) + else: + SQL = render_template("/".join( + [self.template_path, 'properties.sql']), rid=oid) + status, res = self.conn.execute_dict(SQL) + if not status: + return internal_server_error(errormsg=res) + if len(res['rows']) == 0: + return gone( + gettext("""Could not find the rule in the table.""") + ) + res_data = parse_rule_definition(res) + + SQL = '' + + if data: + old_data = res_data + SQL = render_template( + "/".join([self.template_path, 'update.sql']), + data=data, o_data=old_data + ) + else: + if diff_schema: + res_data['schema'] = diff_schema + + SQL = render_template("/".join( + [self.template_path, 'create.sql']), + data=res_data, display_comments=True) + + return SQL + @check_precondition def dependents(self, gid, sid, did, scid, tid, rid): """ @@ -527,5 +594,47 @@ class RuleView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid, tid, oid=None, + ignore_keys=False): + """ + This function will fetch the list of all the rules for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :param tid: Table Id + :return: + """ + + res = {} + if oid: + status, data = self._fetch_properties(oid) + if not status: + current_app.logger.error(data) + return False + + res = data + else: + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), + tid=tid) + status, rules = self.conn.execute_2darray(SQL) + if not status: + current_app.logger.error(rules) + return False + + for row in rules['rows']: + status, data = self._fetch_properties(row['oid']) + if status: + if ignore_keys: + for key in self.keys_to_ignore: + if key in data: + del data[key] + res[row['name']] = data + return res + +SchemaDiffRegistry(blueprint.node_type, RuleView, 'table') RuleView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js index 4cc65297a..624b98806 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/__init__.py index 27cd89067..f4e2ae26a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py index 0ae6f857d..1918f0751 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py index adcf8f339..4f7d570e9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py index db58cb514..fad6ea7a0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py index 1a03dab2f..067c67a7f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py index db4c426e1..867354aa3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py index 322756afb..c521987ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py new file mode 100644 index 000000000..7a9cff6fa --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py @@ -0,0 +1,507 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2019, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +""" Implements Utility class for Table and Partitioned Table. """ + +import copy + +from flask import render_template +from pgadmin.utils.driver import get_driver +from config import PG_DEFAULT_DRIVER +from pgadmin.tools.schema_diff.directory_compare import compare_dictionaries,\ + directory_diff +from pgadmin.tools.schema_diff.model import SchemaDiffModel +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry + + +class SchemaDiffTableCompare(SchemaDiffObjectCompare): + + keys_to_ignore = ['oid', 'schema', 'vacuum_table', + 'vacuum_toast', 'edit_types', 'attnum', 'col_type', + 'references', 'reltuples', 'rows_cnt'] + + keys_to_ignore_ddl_comp = ['oid', + 'schema', + 'columns', + 'edit_types', + 'primary_key', + 'exclude_constraint', + 'check_constraint', + 'foreign_key', + 'reltuples', + 'rows_cnt' + ] + + keys_to_remove = { + 'columns': ['relname', 'nspname', 'parent_tbl', 'attrelid', 'adrelid'], + 'primary_key': ['oid'], + 'unique_constraint': ['oid'], + 'check_constraint': ['oid', 'nspname'], + 'foreign_key': ['oid', 'fknsp', 'confrelid'], + 'exclude_constraint': ['oid'], + 'partitions': ['oid'], + } + + keys_to_remove_ddl_comp = { + 'columns': ['relname', 'nspname', 'parent_tbl', 'attrelid', 'adrelid'], + 'check_constraint': ['nspname'], + 'foreign_key': ['fknsp', 'confrelid'] + } + + def compare(self, **kwargs): + """ + This function is used to compare all the table objects + from two different schemas. + + :return: Comparison Dictionary + """ + src_sid = kwargs.get('source_sid') + src_did = kwargs.get('source_did') + src_scid = kwargs.get('source_scid') + tar_sid = kwargs.get('target_sid') + tar_did = kwargs.get('target_did') + tar_scid = kwargs.get('target_scid') + sub_modules = ['index', 'rule', 'trigger'] + + source_tables = self.fetch_tables(sid=src_sid, did=src_did, + scid=src_scid) + + target_tables = self.fetch_tables(sid=tar_sid, did=tar_did, + scid=tar_scid) + + if self.manager.version >= 120000: + sub_modules.append('compound_trigger') + + # If both the dict have no items then return None. + if not (source_tables or target_tables) or ( + len(source_tables) <= 0 and len(target_tables) <= 0): + return None + + src_server_type, tar_server_type = self.get_server_type(src_sid, + tar_sid) + for module in sub_modules: + + module_view = SchemaDiffRegistry.get_node_view( + module) + + # Get sub module data for source tables + if module_view.blueprint.server_type is None or \ + src_server_type in module_view.blueprint.server_type: + for key, val in source_tables.items(): + source = module_view.fetch_objects_to_compare( + sid=src_sid, + did=src_did, + scid=src_scid, + tid=val['oid'], + oid=None, + ignore_keys=True + ) + source_tables[key][module] = source + + # Get sub module data for target tables + if module_view.blueprint.server_type is None or \ + tar_server_type in module_view.blueprint.server_type: + for key, val in target_tables.items(): + target = module_view.fetch_objects_to_compare( + sid=tar_sid, + did=tar_did, + scid=tar_scid, + tid=val['oid'], + oid=None, + ignore_keys=True + ) + target_tables[key][module] = target + + return compare_dictionaries(source_tables, target_tables, + self.node_type, + self.blueprint.COLLECTION_LABEL, + self.keys_to_ignore) + + @staticmethod + def get_server_type(src_id, tar_id): + """Get server types of source and target servers.""" + driver = get_driver(PG_DEFAULT_DRIVER) + src_manager = driver.connection_manager(src_id) + tar_manager = driver.connection_manager(tar_id) + + return src_manager.server_type, tar_manager.server_type + + def ddl_compare(self, **kwargs): + """ + This function will compare properties of 2 tables and + return the source DDL, target DDL and Difference of them. + """ + + src_sid = kwargs.get('source_sid') + src_did = kwargs.get('source_did') + src_scid = kwargs.get('source_scid') + src_oid = kwargs.get('source_oid') + tar_sid = kwargs.get('target_sid') + tar_did = kwargs.get('target_did') + tar_scid = kwargs.get('target_scid') + tar_oid = kwargs.get('target_oid') + comp_status = kwargs.get('comp_status') + generate_script = False + + if 'generate_script' in kwargs and kwargs['generate_script']: + generate_script = True + + source = '' + target = '' + diff = '' + ignore_sub_modules = ['column', 'constraints'] + + src_server_type, tar_server_type = self.get_server_type(src_sid, + tar_sid) + + status, target_schema = self.get_schema(tar_sid, + tar_did, + tar_scid + ) + + if not status: + return internal_server_error(errormsg=target_schema) + + if comp_status == SchemaDiffModel.COMPARISON_STATUS['source_only']: + if not generate_script: + source = self.get_sql_from_table_diff(sid=src_sid, + did=src_did, + scid=src_scid, + tid=src_oid, + json_resp=False) + diff = self.get_sql_from_table_diff(sid=src_sid, did=src_did, + scid=src_scid, tid=src_oid, + diff_schema=target_schema, + json_resp=False) + + elif comp_status == SchemaDiffModel.COMPARISON_STATUS['target_only']: + if not generate_script: + target = self.get_sql_from_table_diff(sid=tar_sid, + did=tar_did, + scid=tar_scid, + tid=tar_oid, + json_resp=False) + SQL = render_template( + "/".join([self.table_template_path, 'properties.sql']), + did=tar_did, scid=tar_scid, tid=tar_oid, + datlastsysoid=self.datlastsysoid + ) + status, res = self.conn.execute_dict(SQL) + + if status: + diff = self.get_delete_sql(res) + + elif comp_status == SchemaDiffModel.COMPARISON_STATUS['different']: + source = self.fetch_tables( + sid=src_sid, did=src_did, + scid=src_scid, tid=src_oid, + keys_to_remove=self.keys_to_remove_ddl_comp + ) + target = self.fetch_tables( + sid=tar_sid, did=tar_did, + scid=tar_scid, tid=tar_oid, + keys_to_remove=self.keys_to_remove_ddl_comp + ) + + if self.manager.version < 100000: + ignore_sub_modules.append('partition') + + if self.manager.version < 120000: + ignore_sub_modules.append('compound_trigger') + + # In case of error return None + if not (source or target): + return None + + diff_dict = directory_diff( + source, target, ignore_keys=self.keys_to_ignore_ddl_comp, + difference={} + ) + + # Column comparison + col_diff = self.table_col_ddl_comp(source, target) + diff_dict.update(col_diff) + + # Constraint comparison + pk_diff = self.constraint_ddl_comp(source, target) + diff_dict.update(pk_diff) + + diff_dict['relacl'] = self.parce_acl(source, target) + + if not generate_script: + source = self.get_sql_from_table_diff(sid=src_sid, + did=src_did, + scid=src_scid, + tid=src_oid, + json_resp=False) + target = self.get_sql_from_table_diff(sid=tar_sid, + did=tar_did, + scid=tar_scid, + tid=tar_oid, + json_resp=False) + diff = self.get_sql_from_table_diff(sid=tar_sid, did=tar_did, + scid=tar_scid, tid=tar_oid, + diff_data=diff_dict, + json_resp=False) + + for module in self.blueprint.submodules: + if module.NODE_TYPE not in ignore_sub_modules: + module_view = SchemaDiffRegistry.get_node_view( + module.NODE_TYPE) + + if module_view.blueprint.server_type and ( + src_server_type not in + module_view.blueprint.server_type and + tar_server_type not in + module_view.blueprint.server_type + ): + continue + + if module_view.blueprint.server_type and ( + (src_server_type in + module_view.blueprint.server_type and + tar_server_type not in + module_view.blueprint.server_type) or ( + src_server_type not in + module_view.blueprint.server_type and + tar_server_type in + module_view.blueprint.server_type) + ): + continue + + result = module_view.compare( + source_sid=src_sid, source_did=src_did, + source_scid=src_scid, source_tid=src_oid, + target_sid=tar_sid, target_did=tar_did, + target_scid=tar_scid, target_tid=tar_oid + ) + if result and module.NODE_TYPE != 'partition': + child_diff = '' + for res in result: + if res['status'] == \ + SchemaDiffModel.COMPARISON_STATUS[ + 'different']: + source_oid = res['source_oid'] + target_oid = res['target_oid'] + else: + source_oid = res['oid'] + target_oid = res['oid'] + + if res['status'] != \ + SchemaDiffModel.COMPARISON_STATUS[ + 'identical']: + child_diff = module_view.ddl_compare( + source_sid=src_sid, source_did=src_did, + source_scid=src_scid, + source_oid=source_oid, + source_tid=src_oid, target_sid=tar_sid, + target_did=tar_did, target_scid=tar_scid, + target_tid=tar_oid, target_oid=target_oid, + comp_status=res['status'] + + ) + if child_diff: + diff += child_diff + elif result: + # For partition module + identical = False + source_only = False + target_only = False + different = False + for res in result: + if res['status'] == \ + SchemaDiffModel.COMPARISON_STATUS[ + 'identical']: + identical = True + elif res['status'] == \ + SchemaDiffModel.COMPARISON_STATUS[ + 'source_only']: + source_only = True + elif res['status'] == \ + SchemaDiffModel.COMPARISON_STATUS[ + 'target_only']: + target_only = True + else: + different = True + + if identical: + pass + elif (source_only or target_only) and not different: + for res in result: + source_oid = res['oid'] + target_oid = res['oid'] + + child_diff = module_view.ddl_compare( + source_sid=src_sid, source_did=src_did, + source_scid=src_scid, + source_oid=source_oid, + source_tid=src_oid, target_sid=tar_sid, + target_did=tar_did, target_scid=tar_scid, + target_tid=tar_oid, target_oid=target_oid, + comp_status=res['status'] + + ) + if ddl_compare: + diff += child_diff + else: + diff = self.get_sql_from_table_diff( + sid=src_sid, + did=src_did, + scid=src_scid, + tid=src_oid, + diff_schema=target_schema, + json_resp=False, + schema_diff_table=True + ) + else: + source = self.get_sql_from_table_diff(sid=src_sid, did=src_did, + scid=src_scid, tid=src_oid, + json_resp=False) + target = self.get_sql_from_table_diff(sid=tar_sid, did=tar_did, + scid=tar_scid, tid=tar_oid, + json_resp=False) + + return {'source_ddl': source, + 'target_ddl': target, + 'diff_ddl': diff + } + + @staticmethod + def table_col_ddl_comp(source, target): + """ + Table Column comparison + :param source: Source columns + :param target: Target columns + :return: Difference of the columns + """ + source_cols = source['columns'] + target_cols = copy.deepcopy(target['columns']) + added = [] + updated = [] + different = {'columns': {}} + + for source in source_cols: + if 'name' in source: + if type(target_cols) is list and len( + target_cols) > 0: + tmp = None + for item in target_cols: + if item['name'] == source['name']: + tmp = copy.deepcopy(item) + if tmp and source != tmp: + tmp_updated = copy.deepcopy(source) + # Preserve the column number + tmp_updated['attnum'] = tmp['attnum'] + if item['typname'] not in tmp_updated['edit_types']: + tmp_updated['col_type_conversion'] = False + updated.append(tmp_updated) + target_cols.remove(tmp) + elif tmp and source == tmp: + target_cols.remove(tmp) + elif tmp is None: + added.append(source) + else: + added.append(source) + different['columns']['added'] = added + different['columns']['changed'] = updated + + if target_cols and len(target_cols) > 0: + different['columns']['deleted'] = target_cols + + return different + + @staticmethod + def constraint_ddl_comp(source_table, target_table): + """ + Table Constraint DDL comparison + :param source: Source Table + :param target: Target Table + :return: Difference of constraints + """ + different = {} + non_editable_keys = {} + + non_editable_keys = {'primary_key': ['col_count', + 'condeferrable', + 'condeffered', + 'columns'], + 'check_constraint': ['consrc'], + 'exclude_constraint': ['amname', + 'indconstraint', + 'columns'] + } + + for constraint in ['primary_key', 'check_constraint', + 'exclude_constraint']: + source_cols = source_table[constraint] if \ + constraint in source_table else [] + target_cols = copy.deepcopy(target_table[constraint]) if\ + constraint in target_table else [] + added = [] + updated = [] + deleted = [] + + different[constraint] = {} + for source in source_cols: + if 'name' in source: + if type(target_cols) is list and len( + target_cols) > 0: + tmp_src = copy.deepcopy(source) + tmp_src.pop('oid') + tmp_tar = None + tmp = None + for item in target_cols: + if item['name'] == source['name']: + tmp_tar = copy.deepcopy(item) + tmp = copy.deepcopy(item) + tmp_tar.pop('oid') + if tmp_tar and tmp_src != tmp_tar: + tmp_updated = copy.deepcopy(source) + for key in non_editable_keys[constraint]: + if key in tmp_updated and \ + tmp_updated[key] != tmp_tar[key]: + added.append(source) + deleted.append(tmp_updated) + tmp_updated = None + break + if tmp_updated: + tmp_updated['oid'] = tmp_tar['oid'] + updated.append(tmp_updated) + target_cols.remove(tmp) + elif tmp_tar and tmp_src == tmp_tar: + target_cols.remove(tmp) + elif tmp_tar is None: + added.append(source) + else: + added.append(source) + different[constraint]['added'] = added + different[constraint]['changed'] = updated + different[constraint]['deleted'] = deleted + + if target_cols and len(target_cols) > 0: + different[constraint]['deleted'] = target_cols + + return different + + def remove_keys_for_comparision(self, data, keys=None): + """ + This function is used to remove specific keys from data + """ + + keys_to_remove = keys if keys else self.keys_to_remove + + for p_key, p_val in keys_to_remove.items(): + if p_key in data and data[p_key] is not None \ + and len(data[p_key]) > 0: + for item in data[p_key]: + # Remove keys that should not be the part of comparision. + for key in p_val: + if key in item: + item.pop(key) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/enable_disable_triggers.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/enable_disable_triggers.js index 1abce8a77..ddf296ad0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/enable_disable_triggers.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/enable_disable_triggers.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js index 49a47e2ec..54c29619e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/show_advanced_tab.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/show_advanced_tab.js index a5e807ea9..b4f466343 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/show_advanced_tab.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/show_advanced_tab.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js index 8fd203e41..61cefdc15 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// @@ -349,11 +349,23 @@ define('pgadmin.node.table', [ return (!(d && d.label.match(/pg_global/))); }, deps: ['is_partitioned'], - disabled: function() { + disabled: function(m) { if(this.node_info && 'catalog' in this.node_info) { return true; } + if(!_.isUndefined(m.node_info) && !_.isUndefined(m.node_info.server) + && !_.isUndefined(m.node_info.server.version) && + m.node_info.server.version >= 120000 && + m.get('is_partitioned')) { + + setTimeout( function() { + m.set('spcname', undefined); + }, 10); + + return true; + } + return false; }, },{ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/create.sql index 36eb7ff8e..c189a7488 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/create.sql @@ -21,7 +21,7 @@ CACHE {{data.seqcache|int}} {% endif %} {% endif %}{% endif %}; {### Add comments ###} -{% if data and data.description %} +{% if data and data.description and data.description != None %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, data.name)}} IS {{data.description|qtLiteral}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql index 4b943defb..4e8b982fd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql @@ -10,8 +10,14 @@ ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} {% endif %} {### Alter column type and collation ###} {% if (data.cltype and data.cltype != o_data.cltype) or (data.attlen is defined and data.attlen != o_data.attlen) or (data.attprecision is defined and data.attprecision != o_data.attprecision) or (data.collspcname and data.collspcname != o_data.collspcname)%} -ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname %} +{% if data.col_type_conversion is defined and data.col_type_conversion == False %} +-- WARNING: +-- The SQL statement below would normally be used to alter the datatype for the {{o_data.name}} column, however, +-- the current datatype cannot be cast to the target datatype so this conversion cannot be made automatically. + +{% endif %} +{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} +{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %} ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname %} COLLATE {{data.collspcname}}{% elif o_data.collspcname %} COLLATE {{o_data.collspcname}}{% endif %}; {% endif %} {### Alter column default value ###} @@ -95,7 +101,7 @@ COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, o_data.name)}} {% endif %} {### Update column variables ###} -{% if 'attoptions' in data and data.attoptions|length > 0 %} +{% if 'attoptions' in data and data.attoptions and data.attoptions|length > 0 %} {% set variables = data.attoptions %} {% if 'deleted' in variables and variables.deleted|length > 0 %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/create.sql index 71de43658..19e26f2c2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/create.sql @@ -21,7 +21,7 @@ CACHE {{data.seqcache|int}} {% endif %} {% endif %}{% endif %}{% if data.colconstype == 'g' and data.genexpr and data.genexpr != '' %} GENERATED ALWAYS AS ({{data.genexpr}}) STORED{% endif %}; {### Add comments ###} -{% if data and data.description %} +{% if data and data.description and data.description != None %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, data.name)}} IS {{data.description|qtLiteral}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/update.sql index d27734401..dfb7555c1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/update.sql @@ -6,6 +6,12 @@ {% if data.name and data.name != o_data.name %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} RENAME {{conn|qtIdent(o_data.name)}} TO {{conn|qtIdent(data.name)}}; +{% endif %} +{% if data.col_type_conversion is defined and data.col_type_conversion == False %} +-- WARNING: +-- The SQL statement below would normally be used to alter the datatype for the {{o_data.name}} column, however, +-- the current datatype cannot be cast to the target datatype so this conversion cannot be made automatically. + {% endif %} {### Alter column type and collation ###} {% if (data.cltype and data.cltype != o_data.cltype) or (data.attlen is defined and data.attlen != o_data.attlen) or (data.attprecision is defined and data.attprecision != o_data.attprecision) or (data.collspcname and data.collspcname != o_data.collspcname)%} @@ -45,7 +51,7 @@ PLAIN{% elif data.attstorage == 'm'%}MAIN{% elif data.attstorage == 'e'%} EXTERNAL{% elif data.attstorage == 'x'%}EXTENDED{% endif %}; {% endif %} -{% if data.description is defined %} +{% if data.description is defined and data.description != None %} {% if data.name %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, data.name)}} {% else %} @@ -55,7 +61,7 @@ COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, o_data.name)}} {% endif %} {### Update column variables ###} -{% if 'attoptions' in data and data.attoptions|length > 0 %} +{% if 'attoptions' in data and data.attoptions != None and data.attoptions|length > 0 %} {% set variables = data.attoptions %} {% if 'deleted' in variables and variables.deleted|length > 0 %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql index affd88906..ed7f5f1c6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql @@ -12,7 +12,7 @@ ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} {% endif %} {### Add comments ###} -{% if data and data.description %} +{% if data and data.description and data.description != None %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, data.name)}} IS {{data.description|qtLiteral}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql index ac0afe8d1..3c6ae0a91 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql @@ -9,9 +9,15 @@ ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} {% endif %} {### Alter column type and collation ###} -{% if (data.cltype and data.cltype != o_data.cltype) or (data.attlen is defined and data.attlen != o_data.attlen) or (data.attprecision is defined and data.attprecision != o_data.attprecision) or (data.collspcname and data.collspcname != o_data.collspcname) %} -ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname %} +{% if (data.cltype and data.cltype != o_data.cltype) or (data.attlen is defined and data.attlen != o_data.attlen) or (data.attprecision is defined and data.attprecision != o_data.attprecision) or (data.collspcname and data.collspcname != o_data.collspcname)%} +{% if data.col_type_conversion is defined and data.col_type_conversion == False %} +-- WARNING: +-- The SQL statement below would normally be used to alter the datatype for the XXX column, however, +-- the current datatype cannot be cast to the target datatype so this conversion cannot be made automatically. + +{% endif %} +{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} +{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %} ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname %} COLLATE {{data.collspcname}}{% elif o_data.collspcname %} COLLATE {{o_data.collspcname}}{% endif %}; {% endif %} {### Alter column default value ###} @@ -46,7 +52,7 @@ PLAIN{% elif data.attstorage == 'm'%}MAIN{% elif data.attstorage == 'e'%} EXTERNAL{% elif data.attstorage == 'x'%}EXTENDED{% endif %}; {% endif %} -{% if data.description is defined %} +{% if data.description is defined and data.description != None %} {% if data.name %} COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, data.name)}} {% else %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py index 818921616..bc4f35f0c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/create.sql index 6db5452b5..01f9bfbab 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/create.sql @@ -3,6 +3,7 @@ {#====== MAIN TABLE TEMPLATE STARTS HERE ======#} {#===========================================#} {### CREATE TABLE STATEMENT FOR partitions ###} + CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE {{conn|qtIdent(data.schema, data.name)}}{% if data.relispartition is defined and data.relispartition %} PARTITION OF {{conn|qtIdent(data.parent_schema, data.partitioned_table_name)}}{% endif %} {# Macro to render for constraints #} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/schema_diff.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/schema_diff.sql new file mode 100644 index 000000000..ebd4ae6e5 --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/schema_diff.sql @@ -0,0 +1,14 @@ + + +INSERT INTO {{conn|qtIdent(data.schema, data.name)}}( +{% if data.columns and data.columns|length > 0 %} +{% for c in data.columns %}{{c.name}}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}) +SELECT {% if data.columns and data.columns|length > 0 %}{% for c in data.columns %}{{c.name}}{% if not loop.last %},{% endif %}{% endfor %}{% endif %} + FROM {{conn|qtIdent(data.schema, data.orig_name)}}; + +DROP TABLE {{conn|qtIdent(data.schema, data.orig_name)}}; + +{{partition_sql}} + +ALTER TABLE {{conn|qtIdent(data.schema, data.name)}} + RENAME TO {{conn|qtIdent(data.orig_name)}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql index c52861b0c..7abe52ab6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql @@ -75,7 +75,7 @@ CACHE {{c.seqcache|int}} {% endif %} {% if data.like_relation or data.coll_inherits or data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} ){% endif %}{% if data.relkind is defined and data.relkind == 'p' %} PARTITION BY {{ data.partition_scheme }} {% endif %} -{% if not data.coll_inherits and not data.spcname and not with_clause %};{% endif %} +{% if not data.coll_inherits and (not data.spcname or (data.spcname and data.is_partitioned)) and not with_clause %};{% endif %} {### If we are inheriting it from another table(s) ###} {% if data.coll_inherits %} @@ -103,11 +103,11 @@ WITH ( toast.{{opt.name}} = {{opt.value}}{% endif %} {% endfor %}{% endif %} -{% if data.spcname %}){% else %});{% endif %} +{% if data.spcname and not data.is_partitioned %}){% else %});{% endif %} {% endif %} {### SQL for Tablespace ###} -{% if data.spcname %} +{% if data.spcname and not data.is_partitioned %} TABLESPACE {{ conn|qtIdent(data.spcname) }}; {% endif %} {### Alter SQL for Owner ###} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql index e7d19055d..b0d48c61a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql @@ -1,5 +1,5 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS relacl_str, - (CASE WHEN length(spc.spcname) > 0 OR rel.relkind = 'p' THEN spc.spcname ELSE + (CASE WHEN length(spc.spcname) > 0 THEN spc.spcname ELSE (SELECT sp.spcname FROM pg_database dtb JOIN pg_tablespace sp ON dtb.dattablespace=sp.oid WHERE dtb.oid = {{ did }}::oid) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/__init__.py index 31869e18b..76566640c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_base_partition_table.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_base_partition_table.py index 062a03777..dae4ba23a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_base_partition_table.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_base_partition_table.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py index 2500261dc..efb1986e4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py index 2a26a61ce..1c5877861 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_properties_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_properties_sql.py index d820ba625..8da8f12e4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_properties_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_properties_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py index 06d96448d..599eaec77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -170,10 +170,6 @@ class TableAddTestCase(BaseTestGenerator): self.table_name = "test_table_add_%s" % (str(uuid.uuid4())[1:8]) # Get the common data data = tables_utils.get_table_common_data() - if self.server_information and \ - 'server_version' in self.server_information and \ - self.server_information['server_version'] >= 120000: - data['spcname'] = None data.update({ "name": self.table_name, "relowner": db_user, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py index 9ebdcac1b..c702b2943 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py index f3adfb155..4189744e3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py index 14a80cd76..e34f9747b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py index bbed26998..428bd1e56 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py index 74e23868b..3d02ad24c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py index fbea605cf..f35235912 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py index 7c0ffb5e1..9ef0e76ff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py index fd0c55f78..fc349bd3c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py index 54338fd8f..ef9fda32d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py index 925418d28..083acef74 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_nodes_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_nodes_sql.py index 600da47e5..fef6e667b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_nodes_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_nodes_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py index 96985d016..5ac6f7b25 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py index 5a0b3826f..148e15cfe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index 2c5b87423..0344fcbd0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -13,7 +13,7 @@ import simplejson as json from functools import wraps import pgadmin.browser.server_groups.servers.databases as database -from flask import render_template, request, jsonify +from flask import render_template, request, jsonify, current_app from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView @@ -25,7 +25,11 @@ from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import trigger_definition from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER +from pgadmin.utils.compile_template_name import compile_template_path from pgadmin.utils import IS_PY2 +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare + # If we are in Python3 if not IS_PY2: unicode = str @@ -151,7 +155,7 @@ class TriggerModule(CollectionNodeModule): blueprint = TriggerModule(__name__) -class TriggerView(PGChildNodeView): +class TriggerView(PGChildNodeView, SchemaDiffObjectCompare): """ This class is responsible for generating routes for Trigger node @@ -244,6 +248,10 @@ class TriggerView(PGChildNodeView): 'enable': [{'put': 'enable_disable_trigger'}] }) + # Schema Diff: Keys to ignore while comparing + keys_to_ignore = ['oid', 'xmin', 'nspname', 'tfunction', + 'tgrelid', 'tgfoid', 'prosrc'] + def check_precondition(f): """ This function will behave as a decorator which will checks @@ -267,6 +275,11 @@ class TriggerView(PGChildNodeView): kwargs['did'] in self.manager.db_info else 0 # we will set template path for sql scripts + self.table_template_path = compile_template_path( + 'tables/sql', + self.manager.server_type, + self.manager.version + ) self.template_path = 'triggers/sql/{0}/#{1}#'.format( self.manager.server_type, self.manager.version) # Store server type @@ -450,7 +463,22 @@ class TriggerView(PGChildNodeView): Returns: JSON of selected trigger node """ + status, data = self._fetch_properties(tid, trid) + if not status: + return data + + return ajax_response( + response=data, + status=200 + ) + def _fetch_properties(self, tid, trid): + """ + This function is used to fetch the properties of the specified object + :param tid: + :param trid: + :return: + """ SQL = render_template("/".join([self.template_path, 'properties.sql']), tid=tid, trid=trid, @@ -459,10 +487,10 @@ class TriggerView(PGChildNodeView): status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone( + return False, gone( gettext("""Could not find the trigger in the table.""")) # Making copy of output for future use @@ -472,10 +500,7 @@ class TriggerView(PGChildNodeView): data = trigger_definition(data) - return ajax_response( - response=data, - status=200 - ) + return True, data @check_precondition def create(self, gid, sid, did, scid, tid): @@ -552,7 +577,7 @@ class TriggerView(PGChildNodeView): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, trid=None): + def delete(self, gid, sid, did, scid, tid, trid=None, only_sql=False): """ This function will updates existing the trigger object @@ -610,6 +635,8 @@ class TriggerView(PGChildNodeView): conn=self.conn, cascade=cascade ) + if only_sql: + return SQL status, res = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=res) @@ -761,6 +788,36 @@ class TriggerView(PGChildNodeView): return ajax_response(response=SQL) + @check_precondition + def get_sql_from_diff(self, gid, sid, did, scid, tid, oid, + data=None, diff_schema=None, drop_sql=False): + if data: + SQL, name = trigger_utils.get_sql( + self.conn, data, tid, oid, + self.datlastsysoid, + self.blueprint.show_system_objects) + + if not isinstance(SQL, (str, unicode)): + return SQL + SQL = SQL.strip('\n').strip(' ') + else: + if drop_sql: + SQL = self.delete(gid=gid, sid=sid, did=did, + scid=scid, tid=tid, trid=oid, + only_sql=True) + else: + schema = self.schema + if diff_schema: + schema = diff_schema + SQL = trigger_utils.get_reverse_engineered_sql( + self.conn, schema, + self.table, tid, oid, + self.datlastsysoid, + self.blueprint.show_system_objects, + template_path=None, with_header=False) + + return SQL + @check_precondition def enable_disable_trigger(self, gid, sid, did, scid, tid, trid): """ @@ -875,5 +932,46 @@ class TriggerView(PGChildNodeView): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid, tid, oid=None, + ignore_keys=False): + """ + This function will fetch the list of all the triggers for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :param tid: Table Id + :return: + """ + res = dict() + + if oid: + status, data = self._fetch_properties(tid, oid) + if not status: + current_app.logger.error(data) + return False + res = data + else: + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), tid=tid) + status, triggers = self.conn.execute_2darray(SQL) + if not status: + current_app.logger.error(triggers) + return False + + for row in triggers['rows']: + status, data = self._fetch_properties(tid, row['oid']) + if status: + if ignore_keys: + for key in self.keys_to_ignore: + if key in data: + del data[key] + res[row['name']] = data + + return res + +SchemaDiffRegistry(blueprint.node_type, TriggerView, 'table') TriggerView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js index 4885baeda..c390a8350 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/__init__.py index ac92ff100..7fb714a3d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py index f9b0ce9ce..3cd8f7475 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py index 56c83a34e..3fa01025b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py index 921579fa3..17232862b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py index 733073a25..af7a71b27 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py index 0a75b2a0d..fbcd02b65 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py index c1723cab2..44f0bdc53 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py index 53d59c080..221f48d52 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -30,7 +30,7 @@ def get_template_path(f): def wrap(*args, **kwargs): # Here args[0] will hold the connection object conn_obj = args[0] - if 'template_path' not in kwargs: + if 'template_path' not in kwargs or kwargs['template_path'] is None: kwargs['template_path'] = 'triggers/sql/{0}/#{1}#'.format( conn_obj.manager.server_type, conn_obj.manager.version) @@ -201,7 +201,7 @@ def get_sql(conn, data, tid, trid, datlastsysoid, @get_template_path def get_reverse_engineered_sql(conn, schema, table, tid, trid, datlastsysoid, show_system_objects, - template_path=None): + template_path=None, with_header=True): """ This function will return reverse engineered sql for specified trigger. @@ -213,6 +213,8 @@ def get_reverse_engineered_sql(conn, schema, table, tid, trid, :param datlastsysoid: :param show_system_objects: Show System Object value True or False :param template_path: Optional template path + :param with_header: Optional parameter to decide whether the SQL will be + returned with header or not :return: """ SQL = render_template("/".join([template_path, 'properties.sql']), @@ -240,12 +242,15 @@ def get_reverse_engineered_sql(conn, schema, table, tid, trid, SQL, name = get_sql(conn, data, tid, None, datlastsysoid, show_system_objects) - sql_header = u"-- Trigger: {0}\n\n-- ".format(data['name']) + if with_header: + sql_header = u"-- Trigger: {0}\n\n-- ".format(data['name']) - sql_header += render_template("/".join([template_path, 'delete.sql']), - data=data, conn=conn) + sql_header += render_template("/".join([template_path, 'delete.sql']), + data=data, conn=conn) - SQL = sql_header + '\n\n' + SQL.strip('\n') + SQL = sql_header + '\n\n' + SQL.strip('\n') + else: + SQL = SQL.strip('\n') # If trigger is disabled then add sql code for the same if data['is_enable_trigger'] != 'O': diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py index 8c9bd7b9f..3247d2fc7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -10,6 +10,7 @@ """ Implements Utility class for Table and Partitioned Table. """ import re +import copy from functools import wraps import simplejson as json from flask import render_template, jsonify, request @@ -179,8 +180,10 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): data[row['deftype']] = [priv] # We will add Auto vacuum defaults with out result for grid - data['vacuum_table'] = self.parse_vacuum_data(self.conn, data, 'table') - data['vacuum_toast'] = self.parse_vacuum_data(self.conn, data, 'toast') + data['vacuum_table'] = copy.deepcopy( + self.parse_vacuum_data(self.conn, data, 'table')) + data['vacuum_toast'] = copy.deepcopy( + self.parse_vacuum_data(self.conn, data, 'toast')) # Fetch columns for the table logic # @@ -405,7 +408,8 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): status=200 ) - def get_reverse_engineered_sql(self, did, scid, tid, main_sql, data): + def get_reverse_engineered_sql(self, did, scid, tid, main_sql, data, + json_resp=True, diff_partition_sql=False): """ This function will creates reverse engineered sql for the table object @@ -416,6 +420,9 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): tid: Table ID main_sql: List contains all the reversed engineered sql data: Table's Data + json_resp: Json response or plain SQL + diff_partition_sql: In Schema diff, the Partition sql should be + return separately to perform further task """ """ ##################################### @@ -427,6 +434,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): schema = data['schema'] table = data['name'] is_partitioned = 'is_partitioned' in data and data['is_partitioned'] + sql_header = '' data = self._formatter(did, scid, tid, data) @@ -444,18 +452,20 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): c['cltype'], c['hasSqrBracket'] = \ column_utils.type_formatter(c['cltype']) - sql_header = u"-- Table: {0}\n\n-- ".format( - self.qtIdent(self.conn, data['schema'], data['name'])) + if json_resp: + sql_header = u"-- Table: {0}\n\n-- ".format( + self.qtIdent(self.conn, data['schema'], data['name'])) - sql_header += render_template("/".join([self.table_template_path, - 'delete.sql']), - data=data, conn=self.conn) + sql_header += render_template("/".join([self.table_template_path, + 'delete.sql']), + data=data, conn=self.conn) - sql_header = sql_header.strip('\n') - sql_header += '\n' + sql_header = sql_header.strip('\n') + sql_header += '\n' - # Add into main sql - main_sql.append(sql_header) + # Add into main sql + main_sql.append(sql_header) + partition_main_sql = "" # Parse privilege data if 'relacl' in data: @@ -493,12 +503,14 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): for row in rset['rows']: index_sql = index_utils.get_reverse_engineered_sql( self.conn, schema, table, did, tid, row['oid'], - self.datlastsysoid) + self.datlastsysoid, + template_path=None, with_header=json_resp) index_sql = u"\n" + index_sql # Add into main sql index_sql = re.sub('\n{2,}', '\n\n', index_sql) - main_sql.append(index_sql) + + main_sql.append(index_sql.strip('\n')) """ ######################################## @@ -514,7 +526,8 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): for row in rset['rows']: trigger_sql = trigger_utils.get_reverse_engineered_sql( self.conn, schema, table, tid, row['oid'], - self.datlastsysoid, self.blueprint.show_system_objects) + self.datlastsysoid, self.blueprint.show_system_objects, + template_path=None, with_header=json_resp) trigger_sql = u"\n" + trigger_sql # Add into main sql @@ -571,10 +584,13 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): if not status: return internal_server_error(errormsg=res) + display_comments = True + if not json_resp: + display_comments = False res_data = parse_rule_definition(res) rules_sql += render_template("/".join( [self.rules_template_path, 'create.sql']), - data=res_data, display_comments=True) + data=res_data, display_comments=display_comments) # Add into main sql rules_sql = re.sub('\n{2,}', '\n\n', rules_sql) @@ -594,13 +610,17 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): return internal_server_error(errormsg=rset) if len(rset['rows']): - sql_header = u"\n-- Partitions SQL" + if json_resp: + sql_header = u"\n-- Partitions SQL" partition_sql = '' for row in rset['rows']: part_data = dict() - part_data['partitioned_table_name'] = table - part_data['parent_schema'] = schema - part_data['schema'] = row['schema_name'] + part_data['partitioned_table_name'] = data['name'] + part_data['parent_schema'] = data['schema'] + if not json_resp: + part_data['schema'] = data['schema'] + else: + part_data['schema'] = row['schema_name'] part_data['relispartition'] = True part_data['name'] = row['name'] part_data['partition_value'] = row['partition_value'] @@ -612,13 +632,18 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): data=part_data, conn=self.conn) # Add into main sql - partition_sql = re.sub('\n{2,}', '\n\n', partition_sql) - main_sql.append( - sql_header + '\n\n' + partition_sql.strip('\n') - ) + partition_sql = re.sub('\n{2,}', '\n\n', partition_sql + ).strip('\n') + partition_main_sql = partition_sql.strip('\n') + if not diff_partition_sql: + main_sql.append( + sql_header + '\n\n' + partition_main_sql + ) sql = '\n'.join(main_sql) + if not json_resp: + return sql, partition_main_sql return ajax_response(response=sql.strip('\n')) def reset_statistics(self, scid, tid): @@ -907,7 +932,8 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): conn=self.conn).strip('\n') + '\n\n' # If partition(s) is/are added - if 'added' in partitions: + if 'added' in partitions and 'partition_scheme' in old_data\ + and old_data['partition_scheme'] != '': temp_data = dict() temp_data['schema'] = data['schema'] temp_data['name'] = data['name'] @@ -1133,7 +1159,8 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): except Exception as e: return internal_server_error(errormsg=str(e)) - def properties(self, gid, sid, did, scid, tid, res): + def properties(self, gid, sid, did, scid, tid, res, + return_ajax_response=True): """ This function will show the properties of the selected table node. @@ -1145,6 +1172,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): scid: Schema ID tid: Table ID res: Table/Partition table properties + return_ajax_response: If True then return the ajax response Returns: JSON of selected table node @@ -1242,6 +1270,9 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): data['partitions'] = partitions + if not return_ajax_response: + return data + return ajax_response( response=data, status=200 @@ -1359,18 +1390,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): } ) - def delete(self, gid, sid, did, scid, tid, res): - """ - This function will delete the table object - - Args: - gid: Server Group ID - sid: Server ID - did: Database ID - scid: Schema ID - tid: Table ID - """ - + def get_delete_sql(self, res): # Below will decide if it's simple drop or drop with cascade call if self.cmd == 'delete': # This is a cascade operation @@ -1380,11 +1400,26 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): data = res['rows'][0] - SQL = render_template( + return render_template( "/".join([self.table_template_path, 'delete.sql']), data=data, cascade=cascade, conn=self.conn ) + + def delete(self, gid, sid, did, scid, tid, res): + """ + This function will delete the table object + + Args: + gid: Server Group ID + sid: Server ID + did: Database ID + scid: Schema ID + tid: Table ID + """ + + SQL = self.get_delete_sql(res) + status, res = self.conn.execute_scalar(SQL) if not status: return status, res diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/__init__.py index 2ac65bbf4..a84309b97 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py index afa4cb712..b36b9b66b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py index 53f33c2d4..6a25d0c8d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py index 58dfd6291..47bd6e501 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py index eea3a0c68..6b21ccf05 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py index 405d2a20a..2bb4100f7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py index 375ebd012..eac52a44a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py index c5ffc8329..ae49402a3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py index d803a3e83..b173a4058 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -26,6 +26,8 @@ from pgadmin.utils import IS_PY2 from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare # If we are in Python3 if not IS_PY2: @@ -94,7 +96,7 @@ class TypeModule(SchemaChildModule): blueprint = TypeModule(__name__) -class TypeView(PGChildNodeView, DataTypeReader): +class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): """ This class is responsible for generating routes for Type node @@ -173,6 +175,10 @@ class TypeView(PGChildNodeView, DataTypeReader): * get_external_functions_list(gid, sid, did, scid, tid): - This function will return list of external functions in ajax response + + * compare(**kwargs): + - This function will compare the type nodes from two + different schemas. """ node_type = blueprint.node_type @@ -559,6 +565,22 @@ class TypeView(PGChildNodeView, DataTypeReader): Returns: JSON of selected type node """ + status, res = self._fetch_properties(scid, tid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, tid): + """ + This function is used to fecth the properties of the specified object. + :param scid: + :param tid: + :return: + """ SQL = render_template( "/".join([self.template_path, @@ -569,10 +591,10 @@ class TypeView(PGChildNodeView, DataTypeReader): ) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone( + return False, gone( gettext("""Could not find the type in the database.""")) # Making copy of output for future use @@ -583,7 +605,7 @@ class TypeView(PGChildNodeView, DataTypeReader): scid=scid, tid=tid) status, acl = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=acl) + return False, internal_server_error(errormsg=acl) # We will set get privileges from acl sql so we don't need # it from properties sql @@ -599,10 +621,7 @@ class TypeView(PGChildNodeView, DataTypeReader): # Calling function to check and additional properties if available copy_dict.update(self.additional_properties(copy_dict, tid)) - return ajax_response( - response=copy_dict, - status=200 - ) + return True, copy_dict @check_precondition def get_collations(self, gid, sid, did, scid, tid=None): @@ -1428,5 +1447,31 @@ class TypeView(PGChildNodeView, DataTypeReader): status=200 ) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid): + """ + This function will fetch the list of all the types for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'nodes.sql']), + scid=scid, datlastsysoid=self.datlastsysoid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + + return res + TypeView.register_node_view(blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js index 2b09bfcc8..0ac8ad73a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/__init__.py index 1744c3828..62afcc2ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py index 4891e04a2..329acd3a7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py index e242c0705..2a6c9c84c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py index 3100301f4..7089ccb34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py index 791780b02..9cce36ada 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py index 7c39756b7..4ce1c8f17 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py index 09ffa9ec5..ee87d9694 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -15,6 +15,8 @@ from flask import render_template from pgadmin.browser.collection import CollectionNodeModule from pgadmin.utils.ajax import internal_server_error +from pgadmin.utils.driver import get_driver +from config import PG_DEFAULT_DRIVER class SchemaChildModule(CollectionNodeModule): @@ -485,44 +487,50 @@ class VacuumSettings: * type - table/toast vacuum type """ + vacuum_settings = dict() def __init__(self): pass - def get_vacuum_table_settings(self, conn): + def fetch_default_vacuum_settings(self, conn, sid, setting_type): """ - Fetch the default values for autovacuum - fields, return an array of - - label - - name - - setting - values + This function is used to fetch and cached the default vacuum settings + for specified server id. + :param conn: Connection Object + :param sid: Server ID + :param setting_type: Type (table or toast) + :return: """ + if sid in VacuumSettings.vacuum_settings: + if setting_type in VacuumSettings.vacuum_settings[sid]: + return VacuumSettings.vacuum_settings[sid][setting_type] + else: + VacuumSettings.vacuum_settings[sid] = dict() # returns an array of name & label values vacuum_fields = render_template("vacuum_settings/vacuum_fields.json") - vacuum_fields = json.loads(vacuum_fields) # returns an array of setting & name values vacuum_fields_keys = "'" + "','".join( - vacuum_fields['table'].keys()) + "'" + vacuum_fields[setting_type].keys()) + "'" SQL = render_template('vacuum_settings/sql/vacuum_defaults.sql', columns=vacuum_fields_keys) - status, res = conn.execute_dict(SQL) + status, res = conn.execute_dict(SQL) if not status: return internal_server_error(errormsg=res) for row in res['rows']: row_name = row['name'] - row['name'] = vacuum_fields['table'][row_name][0] - row['label'] = vacuum_fields['table'][row_name][1] - row['column_type'] = vacuum_fields['table'][row_name][2] + row['name'] = vacuum_fields[setting_type][row_name][0] + row['label'] = vacuum_fields[setting_type][row_name][1] + row['column_type'] = vacuum_fields[setting_type][row_name][2] - return res + VacuumSettings.vacuum_settings[sid][setting_type] = res['rows'] + return VacuumSettings.vacuum_settings[sid][setting_type] - def get_vacuum_toast_settings(self, conn): + def get_vacuum_table_settings(self, conn, sid): """ Fetch the default values for autovacuum fields, return an array of @@ -531,29 +539,18 @@ class VacuumSettings: - setting values """ + return self.fetch_default_vacuum_settings(conn, sid, 'table') - # returns an array of name & label values - vacuum_fields = render_template("vacuum_settings/vacuum_fields.json") - - vacuum_fields = json.loads(vacuum_fields) - - # returns an array of setting & name values - vacuum_fields_keys = "'" + "','".join( - vacuum_fields['toast'].keys()) + "'" - SQL = render_template('vacuum_settings/sql/vacuum_defaults.sql', - columns=vacuum_fields_keys) - status, res = conn.execute_dict(SQL) - - if not status: - return internal_server_error(errormsg=res) - - for row in res['rows']: - row_name = row['name'] - row['name'] = vacuum_fields['toast'][row_name][0] - row['label'] = vacuum_fields['toast'][row_name][1] - row['column_type'] = vacuum_fields['table'][row_name][2] - - return res + def get_vacuum_toast_settings(self, conn, sid): + """ + Fetch the default values for autovacuum + fields, return an array of + - label + - name + - setting + values + """ + return self.fetch_default_vacuum_settings(conn, sid, 'toast') def parse_vacuum_data(self, conn, result, type): """ @@ -567,47 +564,46 @@ class VacuumSettings: * type - table/toast vacuum type """ - # returns an array of name & label values - vacuum_fields = render_template("vacuum_settings/vacuum_fields.json") + vacuum_settings_tmp = self.fetch_default_vacuum_settings( + conn, self.manager.sid, type) - vacuum_fields = json.loads(vacuum_fields) + for row in vacuum_settings_tmp: + row_name = row['name'] + if type is 'toast': + row_name = 'toast_{0}'.format(row['name']) + if row_name in result and result[row_name] is not None: + if row['column_type'] == 'number': + value = float(result[row_name]) + else: + value = int(result[row_name]) + row['value'] = value + else: + if 'value' in row: + row.pop('value') - # returns an array of setting & name values - vacuum_fields_keys = "'" + "','".join( - vacuum_fields[type].keys()) + "'" - SQL = render_template('vacuum_settings/sql/vacuum_defaults.sql', - columns=vacuum_fields_keys) - status, res = conn.execute_dict(SQL) + return vacuum_settings_tmp - if not status: - return internal_server_error(errormsg=res) - if type is 'table': - for row in res['rows']: - row_name = row['name'] - row['name'] = vacuum_fields[type][row_name][0] - row['label'] = vacuum_fields[type][row_name][1] - row['column_type'] = vacuum_fields[type][row_name][2] - if result[row['name']] is not None: - if row['column_type'] == 'number': - value = float(result[row['name']]) - else: - value = int(result[row['name']]) - row['value'] = row['setting'] = value - - elif type is 'toast': - for row in res['rows']: - row_old_name = row['name'] - row_name = 'toast_{0}'.format( - vacuum_fields[type][row_old_name][0]) - row['name'] = vacuum_fields[type][row_old_name][0] - row['label'] = vacuum_fields[type][row_old_name][1] - row['column_type'] = vacuum_fields[type][row_old_name][2] - if result[row_name] and result[row_name] is not None: - if row['column_type'] == 'number': - value = float(result[row_name]) - else: - value = int(result[row_name]) - row['value'] = row['setting'] = value +def get_schema(sid, did, scid): + """ + This function will return the schema name. + """ + + driver = get_driver(PG_DEFAULT_DRIVER) + manager = driver.connection_manager(sid) + conn = manager.connection(did=did) + + ver = manager.version + server_type = manager.server_type + + # Fetch schema name + status, schema_name = conn.execute_scalar( + render_template("/".join(['schemas', + '{0}/#{1}#'.format(server_type, + ver), + 'sql/get_name.sql']), + conn=conn, scid=scid + ) + ) - return res['rows'] + return status, schema_name diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py index 7e37c0357..b03136891 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py @@ -2,13 +2,14 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## """Implements View and Materialized View Node""" +import copy from functools import wraps import simplejson as json @@ -18,13 +19,16 @@ from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases as databases from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ - SchemaChildModule, parse_rule_definition, VacuumSettings + SchemaChildModule, parse_rule_definition, VacuumSettings, get_schema from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response, gone from pgadmin.utils.driver import get_driver +from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry +from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare + """ This module is responsible for generating two nodes @@ -197,7 +201,7 @@ def check_precondition(f): return wrap -class ViewNode(PGChildNodeView, VacuumSettings): +class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare): """ This class is responsible for generating routes for view node. @@ -250,6 +254,10 @@ class ViewNode(PGChildNodeView, VacuumSettings): * dependent(gid, sid, did, scid): - This function will generate dependent list to show it in dependent pane for the selected view node. + + * compare(**kwargs): + - This function will compare the view nodes from two + different schemas. """ node_type = view_blueprint.node_type @@ -290,6 +298,8 @@ class ViewNode(PGChildNodeView, VacuumSettings): {'get': 'get_toast_table_vacuum'}] }) + keys_to_ignore = ['oid', 'schema', 'xmin'] + def __init__(self, *args, **kwargs): """ Initialize the variables used by methods of ViewNode. @@ -400,21 +410,37 @@ class ViewNode(PGChildNodeView, VacuumSettings): Fetches the properties of an individual view and render in the properties tab """ + status, res = self._fetch_properties(scid, vid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, scid, vid): + """ + This function is used to fetch the properties of the specified object + :param scid: + :param vid: + :return: + """ SQL = render_template("/".join( [self.template_path, 'sql/properties.sql'] ), vid=vid, datlastsysoid=self.datlastsysoid) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone(gettext("""Could not find the view.""")) + return False, gone(gettext("""Could not find the view.""")) SQL = render_template("/".join( [self.template_path, 'sql/acl.sql']), vid=vid) status, dataclres = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) for row in dataclres['rows']: priv = parse_priv_from_db(row) @@ -428,10 +454,7 @@ class ViewNode(PGChildNodeView, VacuumSettings): # merging formated result with main result again result.update(frmtd_reslt) - return ajax_response( - response=result, - status=200 - ) + return True, result @staticmethod def formatter(result): @@ -556,7 +579,7 @@ class ViewNode(PGChildNodeView, VacuumSettings): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, vid=None): + def delete(self, gid, sid, did, scid, vid=None, only_sql=False): """ This function will drop a view object """ @@ -604,6 +627,10 @@ class ViewNode(PGChildNodeView, VacuumSettings): nspname=res_data['rows'][0]['schema'], name=res_data['rows'][0]['name'], cascade=cascade ) + + if only_sql: + return SQL + status, res = self.conn.execute_scalar(SQL) if not status: return internal_server_error(errormsg=res) @@ -840,7 +867,7 @@ class ViewNode(PGChildNodeView, VacuumSettings): return columns - def get_rule_sql(self, vid): + def get_rule_sql(self, vid, display_comments=True): """ Get all non system rules of view node, generate their sql and render @@ -869,12 +896,12 @@ class ViewNode(PGChildNodeView, VacuumSettings): res = parse_rule_definition(res) SQL = render_template("/".join( [self.rule_temp_path, 'sql/create.sql']), - data=res, display_comments=True) + data=res, display_comments=display_comments) SQL_data += '\n' SQL_data += SQL return SQL_data - def get_compound_trigger_sql(self, vid): + def get_compound_trigger_sql(self, vid, display_comments=True): """ Get all compound trigger nodes associated with view node, generate their sql and render into sql tab @@ -945,13 +972,13 @@ class ViewNode(PGChildNodeView, VacuumSettings): [self.ct_trigger_temp_path, 'sql/{0}/#{1}#/create.sql'.format( self.manager.server_type, self.manager.version)]), - data=res_rows, display_comments=True) + data=res_rows, display_comments=display_comments) SQL_data += '\n' SQL_data += SQL return SQL_data - def get_trigger_sql(self, vid): + def get_trigger_sql(self, vid, display_comments=True): """ Get all trigger nodes associated with view node, generate their sql and render @@ -1038,13 +1065,13 @@ class ViewNode(PGChildNodeView, VacuumSettings): [self.trigger_temp_path, 'sql/{0}/#{1}#/create.sql'.format( self.manager.server_type, self.manager.version)]), - data=res_rows, display_comments=True) + data=res_rows, display_comments=display_comments) SQL_data += '\n' SQL_data += SQL return SQL_data - def get_index_sql(self, did, vid): + def get_index_sql(self, did, vid, display_comments=True): """ Get all index associated with view node, generate their sql and render @@ -1084,17 +1111,23 @@ class ViewNode(PGChildNodeView, VacuumSettings): SQL = render_template("/".join( [self.index_temp_path, 'sql/#{0}#/create.sql'.format(self.manager.version)]), - data=data, display_comments=True) + data=data, display_comments=display_comments) SQL_data += '\n' SQL_data += SQL return SQL_data @check_precondition - def sql(self, gid, sid, did, scid, vid): + def sql(self, gid, sid, did, scid, vid, diff_schema=None, + json_resp=True): """ This function will generate sql to render into the sql panel """ + display_comments = True + + if not json_resp: + display_comments = False + SQL_data = '' SQL = render_template("/".join( [self.template_path, 'sql/properties.sql']), @@ -1111,6 +1144,9 @@ class ViewNode(PGChildNodeView, VacuumSettings): ) result = res['rows'][0] + if diff_schema: + result['schema'] = diff_schema + # sending result to formtter frmtd_reslt = self.formatter(result) @@ -1152,18 +1188,20 @@ class ViewNode(PGChildNodeView, VacuumSettings): [self.template_path, 'sql/create.sql']), data=result, conn=self.conn, - display_comments=True + display_comments=display_comments ) SQL += "\n" SQL += render_template("/".join( [self.template_path, 'sql/grant.sql']), data=result) SQL_data += SQL - SQL_data += self.get_rule_sql(vid) - SQL_data += self.get_trigger_sql(vid) - SQL_data += self.get_compound_trigger_sql(vid) - SQL_data += self.get_index_sql(did, vid) + SQL_data += self.get_rule_sql(vid, display_comments) + SQL_data += self.get_trigger_sql(vid, display_comments) + SQL_data += self.get_compound_trigger_sql(vid, display_comments) + SQL_data += self.get_index_sql(did, vid, display_comments) + if not json_resp: + return SQL_data return ajax_response(response=SQL_data) @check_precondition @@ -1357,6 +1395,60 @@ class ViewNode(PGChildNodeView, VacuumSettings): return ajax_response(response=sql) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid, oid=None): + """ + This function will fetch the list of all the views for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + + if not oid: + SQL = render_template("/".join([self.template_path, + 'sql/nodes.sql']), did=did, + scid=scid, datlastsysoid=self.datlastsysoid) + status, views = self.conn.execute_2darray(SQL) + if not status: + current_app.logger.error(views) + return False + + for row in views['rows']: + status, data = self._fetch_properties(scid, row['oid']) + if status: + res[row['name']] = data + else: + status, data = self._fetch_properties(scid, oid) + if not status: + current_app.logger.error(data) + return False + res = data + + return res + + def get_sql_from_diff(self, gid, sid, did, scid, oid, data=None, + diff_schema=None, drop_sql=False): + sql = '' + if data: + if diff_schema: + data['schema'] = diff_schema + sql, nameOrError = self.getSQL(gid, sid, did, data, oid) + else: + if drop_sql: + sql = self.delete(gid=gid, sid=sid, did=did, + scid=scid, vid=oid, only_sql=True) + elif diff_schema: + sql = self.sql(gid=gid, sid=sid, did=did, scid=scid, vid=oid, + diff_schema=diff_schema, json_resp=False) + else: + sql = self.sql(gid=gid, sid=sid, did=did, scid=scid, vid=oid, + json_resp=False) + return sql + # Override the operations for materialized view mview_operations = { @@ -1631,11 +1723,17 @@ class MViewNode(ViewNode, VacuumSettings): return SQL, data['name'] if 'name' in data else old_data['name'] @check_precondition - def sql(self, gid, sid, did, scid, vid): + def sql(self, gid, sid, did, scid, vid, diff_schema=None, + json_resp=True): """ This function will generate sql to render into the sql panel """ + display_comments = True + + if not json_resp: + display_comments = False + SQL_data = '' SQL = render_template("/".join( [self.template_path, 'sql/properties.sql']), @@ -1654,6 +1752,9 @@ class MViewNode(ViewNode, VacuumSettings): result = res['rows'][0] + if diff_schema: + result['schema'] = diff_schema + # sending result to formtter frmtd_reslt = self.formatter(result) @@ -1732,17 +1833,20 @@ class MViewNode(ViewNode, VacuumSettings): [self.template_path, 'sql/create.sql']), data=result, conn=self.conn, - display_comments=True + display_comments=display_comments ) SQL += "\n" SQL += render_template("/".join( [self.template_path, 'sql/grant.sql']), data=result) SQL_data += SQL - SQL_data += self.get_rule_sql(vid) - SQL_data += self.get_trigger_sql(vid) - SQL_data += self.get_index_sql(did, vid) + SQL_data += self.get_rule_sql(vid, display_comments) + SQL_data += self.get_trigger_sql(vid, display_comments) + SQL_data += self.get_index_sql(did, vid, display_comments) SQL_data = SQL_data.strip('\n') + + if not json_resp: + return SQL_data return ajax_response(response=SQL_data) @check_precondition @@ -1756,9 +1860,9 @@ class MViewNode(ViewNode, VacuumSettings): values """ - res = self.get_vacuum_table_settings(self.conn) + res = self.get_vacuum_table_settings(self.conn, sid) return ajax_response( - response=res['rows'], + response=res, status=200 ) @@ -1772,10 +1876,10 @@ class MViewNode(ViewNode, VacuumSettings): - setting values """ - res = self.get_vacuum_toast_settings(self.conn) + res = self.get_vacuum_toast_settings(self.conn, sid) return ajax_response( - response=res['rows'], + response=res, status=200 ) @@ -1785,21 +1889,39 @@ class MViewNode(ViewNode, VacuumSettings): Fetches the properties of an individual view and render in the properties tab """ + status, res = self._fetch_properties(did, scid, vid) + if not status: + return res + + return ajax_response( + response=res, + status=200 + ) + + def _fetch_properties(self, did, scid, vid): + """ + This function is used to fetch the properties of the specified object + :param did: + :param scid: + :param vid: + :return: + """ SQL = render_template("/".join( [self.template_path, 'sql/properties.sql'] ), did=did, vid=vid, datlastsysoid=self.datlastsysoid) status, res = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) if len(res['rows']) == 0: - return gone(gettext("""Could not find the materialized view.""")) + return False, gone( + gettext("""Could not find the materialized view.""")) SQL = render_template("/".join( [self.template_path, 'sql/acl.sql']), vid=vid) status, dataclres = self.conn.execute_dict(SQL) if not status: - return internal_server_error(errormsg=res) + return False, internal_server_error(errormsg=res) for row in dataclres['rows']: priv = parse_priv_from_db(row) @@ -1818,10 +1940,7 @@ class MViewNode(ViewNode, VacuumSettings): result['vacuum_toast'] = self.parse_vacuum_data( self.conn, result, 'toast') - return ajax_response( - response=result, - status=200 - ) + return True, result @check_precondition def refresh_data(self, gid, sid, did, scid, vid): @@ -1873,6 +1992,34 @@ class MViewNode(ViewNode, VacuumSettings): current_app.logger.exception(e) return internal_server_error(errormsg=str(e)) + @check_precondition + def fetch_objects_to_compare(self, sid, did, scid, oid=None): + """ + This function will fetch the list of all the mviews for + specified schema id. + + :param sid: Server Id + :param did: Database Id + :param scid: Schema Id + :return: + """ + res = dict() + SQL = render_template("/".join([self.template_path, + 'sql/nodes.sql']), did=did, + scid=scid, datlastsysoid=self.datlastsysoid) + status, rset = self.conn.execute_2darray(SQL) + if not status: + return internal_server_error(errormsg=res) + + for row in rset['rows']: + status, data = self._fetch_properties(did, scid, row['oid']) + if status: + res[row['name']] = data + + return res + +SchemaDiffRegistry(view_blueprint.node_type, ViewNode) ViewNode.register_node_view(view_blueprint) +SchemaDiffRegistry(mview_blueprint.node_type, MViewNode) MViewNode.register_node_view(mview_blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js index d5e2d74a3..77f5d6b60 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js index 1b357fa97..e85bd7f15 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/update.sql index 38606cc0b..d49f7fb9f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/update.sql @@ -19,7 +19,7 @@ ALTER TABLE {{ conn|qtIdent(view_schema, view_name) }} {% endif %} {% if def and def != o_data.definition.rstrip(';') %} CREATE OR REPLACE VIEW {{ conn|qtIdent(view_schema, view_name) }} - WITH (security_barrier={{ data.security_barrier|lower if data.security_barrier else o_data.security_barrier|default('false', 'true')|lower }}) + WITH (security_barrier={{ data.security_barrier|lower if data.security_barrier is defined else o_data.security_barrier|default('false', 'true')|lower }}) AS {{ def }}; {% else %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/update.sql index 38606cc0b..d49f7fb9f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/update.sql @@ -19,7 +19,7 @@ ALTER TABLE {{ conn|qtIdent(view_schema, view_name) }} {% endif %} {% if def and def != o_data.definition.rstrip(';') %} CREATE OR REPLACE VIEW {{ conn|qtIdent(view_schema, view_name) }} - WITH (security_barrier={{ data.security_barrier|lower if data.security_barrier else o_data.security_barrier|default('false', 'true')|lower }}) + WITH (security_barrier={{ data.security_barrier|lower if data.security_barrier is defined else o_data.security_barrier|default('false', 'true')|lower }}) AS {{ def }}; {% else %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/update.sql index 4235f5c90..805c658d1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/update.sql @@ -19,7 +19,7 @@ ALTER TABLE {{ conn|qtIdent(view_schema, view_name) }} {% endif %} {% if def and def != o_data.definition.rstrip(';') %} CREATE OR REPLACE VIEW {{ conn|qtIdent(view_schema, view_name) }} - WITH ({% if (data.check_option or o_data.check_option) %}check_option={{ data.check_option if data.check_option else o_data.check_option }}{{', ' }}{% endif %}security_barrier={{ data.security_barrier|lower if data.security_barrier else o_data.security_barrier|default('false', 'true')|lower }}) + WITH ({% if (data.check_option or o_data.check_option) %}check_option={{ data.check_option if data.check_option else o_data.check_option }}{{', ' }}{% endif %}security_barrier={{ data.security_barrier|lower if data.security_barrier is defined else o_data.security_barrier|default('false', 'true')|lower }}) AS {{ def }}; {% else %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/__init__.py index 770879943..23caf9dd8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py index c84276ef6..6cfb2c075 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py index af911d4e9..554eff78c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py index bcc22c8f8..27f844281 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py index 6a22a7157..12443c1d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py index 71279127b..895ba078e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py index f99a7972d..762ce6968 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py index d6180c4fc..e06584977 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js index f74dbd9a2..12e519ec4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js +++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/css/database.css b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/css/database.css index f0b12e306..0c9ae10dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/css/database.css +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/css/database.css @@ -11,4 +11,9 @@ background-image: url('{{ url_for('NODE-database.static', filename='img/databasebad.svg') }}') !important; border-radius: 10px; background-size: 20px !important; + background-repeat: no-repeat; + vertical-align: middle; + align-content: center; + height: 1.3em; + } diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/tests/__init__.py index 37fe32c60..c7e031e50 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py index fc62bed38..3b4c4d75e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py index 22225b968..32bfcf671 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py index 51e477603..b5b614c87 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py index dd314154e..ddd3bff1b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py index ae861b165..7e3fcd14f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py index 8eeedf779..bc5d5ac01 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/databases/utils.py b/web/pgadmin/browser/server_groups/servers/databases/utils.py index 8926f3046..65375d772 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/gpdb.py b/web/pgadmin/browser/server_groups/servers/gpdb.py index 048cd58ab..3a3047f4a 100644 --- a/web/pgadmin/browser/server_groups/servers/gpdb.py +++ b/web/pgadmin/browser/server_groups/servers/gpdb.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py index 08ca3dc99..8cdab8f88 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py index ad3e7e920..7b6a5a710 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js index 377da574d..f1af97e9d 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js +++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js index f5c8ddc6b..6bf01c9ba 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js +++ b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py index aa4f7f407..1f9a3ab42 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js b/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js index e48ce9e9c..39ded81bd 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js +++ b/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/__init__.py index 83e0f5717..b300ce141 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py index 8c19506f4..084249815 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py index 4e7ef9a80..60c94e747 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py index 89b1f6dc4..e7dee1213 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py index dc55dda39..ac46b6a29 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py index ab8da587e..f79afba00 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py index e0f3dfdac..2b92ca299 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py index 5398fe96a..f9432c179 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py index 3290557e7..a9db9e85f 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py index e08ea49ab..718410b9f 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py index 9ca26268e..c0c2d2816 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py index 99ec4b267..57cb76945 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py index 0e189b6f9..8d19f177d 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py index f01d23bf3..df44c0a04 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py index 5428a1cc1..6f64621f3 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/utils.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/utils.py index fef196089..af071d927 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/utils.py b/web/pgadmin/browser/server_groups/servers/pgagent/utils.py index 72701ef3c..3fdcf7f97 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/utils.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/ppas.py b/web/pgadmin/browser/server_groups/servers/ppas.py index 4d0fe123c..11befd0f8 100644 --- a/web/pgadmin/browser/server_groups/servers/ppas.py +++ b/web/pgadmin/browser/server_groups/servers/ppas.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py index b65f6d9b6..193e93e38 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js b/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js index 3808cadfc..de02f3850 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/__init__.py index aa1519def..84995c0da 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py index 913414e8d..58d60cd3a 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py index 8ea87e518..c33e0ba98 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py index 542593e4c..0b49ffb0d 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py index 10c3aa2db..a943d86d2 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py index a92a4fc2e..b201ed53f 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py index 22a265a13..e3d320e6e 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/roles/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/__init__.py index fe1ba684f..8dbaf2a6a 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js index 10cafe260..932532809 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js +++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/tests/__init__.py index 98fd6580d..fda393c7d 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py index 0098ff0a3..015769827 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py index c10856134..cc3e40fc1 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py index 39f6e5ec8..6ca5b1606 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py index d57d1e6b2..6d8272850 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py index 18ad56d0a..691d4b5f6 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py b/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py index 4bd627b46..e8172d4c2 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js index 8243540b7..24386be09 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js index 1ddf0e878..78c854a70 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/server.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/static/js/variable.js b/web/pgadmin/browser/server_groups/servers/static/js/variable.js index 5d47ff0b3..fad5553b4 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/variable.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/variable.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py index fe227d7ab..426ead52b 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js index ad5c2b58e..5ba3682ba 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/__init__.py index e9e049d45..518dd61cc 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py index 60880f215..a943f51d7 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py index e2db72cd1..fae07b57c 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py index ecdacf582..8d49dbfc3 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py index f6a7fa407..266359fba 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py index 8c0252689..6cf6ad88c 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py index 7b42ef90c..d9ecbc27f 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/supported_servers.js b/web/pgadmin/browser/server_groups/servers/templates/servers/supported_servers.js index 9b57d2506..1fbf7b48f 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/servers/supported_servers.js +++ b/web/pgadmin/browser/server_groups/servers/templates/servers/supported_servers.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/servers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/tests/__init__.py index 614aea61d..98cecdb1b 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py index cce03041a..2d3260688 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py index 9d8da94fd..eca046932 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py index e8b48c0fc..49e792271 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py b/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py index 3f212f37a..887c02a38 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_dependencies_sql.py b/web/pgadmin/browser/server_groups/servers/tests/test_dependencies_sql.py index 0e48ab3d4..cf49437a1 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_dependencies_sql.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_dependencies_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_dependents_sql.py b/web/pgadmin/browser/server_groups/servers/tests/test_dependents_sql.py index 1bb0e0052..fce2e910c 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_dependents_sql.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_dependents_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py b/web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py index 4c5dacb95..f6a74550f 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py index fd554af94..5ea9a8660 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py index c2b184295..f970cb043 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py index 9f92ffcce..d0025c8b1 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py index 8a69558e9..2fcafabde 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/types.py b/web/pgadmin/browser/server_groups/servers/types.py index ba7d23fbe..5e4ff4510 100644 --- a/web/pgadmin/browser/server_groups/servers/types.py +++ b/web/pgadmin/browser/server_groups/servers/types.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/utils.py b/web/pgadmin/browser/server_groups/servers/utils.py index c402d08f5..f9aeea170 100644 --- a/web/pgadmin/browser/server_groups/servers/utils.py +++ b/web/pgadmin/browser/server_groups/servers/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/static/js/server_group.js b/web/pgadmin/browser/server_groups/static/js/server_group.js index 9bd7df0f3..8457db658 100644 --- a/web/pgadmin/browser/server_groups/static/js/server_group.js +++ b/web/pgadmin/browser/server_groups/static/js/server_group.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/server_groups/tests/__init__.py b/web/pgadmin/browser/server_groups/tests/__init__.py index 8b25e04f3..ad6b4e826 100644 --- a/web/pgadmin/browser/server_groups/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/tests/test_sg_get.py b/web/pgadmin/browser/server_groups/tests/test_sg_get.py index d45dbd153..73d69b2f9 100644 --- a/web/pgadmin/browser/server_groups/tests/test_sg_get.py +++ b/web/pgadmin/browser/server_groups/tests/test_sg_get.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js index 2ef881b9a..1dc9c24e1 100644 --- a/web/pgadmin/browser/static/js/browser.js +++ b/web/pgadmin/browser/static/js/browser.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js index 5b7ab0d08..4b11e6bda 100644 --- a/web/pgadmin/browser/static/js/collection.js +++ b/web/pgadmin/browser/static/js/collection.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/datamodel.js b/web/pgadmin/browser/static/js/datamodel.js index 974eda6a4..564f7f2c9 100644 --- a/web/pgadmin/browser/static/js/datamodel.js +++ b/web/pgadmin/browser/static/js/datamodel.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/error.js b/web/pgadmin/browser/static/js/error.js index 07bfe43ac..81e9ab04d 100644 --- a/web/pgadmin/browser/static/js/error.js +++ b/web/pgadmin/browser/static/js/error.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/frame.js b/web/pgadmin/browser/static/js/frame.js index 2ced09867..5e5e7df16 100644 --- a/web/pgadmin/browser/static/js/frame.js +++ b/web/pgadmin/browser/static/js/frame.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/keyboard.js b/web/pgadmin/browser/static/js/keyboard.js index 5cd00e6a3..8b85ecefc 100644 --- a/web/pgadmin/browser/static/js/keyboard.js +++ b/web/pgadmin/browser/static/js/keyboard.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/layout.js b/web/pgadmin/browser/static/js/layout.js index 6a1ee79fd..366697830 100644 --- a/web/pgadmin/browser/static/js/layout.js +++ b/web/pgadmin/browser/static/js/layout.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/menu.js b/web/pgadmin/browser/static/js/menu.js index f40c06e30..3f3dba411 100644 --- a/web/pgadmin/browser/static/js/menu.js +++ b/web/pgadmin/browser/static/js/menu.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js index e3fac91f5..b29c98ad3 100644 --- a/web/pgadmin/browser/static/js/node.js +++ b/web/pgadmin/browser/static/js/node.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/node.ui.js b/web/pgadmin/browser/static/js/node.ui.js index 476fd2ec2..6e5060791 100644 --- a/web/pgadmin/browser/static/js/node.ui.js +++ b/web/pgadmin/browser/static/js/node.ui.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// @@ -93,6 +93,57 @@ define([ ); }); + /* Define on demand loading of dropdown items. + * This also requires ajax option of select2 to be set. + * The trick is, ajax: {} will also work even if you're actually not + * using ajax. + */ + $.fn.select2.amd.define('select2/onDemandDataAdapter', [ + 'select2/utils', + 'select2/data/select', + ], function (Utils, SelectAdapter) { + + function onDemandDataAdapter ($element, options) { + this.$element = $element; + this.options = options; + } + Utils.Extend(onDemandDataAdapter, SelectAdapter); + onDemandDataAdapter.prototype.query = function (params, callback) { + var data = []; + var self = this; + if (!params.page) { + params.page = 1; + } + var pageSize = 20; + + var $options = this.$element.children(); + $options.each(function () { + var $option = $(this); + + if (!$option.is('option') && !$option.is('optgroup')) { + return; + } + + var option = self.item($option); + + var matches = self.matches(params, option); + + if (matches !== null) { + data.push(matches); + } + }); + + callback({ + results: data.slice((params.page - 1) * pageSize, params.page * pageSize), + pagination: { + more: data.length >= params.page * pageSize, + }, + }); + }; + + return onDemandDataAdapter; + }); + /* * NodeAjaxOptionsControl * This control will fetch the options required to render the select diff --git a/web/pgadmin/browser/static/js/panel.js b/web/pgadmin/browser/static/js/panel.js index 5d77af71f..f2e363ba3 100644 --- a/web/pgadmin/browser/static/js/panel.js +++ b/web/pgadmin/browser/static/js/panel.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/preferences.js b/web/pgadmin/browser/static/js/preferences.js index 74fec42c3..00f566fc3 100644 --- a/web/pgadmin/browser/static/js/preferences.js +++ b/web/pgadmin/browser/static/js/preferences.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/toolbar.js b/web/pgadmin/browser/static/js/toolbar.js index 0442d7526..ff7c7321d 100644 --- a/web/pgadmin/browser/static/js/toolbar.js +++ b/web/pgadmin/browser/static/js/toolbar.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/static/js/wizard.js b/web/pgadmin/browser/static/js/wizard.js index 879f07d9c..de7032cf2 100644 --- a/web/pgadmin/browser/static/js/wizard.js +++ b/web/pgadmin/browser/static/js/wizard.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/templates/browser/js/endpoints.js b/web/pgadmin/browser/templates/browser/js/endpoints.js index 70909bea3..bc33896f0 100644 --- a/web/pgadmin/browser/templates/browser/js/endpoints.js +++ b/web/pgadmin/browser/templates/browser/js/endpoints.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/templates/browser/js/messages.js b/web/pgadmin/browser/templates/browser/js/messages.js index 6e16776bb..41301c4fc 100644 --- a/web/pgadmin/browser/templates/browser/js/messages.js +++ b/web/pgadmin/browser/templates/browser/js/messages.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/templates/browser/js/utils.js b/web/pgadmin/browser/templates/browser/js/utils.js index 79e812033..e089a243c 100644 --- a/web/pgadmin/browser/templates/browser/js/utils.js +++ b/web/pgadmin/browser/templates/browser/js/utils.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/browser/tests/__init__.py b/web/pgadmin/browser/tests/__init__.py index 315189600..598bbeb97 100644 --- a/web/pgadmin/browser/tests/__init__.py +++ b/web/pgadmin/browser/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/test_change_password.py b/web/pgadmin/browser/tests/test_change_password.py index 04c49a23e..ab329dbe9 100644 --- a/web/pgadmin/browser/tests/test_change_password.py +++ b/web/pgadmin/browser/tests/test_change_password.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/test_gravatar_image_display.py b/web/pgadmin/browser/tests/test_gravatar_image_display.py index 59f611dec..b63549f2d 100644 --- a/web/pgadmin/browser/tests/test_gravatar_image_display.py +++ b/web/pgadmin/browser/tests/test_gravatar_image_display.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/test_internal_version.py b/web/pgadmin/browser/tests/test_internal_version.py index 5a4aa4684..901ef1f61 100644 --- a/web/pgadmin/browser/tests/test_internal_version.py +++ b/web/pgadmin/browser/tests/test_internal_version.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/test_login.py b/web/pgadmin/browser/tests/test_login.py index dbfbcfcb5..fad2dd56b 100644 --- a/web/pgadmin/browser/tests/test_login.py +++ b/web/pgadmin/browser/tests/test_login.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/test_logout.py b/web/pgadmin/browser/tests/test_logout.py index fbc1a507b..33dc1bf0e 100644 --- a/web/pgadmin/browser/tests/test_logout.py +++ b/web/pgadmin/browser/tests/test_logout.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/test_master_password.py b/web/pgadmin/browser/tests/test_master_password.py index 5812b4dea..535dccd73 100644 --- a/web/pgadmin/browser/tests/test_master_password.py +++ b/web/pgadmin/browser/tests/test_master_password.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/test_reset_password.py b/web/pgadmin/browser/tests/test_reset_password.py index 7ec2c1778..4fd1fecf6 100644 --- a/web/pgadmin/browser/tests/test_reset_password.py +++ b/web/pgadmin/browser/tests/test_reset_password.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/test_version_in_range.py b/web/pgadmin/browser/tests/test_version_in_range.py index 8ff1394aa..a8870e795 100644 --- a/web/pgadmin/browser/tests/test_version_in_range.py +++ b/web/pgadmin/browser/tests/test_version_in_range.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/tests/utils.py b/web/pgadmin/browser/tests/utils.py index 458ed6117..895db991a 100644 --- a/web/pgadmin/browser/tests/utils.py +++ b/web/pgadmin/browser/tests/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py index 0fda71a0e..67dce0942 100644 --- a/web/pgadmin/browser/utils.py +++ b/web/pgadmin/browser/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -343,8 +343,10 @@ class NodeView(with_metaclass(MethodViewType, View)): def children(self, *args, **kwargs): """Build a list of treeview nodes from the child nodes.""" - children = self.get_children_nodes(*args, **kwargs) + children = [] + for module in self.blueprint.submodules: + children.extend(module.get_nodes(*args, **kwargs)) # Return sorted nodes based on label return make_json_response( data=sorted( @@ -352,46 +354,8 @@ class NodeView(with_metaclass(MethodViewType, View)): ) ) - def get_children_nodes(self, *args, **kwargs): - """ - Returns the list of children nodes for the current nodes. Override this - function for special cases only. - - :param args: - :param kwargs: Parameters to generate the correct set of tree node. - :return: List of the children nodes - """ - children = [] - - for module in self.blueprint.submodules: - children.extend(module.get_nodes(*args, **kwargs)) - - return children - class PGChildNodeView(NodeView): - - def get_children_nodes(self, manager, **kwargs): - """ - Returns the list of children nodes for the current nodes. - - :param manager: Server Manager object - :param kwargs: Parameters to generate the correct set of browser tree - node - :return: - """ - nodes = [] - for module in self.blueprint.submodules: - if isinstance(module, PGChildModule): - if ( - manager is not None and - module.BackendSupported(manager, **kwargs) - ): - nodes.extend(module.get_nodes(**kwargs)) - else: - nodes.extend(module.get_nodes(**kwargs)) - return nodes - def children(self, **kwargs): """Build a list of treeview nodes from the child nodes.""" @@ -424,11 +388,21 @@ class PGChildNodeView(NodeView): ) ) + nodes = [] + for module in self.blueprint.submodules: + if isinstance(module, PGChildModule): + if ( + manager is not None and + module.BackendSupported(manager, **kwargs) + ): + nodes.extend(module.get_nodes(**kwargs)) + else: + nodes.extend(module.get_nodes(**kwargs)) + # Return sorted nodes based on label return make_json_response( data=sorted( - self.get_children_nodes(manager, **kwargs), - key=lambda c: c['label'] + nodes, key=lambda c: c['label'] ) ) diff --git a/web/pgadmin/dashboard/__init__.py b/web/pgadmin/dashboard/__init__.py index a08944d8f..46380463b 100644 --- a/web/pgadmin/dashboard/__init__.py +++ b/web/pgadmin/dashboard/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/dashboard/static/js/charting.js b/web/pgadmin/dashboard/static/js/charting.js index 4d40421f0..6b1395507 100644 --- a/web/pgadmin/dashboard/static/js/charting.js +++ b/web/pgadmin/dashboard/static/js/charting.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/dashboard/static/js/dashboard.js b/web/pgadmin/dashboard/static/js/dashboard.js index 1255ca807..c412a5c68 100644 --- a/web/pgadmin/dashboard/static/js/dashboard.js +++ b/web/pgadmin/dashboard/static/js/dashboard.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/dashboard/tests/__init__.py b/web/pgadmin/dashboard/tests/__init__.py index 7af45b1b5..168bc2e9b 100644 --- a/web/pgadmin/dashboard/tests/__init__.py +++ b/web/pgadmin/dashboard/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/dashboard/tests/test_dashboard_graphs.py b/web/pgadmin/dashboard/tests/test_dashboard_graphs.py index 0baf02b48..b9371a5ac 100644 --- a/web/pgadmin/dashboard/tests/test_dashboard_graphs.py +++ b/web/pgadmin/dashboard/tests/test_dashboard_graphs.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/browser_tool_bar_test.py b/web/pgadmin/feature_tests/browser_tool_bar_test.py index 9d3c15ad2..a05278a1b 100644 --- a/web/pgadmin/feature_tests/browser_tool_bar_test.py +++ b/web/pgadmin/feature_tests/browser_tool_bar_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py b/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py index 7091ffa42..9ac8be6f4 100644 --- a/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py +++ b/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/file_manager_test.py b/web/pgadmin/feature_tests/file_manager_test.py index 6d012869b..6e4f52e1d 100644 --- a/web/pgadmin/feature_tests/file_manager_test.py +++ b/web/pgadmin/feature_tests/file_manager_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/keyboard_shortcut_test.py b/web/pgadmin/feature_tests/keyboard_shortcut_test.py index ea381b44f..9ed841337 100644 --- a/web/pgadmin/feature_tests/keyboard_shortcut_test.py +++ b/web/pgadmin/feature_tests/keyboard_shortcut_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/pg_datatype_validation_test.py b/web/pgadmin/feature_tests/pg_datatype_validation_test.py index dba4ead66..6bac34737 100644 --- a/web/pgadmin/feature_tests/pg_datatype_validation_test.py +++ b/web/pgadmin/feature_tests/pg_datatype_validation_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py b/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py index e7e912d36..4c311c08e 100644 --- a/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py +++ b/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py b/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py index bd28dd9a1..0e6586d0e 100644 --- a/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py +++ b/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/query_tool_auto_complete_tests.py b/web/pgadmin/feature_tests/query_tool_auto_complete_tests.py index 7de94b38d..63246f999 100644 --- a/web/pgadmin/feature_tests/query_tool_auto_complete_tests.py +++ b/web/pgadmin/feature_tests/query_tool_auto_complete_tests.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/query_tool_journey_test.py b/web/pgadmin/feature_tests/query_tool_journey_test.py index 2d7c4ef98..216de6926 100644 --- a/web/pgadmin/feature_tests/query_tool_journey_test.py +++ b/web/pgadmin/feature_tests/query_tool_journey_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/query_tool_tests.py b/web/pgadmin/feature_tests/query_tool_tests.py index e6091aec5..bcb74ddb4 100644 --- a/web/pgadmin/feature_tests/query_tool_tests.py +++ b/web/pgadmin/feature_tests/query_tool_tests.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/table_ddl_feature_test.py b/web/pgadmin/feature_tests/table_ddl_feature_test.py index 13b3a88bd..7430ca95c 100644 --- a/web/pgadmin/feature_tests/table_ddl_feature_test.py +++ b/web/pgadmin/feature_tests/table_ddl_feature_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/view_data_dml_queries.py b/web/pgadmin/feature_tests/view_data_dml_queries.py index 0155cdc32..62aa09858 100644 --- a/web/pgadmin/feature_tests/view_data_dml_queries.py +++ b/web/pgadmin/feature_tests/view_data_dml_queries.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py b/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py index 9efad8a36..71b58c013 100644 --- a/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py +++ b/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/xss_checks_pgadmin_debugger_test.py b/web/pgadmin/feature_tests/xss_checks_pgadmin_debugger_test.py index fa5028b82..6af1af82e 100644 --- a/web/pgadmin/feature_tests/xss_checks_pgadmin_debugger_test.py +++ b/web/pgadmin/feature_tests/xss_checks_pgadmin_debugger_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/feature_tests/xss_checks_roles_control_test.py b/web/pgadmin/feature_tests/xss_checks_roles_control_test.py index 4b1edaabf..3a6e09adb 100644 --- a/web/pgadmin/feature_tests/xss_checks_roles_control_test.py +++ b/web/pgadmin/feature_tests/xss_checks_roles_control_test.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/help/__init__.py b/web/pgadmin/help/__init__.py index 1cc7a5a92..1312d5d32 100644 --- a/web/pgadmin/help/__init__.py +++ b/web/pgadmin/help/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/help/static/js/help.js b/web/pgadmin/help/static/js/help.js index 02ad06c07..32257ab11 100644 --- a/web/pgadmin/help/static/js/help.js +++ b/web/pgadmin/help/static/js/help.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/messages.pot b/web/pgadmin/messages.pot index 29347fad7..cff26da07 100644 --- a/web/pgadmin/messages.pot +++ b/web/pgadmin/messages.pot @@ -1,14 +1,14 @@ # Translations template for PROJECT. -# Copyright (C) 2020 ORGANIZATION +# Copyright (C) 2019 ORGANIZATION # This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2020. +# FIRST AUTHOR , 2019. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-01-03 19:02+0530\n" +"POT-Creation-Date: 2019-12-06 19:29+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,13 +46,13 @@ msgstr "" #: pgadmin/static/js/slickgrid/editors.js:50 #: pgadmin/static/js/slickgrid/editors.js:60 #: pgadmin/static/js/slickgrid/editors.js:61 -#: pgadmin/static/js/sqleditor/filter_dialog.js:84 -#: pgadmin/tools/datagrid/static/js/show_data.js:143 -#: pgadmin/tools/datagrid/static/js/show_data.js:218 +#: pgadmin/static/js/sqleditor/filter_dialog.js:83 +#: pgadmin/tools/datagrid/static/js/show_data.js:142 +#: pgadmin/tools/datagrid/static/js/show_data.js:217 #: pgadmin/tools/import_export/static/js/import_export.js:500 -#: pgadmin/tools/maintenance/static/js/maintenance.js:302 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2005 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2035 +#: pgadmin/tools/maintenance/static/js/maintenance.js:301 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1999 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2029 msgid "OK" msgstr "" @@ -455,7 +455,7 @@ msgstr "" #: pgadmin/browser/utils.py:386 #: pgadmin/static/js/alertify.pgadmin.defaults.js:102 #: pgadmin/static/js/alertify.pgadmin.defaults.js:163 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:305 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:303 #: pgadmin/tools/grant_wizard/__init__.py:129 pgadmin/utils/exception.py:35 msgid "Connection to the server has been lost." msgstr "" @@ -572,7 +572,7 @@ msgid "No parameters were changed." msgstr "" #: pgadmin/browser/server_groups/servers/__init__.py:767 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:567 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:562 #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:370 #: pgadmin/browser/server_groups/servers/databases/extensions/__init__.py:264 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py:395 @@ -594,7 +594,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:365 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:569 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py:436 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:888 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:922 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:393 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py:484 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py:478 @@ -762,33 +762,33 @@ msgstr "" msgid "PostgreSQL" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:38 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:37 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:21 msgid "Databases" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:375 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:391 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:654 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:724 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:849 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:1021 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:374 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:390 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:649 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:719 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:844 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:1016 msgid "Could not find the database on the server." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:469 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:468 msgid "Database connected." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:488 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:485 msgid "Database could not be disconnected." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:492 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:489 msgid "Database disconnected." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:777 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:772 #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:483 #: pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py:522 #: pgadmin/browser/server_groups/servers/databases/extensions/__init__.py:357 @@ -803,10 +803,10 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:548 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:488 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py:453 -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:830 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:829 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py:441 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:462 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1051 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1085 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:474 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py:565 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py:591 @@ -824,11 +824,11 @@ msgstr "" msgid "Error: Object not found." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:780 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:775 msgid "The specified database could not be found.\n" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:876 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:871 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:728 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1561 msgid " -- definition incomplete" @@ -921,19 +921,19 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:93 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:39 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:210 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:182 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:107 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:670 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:712 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:119 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:105 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:53 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:292 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:181 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:106 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:669 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:710 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:118 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:104 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:52 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:289 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:358 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:131 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:130 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:265 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:324 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:184 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:183 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:324 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:148 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:112 @@ -985,22 +985,22 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:114 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js:65 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:393 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:185 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:110 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:673 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:716 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:123 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:109 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:295 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:184 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:109 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:672 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:714 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:122 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:108 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:292 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:361 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:146 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:145 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:254 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:327 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:187 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:186 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:328 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:151 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:115 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:312 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:309 #: pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js:87 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:391 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:344 @@ -1115,56 +1115,56 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:654 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:658 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:662 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:137 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:158 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:692 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:702 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:747 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:750 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:758 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:781 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:735 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:748 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:772 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:789 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:805 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:853 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:144 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:416 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:513 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:538 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:561 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:576 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:604 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:130 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:402 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:499 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:523 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:550 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:565 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:593 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:315 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:346 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:349 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:136 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:157 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:691 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:701 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:746 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:749 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:757 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:780 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:733 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:746 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:770 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:787 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:803 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:851 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:143 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:415 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:512 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:537 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:560 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:575 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:603 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:129 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:401 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:498 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:522 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:549 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:564 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:592 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:311 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:342 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:345 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:384 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:388 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:392 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:396 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:400 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:404 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:407 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:411 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:415 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:418 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:440 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:166 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:179 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:191 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:207 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:250 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:268 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:292 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:318 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:323 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:414 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:436 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:165 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:190 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:249 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:267 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:291 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:317 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:322 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:350 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:375 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:385 @@ -1176,14 +1176,14 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:173 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:136 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:140 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:338 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:343 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:367 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:376 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:381 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:335 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:340 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:364 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:373 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:378 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:383 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:386 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:389 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:393 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:390 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:395 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:408 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:412 @@ -1238,22 +1238,22 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js:74 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:403 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:674 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:306 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:113 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:676 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:719 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:127 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:113 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:59 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:477 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:305 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:112 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:675 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:717 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:126 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:112 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:58 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:473 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:411 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:203 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:202 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:397 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:515 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:514 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:762 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:169 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:132 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:334 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:331 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:465 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:140 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:206 @@ -1336,7 +1336,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:331 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:154 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:118 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:315 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:312 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:355 #: pgadmin/dashboard/static/js/dashboard.js:1129 #: pgadmin/dashboard/static/js/dashboard.js:1387 @@ -1348,7 +1348,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:111 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:155 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:242 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:199 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:198 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:286 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:103 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:144 @@ -1357,28 +1357,28 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:120 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:39 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:316 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:315 msgid "Trigger function" msgstr "" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:124 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:205 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:267 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:272 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:347 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:387 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:391 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:404 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:417 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:429 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:459 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:464 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:204 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:266 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:271 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:346 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:386 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:390 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:403 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:416 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:428 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:458 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:463 msgid "Events" msgstr "" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:132 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:264 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:456 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:263 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:455 msgid "When" msgstr "" @@ -1397,7 +1397,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:784 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:222 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:169 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:409 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:406 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:514 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:378 msgid "Security labels" @@ -1430,14 +1430,14 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1124 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:167 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:130 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:317 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:320 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:323 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:326 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:329 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:332 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:400 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:412 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:467 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:397 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:409 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:464 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:516 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:360 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:372 @@ -1544,11 +1544,11 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:189 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:479 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:195 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:321 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:495 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:530 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:320 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:491 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:529 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:811 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:455 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:452 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:473 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:163 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:221 @@ -1748,8 +1748,8 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:214 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:129 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:161 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:319 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:396 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:316 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:393 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:420 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:427 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:440 @@ -1927,7 +1927,7 @@ msgid "Schema dropped" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:781 -#: pgadmin/static/js/backform.pgadmin.js:1837 +#: pgadmin/static/js/backform.pgadmin.js:1833 msgid "Definition incomplete." msgstr "" @@ -1946,23 +1946,23 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:594 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:60 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:23 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:269 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:268 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:786 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:787 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:788 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:909 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:898 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:899 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:143 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:344 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:417 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:908 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:896 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:897 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:142 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:340 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:413 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:421 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:427 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:428 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:401 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:495 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:496 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:461 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:460 #: pgadmin/tools/import_export/static/js/import_export.js:179 #: pgadmin/tools/import_export/static/js/import_export.js:199 #: pgadmin/tools/import_export/static/js/import_export.js:237 @@ -2011,7 +2011,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:85 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:171 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:449 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:375 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:372 msgid "Collation" msgstr "" @@ -2125,7 +2125,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js:65 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:415 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:21 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:127 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:614 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:679 msgid "Check" @@ -2133,7 +2133,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js:97 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:419 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:136 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:135 msgid "No inherit?" msgstr "" @@ -2144,7 +2144,7 @@ msgid "Validate?" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:177 msgid "Check cannot be empty." msgstr "" @@ -2249,8 +2249,8 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py:1285 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py:1330 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1367 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1417 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1401 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1451 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1356 msgid "-- Please create column(s) first..." msgstr "" @@ -2259,8 +2259,6 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:487 #: pgadmin/browser/static/js/browser.js:213 #: pgadmin/misc/static/explain/js/explain.js:1219 -#: pgadmin/misc/static/explain/js/explain.js:1348 -#: pgadmin/misc/static/explain/js/explain.js:1349 #: pgadmin/misc/statistics/static/js/statistics.js:129 msgid "Statistics" msgstr "" @@ -2270,7 +2268,7 @@ msgid "Inherited From" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:259 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:176 msgid "Column Name cannot be empty." msgstr "" @@ -2467,7 +2465,7 @@ msgid "FTS Dictionary..." msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js:153 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:342 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:339 msgid "Template" msgstr "" @@ -2613,7 +2611,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:59 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:21 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:457 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:434 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:431 msgid "Functions" msgstr "" @@ -2626,29 +2624,29 @@ msgstr "" msgid "Could not find the function node in the database." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:833 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:832 msgid "The specified function could not be found.\n" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:850 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:849 msgid "Function dropped." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1141 -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1320 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1140 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1319 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:334 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:511 msgid "Could not find the function in the database." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1628 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1627 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js:24 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:621 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js:24 msgid "Procedures" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1728 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1727 msgid "Trigger Functions" msgstr "" @@ -2688,7 +2686,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:327 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:150 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:79 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:322 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:321 msgid "Arguments" msgstr "" @@ -2712,8 +2710,8 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:182 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:98 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:100 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:289 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:493 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:288 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:492 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:154 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:155 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:209 @@ -2781,7 +2779,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:338 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:245 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1119 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:405 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:402 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:508 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:366 #: pgadmin/tools/debugger/static/js/direct.js:1707 @@ -2821,7 +2819,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:406 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js:200 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:314 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:338 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:337 msgid "Code cannot be empty." msgstr "" @@ -3011,7 +3009,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:56 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:25 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:450 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:428 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:425 msgid "Sequences" msgstr "" @@ -3174,22 +3172,22 @@ msgid "System schema?" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:409 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:322 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:319 msgid "Default TABLE privileges" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:412 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:325 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:322 msgid "Default SEQUENCE privileges" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:415 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:328 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:325 msgid "Default FUNCTION privileges" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:418 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:331 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:328 msgid "Default TYPE privileges" msgstr "" @@ -3198,9 +3196,9 @@ msgid "Default privileges" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:443 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:53 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:29 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:422 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:419 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:130 msgid "Tables" msgstr "" @@ -3208,7 +3206,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:464 #: pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py:58 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:24 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:445 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:442 msgid "Types" msgstr "" @@ -3269,8 +3267,8 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:185 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:221 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:527 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:791 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:808 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:789 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:806 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:275 #: pgadmin/browser/static/js/browser.js:630 #: pgadmin/browser/static/js/node.js:1283 @@ -3279,17 +3277,17 @@ msgstr "" #: pgadmin/misc/file_manager/templates/file_manager/index.html:78 #: pgadmin/static/js/backform.pgadmin.js:538 #: pgadmin/static/js/backgrid.pgadmin.js:621 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1741 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1786 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2385 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1735 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1780 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2379 msgid "Yes" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:185 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:221 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:527 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:792 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:809 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:790 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:807 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:275 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:147 #: pgadmin/browser/static/js/browser.js:631 @@ -3299,9 +3297,9 @@ msgstr "" #: pgadmin/misc/file_manager/templates/file_manager/index.html:77 #: pgadmin/static/js/backform.pgadmin.js:539 #: pgadmin/static/js/backgrid.pgadmin.js:622 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1742 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1787 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2386 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1736 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1781 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2380 msgid "No" msgstr "" @@ -3313,32 +3311,32 @@ msgstr "" msgid "Target object cannot be empty." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:359 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:357 msgid "Could not find the table." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:596 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1271 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:630 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1305 msgid "The specified table could not be found." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1054 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1088 msgid "The specified table could not be found.\n" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1067 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1101 msgid "Table dropped" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1145 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1179 msgid "Trigger(s) have been disabled" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1147 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1181 msgid "Trigger(s) have been enabled" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1501 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1535 #, python-format msgid "Table rows counted: %s" msgstr "" @@ -3391,7 +3389,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:608 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:704 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:856 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:853 msgid "Could not find the column on the server." msgstr "" @@ -3537,70 +3535,70 @@ msgstr "" msgid "Compound Trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:56 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:62 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:68 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:74 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:90 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:61 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:67 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:73 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:89 msgid "Compound Trigger..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:80 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:79 msgid "Enable compound trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:85 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:84 msgid "Disable compound trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:169 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:168 msgid "Disable compound trigger failed" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:188 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:190 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:187 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:189 msgid "Trigger enabled?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:205 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:209 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:222 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:235 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:248 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:204 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:208 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:221 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:234 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:247 msgid "FOR Events" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:207 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:389 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:388 msgid "INSERT" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:220 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:402 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:219 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:401 msgid "UPDATE" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:233 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:415 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:232 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:414 msgid "DELETE" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:246 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:428 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:245 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:427 msgid "TRUNCATE" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:303 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:512 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:302 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:511 msgid "System trigger?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:328 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:543 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:327 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:542 msgid "Specify at least one event." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:347 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:346 msgid "" "-- Enter any global declarations below:\n" "\n" @@ -3670,15 +3668,15 @@ msgstr "" msgid "Check constraint updated." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:40 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:39 msgid "Check..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:46 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:45 msgid "Validate check constraint" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:157 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:156 msgid "Don't validate?" msgstr "" @@ -3714,7 +3712,7 @@ msgid "Exclusion constraint dropped." msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:38 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:97 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:96 msgid "Operator class" msgstr "" @@ -3742,10 +3740,10 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:453 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:381 #: pgadmin/browser/server_groups/servers/static/js/variable.js:341 -#: pgadmin/static/js/backform.pgadmin.js:1260 -#: pgadmin/static/js/backform.pgadmin.js:1370 -#: pgadmin/static/js/backform.pgadmin.js:1550 -#: pgadmin/static/js/backform.pgadmin.js:1669 +#: pgadmin/static/js/backform.pgadmin.js:1259 +#: pgadmin/static/js/backform.pgadmin.js:1366 +#: pgadmin/static/js/backform.pgadmin.js:1546 +#: pgadmin/static/js/backform.pgadmin.js:1665 msgid "Add new row" msgstr "" @@ -3757,7 +3755,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:28 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:28 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:29 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:236 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:234 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/stats.sql:7 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/stats.sql:12 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/stats.sql:7 @@ -3767,87 +3765,87 @@ msgstr "" msgid "Index size" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:642 msgid "Exclusion constraint..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:691 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:512 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:498 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:298 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:690 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:511 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:497 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:295 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:378 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:344 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:196 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:366 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:363 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:40 #: pgadmin/tools/backup/static/js/backup.js:366 #: pgadmin/tools/restore/static/js/restore.js:255 msgid "Tablespace" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:701 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:700 msgid "Access method" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:716 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:326 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:715 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:322 msgid "Changing access method will clear columns collection" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:746 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:560 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:549 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:386 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:745 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:559 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:548 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:382 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:716 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:790 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:204 msgid "Fill factor" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:749 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:734 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:575 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:564 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:267 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:748 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:732 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:574 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:563 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:266 msgid "Deferrable?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:757 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:747 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:603 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:592 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:291 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:756 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:745 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:602 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:591 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:290 msgid "Deferred?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:779 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:413 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:778 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:409 msgid "Constraint" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:908 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:415 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:401 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:348 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:439 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:907 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:414 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:400 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:344 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:435 msgid "Include columns" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:931 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:242 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:438 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:228 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:424 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:370 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:461 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:930 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:241 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:437 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:227 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:423 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:366 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:457 msgid "Select the column(s)" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1012 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1011 msgid "Please specify name for exclusion constraint." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1018 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1017 msgid "Please specify columns for exclusion constraint." msgstr "" @@ -3905,53 +3903,53 @@ msgstr "" msgid "Referencing" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:616 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:615 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:585 msgid "Foreign key" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:637 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:635 msgid "Foreign key..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:641 msgid "Validate foreign key" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:771 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:769 msgid "Match type" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:788 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:786 msgid "Validated?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:804 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:802 msgid "Auto FK index?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:852 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:850 msgid "Covering index" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1002 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1000 msgid "On update" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1003 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1023 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1001 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1021 msgid "Action" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1022 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1020 msgid "On delete" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1050 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1048 msgid "Please specify columns for Foreign key." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1059 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1057 msgid "Please specify covering index name." msgstr "" @@ -3996,7 +3994,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py:996 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:20 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:43 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:42 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:557 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:729 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:811 @@ -4005,7 +4003,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py:1006 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:20 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:43 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:42 msgid "Unique constraint" msgstr "" @@ -4013,19 +4011,19 @@ msgstr "" msgid "Could not find the constraint in the table." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:536 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:522 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:231 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:535 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:521 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:229 msgid "Index" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:644 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:633 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:632 #, python-format msgid "Please specify columns for %s" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:56 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:55 msgid "Oid" msgstr "" @@ -4052,7 +4050,7 @@ msgid "Index is dropped" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:29 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:236 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:234 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:45 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:33 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:49 @@ -4069,59 +4067,63 @@ msgstr "" msgid "Size" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:130 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:128 msgid "Sort order" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:151 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:149 msgid "NULLs" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:248 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:254 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:260 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:266 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:272 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:245 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:251 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:257 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:263 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:269 msgid "Index..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:311 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:308 msgid "Access Method" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:390 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:386 msgid "Unique?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:394 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:390 msgid "Clustered?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:398 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:394 msgid "Valid?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:402 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:398 msgid "Primary?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:406 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:402 msgid "System index?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:409 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:405 msgid "Concurrent build?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:501 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:497 +msgid "Tablespace cannot be empty." +msgstr "" + +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:503 msgid "Access method cannot be empty." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:509 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:511 msgid "You must specify column name." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:514 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:516 msgid "You must specify at least one column." msgstr "" @@ -4512,39 +4514,39 @@ msgstr "" msgid "rule" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:93 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:99 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:105 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:111 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:117 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:92 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:98 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:104 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:110 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:116 msgid "Rule..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:165 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:164 #: pgadmin/static/js/sqleditor/query_tool_notifications.js:32 #: pgadmin/static/js/sqleditor/query_tool_notifications.js:80 msgid "Event" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:179 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:178 msgid "Do instead?" msgstr "" +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:182 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:183 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:184 msgid "Condition" msgstr "" +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:188 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:189 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:190 msgid "Commands" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:195 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:194 msgid "System rule?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:215 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:214 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:241 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:183 msgid "Please specify name." @@ -5106,56 +5108,56 @@ msgstr "" msgid "Trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:56 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:62 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:68 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:74 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:90 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:61 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:67 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:73 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:89 msgid "Trigger..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:80 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:79 msgid "Enable trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:85 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:84 msgid "Disable trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:169 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:168 msgid "Disable trigger failed" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:205 msgid "Row trigger?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:247 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:246 msgid "Constraint trigger?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:346 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:345 msgid "Fires" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:481 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:480 msgid "Old table" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:482 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:488 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:481 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:487 msgid "Transition" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:487 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:486 msgid "New table" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:536 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:535 msgid "Trigger function cannot be empty." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:556 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:555 msgid "Trigger code cannot be empty." msgstr "" @@ -5539,7 +5541,7 @@ msgid "Size of temporary files" msgstr "" #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:45 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:309 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:306 #: pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/stats.sql:2 #: pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/stats.sql:2 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:176 @@ -5593,35 +5595,35 @@ msgstr "" msgid "Are you sure you want to disconnect the database - %s?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:337 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:334 #: pgadmin/static/js/browser/server_groups/servers/databases/external_tables/external_tables.js:52 #: pgadmin/tools/backup/static/js/backup.js:192 #: pgadmin/tools/import_export/static/js/import_export.js:108 msgid "Encoding" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:380 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:377 msgid "Character type" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:385 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:382 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:413 msgid "Connection limit" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:388 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:385 msgid "Template?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:392 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:389 msgid "Allow connections?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:417 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:414 msgid "Default Privileges" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:499 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:496 msgid "Connect to database" msgstr "" @@ -6442,7 +6444,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:139 #: pgadmin/browser/static/js/browser.js:224 #: pgadmin/dashboard/static/js/dashboard.js:191 -#: pgadmin/static/js/backform.pgadmin.js:2032 +#: pgadmin/static/js/backform.pgadmin.js:2028 msgid "SQL" msgstr "" @@ -6954,7 +6956,7 @@ msgid "At least one privilege should be selected." msgstr "" #: pgadmin/browser/server_groups/servers/static/js/server.js:46 -msgid "Security label must be specified." +msgid "Label must be specified." msgstr "" #: pgadmin/browser/server_groups/servers/static/js/server.js:79 @@ -7054,20 +7056,20 @@ msgstr "" #: pgadmin/misc/file_manager/static/js/create_dialogue.js:188 #: pgadmin/misc/file_manager/static/js/select_dialogue.js:86 #: pgadmin/misc/file_manager/static/js/select_dialogue.js:129 -#: pgadmin/preferences/static/js/preferences.js:435 +#: pgadmin/preferences/static/js/preferences.js:434 #: pgadmin/static/js/slickgrid/editors.js:50 -#: pgadmin/static/js/sqleditor/filter_dialog.js:79 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:62 -#: pgadmin/tools/datagrid/static/js/show_data.js:139 +#: pgadmin/static/js/sqleditor/filter_dialog.js:78 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:61 +#: pgadmin/tools/datagrid/static/js/show_data.js:138 #: pgadmin/tools/debugger/static/js/debugger_ui.js:588 #: pgadmin/tools/debugger/static/js/debugger_ui.js:893 #: pgadmin/tools/import_export/static/js/import_export.js:495 -#: pgadmin/tools/maintenance/static/js/maintenance.js:297 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:56 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2010 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2164 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4222 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4289 +#: pgadmin/tools/maintenance/static/js/maintenance.js:296 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:55 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2004 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2158 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4216 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4283 msgid "Cancel" msgstr "" @@ -7288,7 +7290,7 @@ msgid "Connection timeout (seconds)" msgstr "" #: pgadmin/browser/server_groups/servers/static/js/server.js:1130 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2192 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2186 msgid "Connect to Server" msgstr "" @@ -7539,17 +7541,15 @@ msgid "Dependents" msgstr "" #: pgadmin/browser/static/js/browser.js:348 -#: pgadmin/browser/static/js/toolbar.js:30 -#: pgadmin/browser/static/js/toolbar.js:31 -#: pgadmin/browser/static/js/toolbar.js:91 +#: pgadmin/browser/static/js/toolbar.js:29 +#: pgadmin/browser/static/js/toolbar.js:88 #: pgadmin/tools/datagrid/static/js/datagrid.js:74 msgid "View Data" msgstr "" #: pgadmin/browser/static/js/browser.js:349 #: pgadmin/browser/static/js/toolbar.js:20 -#: pgadmin/browser/static/js/toolbar.js:21 -#: pgadmin/browser/static/js/toolbar.js:93 +#: pgadmin/browser/static/js/toolbar.js:90 #: pgadmin/tools/datagrid/static/js/datagrid.js:75 msgid "Filtered Rows" msgstr "" @@ -7789,10 +7789,10 @@ msgid "Changes will be lost. Are you sure you want to reset?" msgstr "" #: pgadmin/browser/static/js/node.js:1513 -#: pgadmin/preferences/static/js/preferences.js:439 -#: pgadmin/preferences/static/js/preferences.js:464 +#: pgadmin/preferences/static/js/preferences.js:438 +#: pgadmin/preferences/static/js/preferences.js:463 #: pgadmin/tools/datagrid/templates/datagrid/index.html:37 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4297 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4291 msgid "Save" msgstr "" @@ -7812,20 +7812,17 @@ msgstr "" msgid "Unselect All" msgstr "" -#: pgadmin/browser/static/js/toolbar.js:40 -#: pgadmin/browser/static/js/toolbar.js:41 -#: pgadmin/browser/static/js/toolbar.js:89 +#: pgadmin/browser/static/js/toolbar.js:38 +#: pgadmin/browser/static/js/toolbar.js:86 #: pgadmin/tools/datagrid/static/js/datagrid.js:103 #: pgadmin/tools/datagrid/static/js/datagrid.js:115 #: pgadmin/tools/sqleditor/__init__.py:68 msgid "Query Tool" msgstr "" -#: pgadmin/browser/static/js/wizard.js:85 #: pgadmin/browser/static/js/wizard.js:86 #: pgadmin/static/js/alertify.pgadmin.defaults.js:261 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:263 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:457 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:455 #: pgadmin/templates/security/messages.html:7 #: pgadmin/tools/user_management/static/js/user_management.js:81 #: pgadmin/tools/user_management/static/js/user_management.js:174 @@ -7833,11 +7830,9 @@ msgstr "" msgid "Close" msgstr "" -#: pgadmin/browser/static/js/wizard.js:88 #: pgadmin/browser/static/js/wizard.js:89 #: pgadmin/static/js/alertify.pgadmin.defaults.js:262 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:264 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:458 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:456 msgid "Maximize" msgstr "" @@ -7845,22 +7840,6 @@ msgstr "" msgid "Left panel logo" msgstr "" -#: pgadmin/browser/static/js/wizard.js:124 -msgid "Close error bar" -msgstr "" - -#: pgadmin/browser/static/js/wizard.js:131 -#: pgadmin/browser/templates/browser/index.html:135 pgadmin/help/__init__.py:59 -#: pgadmin/help/__init__.py:70 pgadmin/preferences/static/js/preferences.js:427 -#: pgadmin/static/js/sqleditor/filter_dialog.js:72 -#: pgadmin/static/js/sqleditor/filter_dialog.js:73 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:56 -#: pgadmin/tools/datagrid/static/js/show_data.js:133 -#: pgadmin/tools/maintenance/static/js/maintenance.js:289 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:50 -msgid "Help" -msgstr "" - #: pgadmin/browser/static/js/wizard.js:139 #: pgadmin/misc/file_manager/templates/file_manager/index.html:15 msgid "Back" @@ -7898,6 +7877,11 @@ msgstr "" msgid "Tools" msgstr "" +#: pgadmin/browser/templates/browser/index.html:135 pgadmin/help/__init__.py:59 +#: pgadmin/help/__init__.py:70 pgadmin/static/js/sqleditor/filter_dialog.js:72 +msgid "Help" +msgstr "" + #: pgadmin/browser/templates/browser/index.html:157 msgid "Logout" msgstr "" @@ -8286,7 +8270,7 @@ msgstr "" #: pgadmin/dashboard/templates/dashboard/database_dashboard.html:88 #: pgadmin/dashboard/templates/dashboard/server_dashboard.html:92 #: pgadmin/misc/file_manager/templates/file_manager/index.html:27 -#: pgadmin/preferences/static/js/preferences.js:492 +#: pgadmin/preferences/static/js/preferences.js:491 msgid "Refresh" msgstr "" @@ -8802,33 +8786,13 @@ msgstr "" msgid "Analysis" msgstr "" -#: pgadmin/misc/static/explain/js/explain.js:1286 -#: pgadmin/misc/static/explain/js/explain.js:1287 -msgid "Zoom in" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1295 -#: pgadmin/misc/static/explain/js/explain.js:1296 -msgid "Zoom to original" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1304 -#: pgadmin/misc/static/explain/js/explain.js:1305 -msgid "Zoom out" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1319 -#: pgadmin/misc/static/explain/js/explain.js:1320 -msgid "Download" -msgstr "" - #: pgadmin/misc/statistics/static/js/statistics.js:214 msgid "No statistics are available for the selected object." msgstr "" #: pgadmin/preferences/__init__.py:55 #: pgadmin/preferences/static/js/preferences.js:426 -#: pgadmin/preferences/static/js/preferences.js:449 +#: pgadmin/preferences/static/js/preferences.js:448 msgid "Preferences" msgstr "" @@ -8853,17 +8817,17 @@ msgstr "" msgid "Category is not selected." msgstr "" -#: pgadmin/preferences/static/js/preferences.js:483 +#: pgadmin/preferences/static/js/preferences.js:482 msgid "Refresh required" msgstr "" -#: pgadmin/preferences/static/js/preferences.js:484 +#: pgadmin/preferences/static/js/preferences.js:483 msgid "" "A page refresh is required to apply the theme. Do you wish to refresh the" " page now?" msgstr "" -#: pgadmin/preferences/static/js/preferences.js:493 +#: pgadmin/preferences/static/js/preferences.js:492 msgid "Later" msgstr "" @@ -8907,37 +8871,33 @@ msgstr "" msgid "INTERNAL SERVER ERROR" msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:1550 -msgid "Add" -msgstr "" - -#: pgadmin/static/js/backform.pgadmin.js:1841 +#: pgadmin/static/js/backform.pgadmin.js:1837 msgid "No updates." msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:1956 +#: pgadmin/static/js/backform.pgadmin.js:1952 msgid "General" msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:2157 +#: pgadmin/static/js/backform.pgadmin.js:2153 msgid "Preview not available..." msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:2618 +#: pgadmin/static/js/backform.pgadmin.js:2605 #: pgadmin/tools/backup/static/js/backup.js:95 #: pgadmin/tools/backup/static/js/backup.js:230 msgid "Note" msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:2974 +#: pgadmin/static/js/backform.pgadmin.js:2961 msgid "More" msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:2975 +#: pgadmin/static/js/backform.pgadmin.js:2962 msgid "Less" msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:3059 +#: pgadmin/static/js/backform.pgadmin.js:3046 msgid "Space" msgstr "" @@ -8966,7 +8926,7 @@ msgstr "" msgid "Delete row" msgstr "" -#: pgadmin/static/js/backgrid.pgadmin.js:1098 +#: pgadmin/static/js/backgrid.pgadmin.js:1091 msgid "Array Values" msgstr "" @@ -9118,13 +9078,13 @@ msgstr "" msgid "Sort/Filter options" msgstr "" -#: pgadmin/static/js/sqleditor/filter_dialog.js:239 +#: pgadmin/static/js/sqleditor/filter_dialog.js:238 msgid "Filter updated successfully" msgstr "" -#: pgadmin/static/js/sqleditor/filter_dialog.js:245 -#: pgadmin/tools/datagrid/static/js/show_data.js:238 -#: pgadmin/tools/datagrid/static/js/show_data.js:245 +#: pgadmin/static/js/sqleditor/filter_dialog.js:244 +#: pgadmin/tools/datagrid/static/js/show_data.js:237 +#: pgadmin/tools/datagrid/static/js/show_data.js:244 msgid "Validation Error" msgstr "" @@ -9205,7 +9165,6 @@ msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:40 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:41 -#: pgadmin/tools/datagrid/templates/datagrid/index.html:56 #: pgadmin/tools/datagrid/templates/datagrid/index.html:68 msgid "Find" msgstr "" @@ -9289,14 +9248,14 @@ msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:129 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:131 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4230 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4224 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:663 msgid "Commit" msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:135 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:137 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4227 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4221 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:681 msgid "Rollback" msgstr "" @@ -9372,7 +9331,7 @@ msgstr "" #: pgadmin/tools/backup/__init__.py:43 #: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:46 #: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:55 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:67 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:66 msgid "Backup" msgstr "" @@ -9652,8 +9611,8 @@ msgstr "" #: pgadmin/tools/backup/static/js/backup_dialog.js:71 #: pgadmin/tools/import_export/static/js/import_export.js:685 #: pgadmin/tools/import_export/static/js/import_export.js:699 -#: pgadmin/tools/maintenance/static/js/maintenance.js:477 -#: pgadmin/tools/maintenance/static/js/maintenance.js:488 +#: pgadmin/tools/maintenance/static/js/maintenance.js:476 +#: pgadmin/tools/maintenance/static/js/maintenance.js:487 #: pgadmin/tools/restore/static/js/restore_dialog.js:51 #: pgadmin/tools/restore/static/js/restore_dialog.js:75 msgid "Utility not found" @@ -9661,25 +9620,25 @@ msgstr "" #: pgadmin/tools/backup/static/js/backup_dialog.js:72 #: pgadmin/tools/import_export/static/js/import_export.js:700 -#: pgadmin/tools/maintenance/static/js/maintenance.js:489 +#: pgadmin/tools/maintenance/static/js/maintenance.js:488 #: pgadmin/tools/restore/static/js/restore_dialog.js:76 msgid "Failed to fetch Utility information" msgstr "" -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:159 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:158 msgid "Backup job created." msgstr "" -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:163 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:162 msgid "Backup job creation failed." msgstr "" -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:171 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:170 msgid "Backup job failed." msgstr "" -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:242 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:229 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:241 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:228 msgid "Please provide a filename" msgstr "" @@ -9728,7 +9687,7 @@ msgstr "" msgid "Data Filter" msgstr "" -#: pgadmin/tools/datagrid/static/js/show_data.js:161 +#: pgadmin/tools/datagrid/static/js/show_data.js:160 msgid "Use SHIFT + ENTER to apply filter..." msgstr "" @@ -10315,30 +10274,6 @@ msgstr "" msgid "Debugger - " msgstr "" -#: pgadmin/tools/debugger/templates/debugger/direct.html:59 -msgid "Step into" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:67 -msgid "Step over" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:75 -msgid "Continue/Start" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:85 -msgid "Toggle breakpoint" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:93 -msgid "Clear all breakpoints" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:103 -msgid "Stop" -msgstr "" - #: pgadmin/tools/grant_wizard/__init__.py:327 msgid "Unable to fetch the {} objects" msgstr "" @@ -10671,7 +10606,7 @@ msgstr "" #: pgadmin/tools/maintenance/static/js/maintenance.js:167 #: pgadmin/tools/maintenance/static/js/maintenance.js:183 -#: pgadmin/tools/maintenance/static/js/maintenance.js:483 +#: pgadmin/tools/maintenance/static/js/maintenance.js:482 msgid "Maintenance..." msgstr "" @@ -10685,15 +10620,15 @@ msgid "" "cannot be maintained using this utility." msgstr "" -#: pgadmin/tools/maintenance/static/js/maintenance.js:387 -#: pgadmin/tools/maintenance/static/js/maintenance.js:394 +#: pgadmin/tools/maintenance/static/js/maintenance.js:386 +#: pgadmin/tools/maintenance/static/js/maintenance.js:393 msgid "Maintenance job creation failed." msgstr "" #: pgadmin/tools/restore/__init__.py:41 #: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:40 #: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:49 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:62 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:61 msgid "Restore" msgstr "" @@ -10759,15 +10694,15 @@ msgstr "" msgid "Restore (%s: %s)" msgstr "" -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:149 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:148 msgid "Restore job created." msgstr "" -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:153 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:152 msgid "Restore job creation failed." msgstr "" -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:161 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:160 msgid "Restore job failed." msgstr "" @@ -10851,241 +10786,241 @@ msgstr "" msgid "Geometry Viewer" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:832 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:826 msgid "Editable column" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:834 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:828 msgid "Read-only column" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1261 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1255 msgid "Fetching all records..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1730 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2369 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3314 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1724 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2363 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3308 msgid "Unsaved changes" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1731 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3315 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1725 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3309 msgid "Are you sure you wish to discard the current changes?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1759 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1753 msgid "Clear history" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1760 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1754 msgid "Are you sure you wish to clear the history?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1761 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1755 msgid "" "This will remove all of your query history from this and other sessions " "for this database." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2125 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2119 msgid "Connection Warning" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2132 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2126 msgid "The application has lost the database connection:" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2136 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2130 msgid "⁃ If the connection was idle it may have been forcibly disconnected." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2138 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2132 msgid "⁃ The application server or database server may have been restarted." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2140 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2134 msgid "⁃ The user session may have timed out." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2144 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2138 msgid "Do you want to continue and establish a new session?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2163 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2157 msgid "Continue" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2299 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2293 #, python-format msgid "Error fetching SQL for script: %s." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2370 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2364 msgid "" "The data has been modified, but not saved. Are you sure you wish to " "discard the changes?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2414 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2408 msgid "Running query..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2422 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2416 msgid "Waiting for the query to complete..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2579 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2573 msgid "Loading data from the database server and rendering..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2588 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2582 #, python-format msgid "Successfully run. Total query runtime: %s." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2589 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2583 #, python-format msgid "%s rows affected." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2865 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2859 msgid "" "This query was generated by pgAdmin as part of a \"View/Edit Data\" " "operation" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2966 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2960 msgid "Row(s) deleted." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3040 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3034 msgid "Saving the updated data..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3156 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3150 msgid "Data saved successfully." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3159 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3153 msgid "Auto-commit is off. You still need to commit changes to the database." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3165 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3159 #, python-format msgid "%s." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3170 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3164 msgid "" "Saving data changes was rolled back but the current transaction is still " "active; previous queries are unaffected." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3192 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3186 msgid "This query was generated by pgAdmin as part of a \"Save Data\" operation" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3353 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3347 msgid "Loading the file..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3404 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3398 msgid "Saving the queries in the file..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3416 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3410 msgid "File saved successfully." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3538 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3597 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3532 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3591 msgid "Applying the new filter..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3558 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3568 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3552 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3562 msgid "Filter By Selection Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3617 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3627 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3611 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3621 msgid "Filter Exclude Selection Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3637 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3631 msgid "Removing the filter..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3655 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3665 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3649 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3659 msgid "Remove Filter Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3768 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3762 msgid "Setting the limit on the result..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3787 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3796 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3781 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3790 msgid "Change limit Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3922 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3941 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3916 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3935 msgid "Cancel Query Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3960 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3954 msgid "Downloading CSV..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4014 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4008 msgid "CSV Download cancelled." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4017 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4011 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:395 msgid "Download CSV" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4020 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4014 msgid "Download CSV error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4054 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4061 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4048 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4055 msgid "Auto Rollback Error" msgstr "" +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4081 #: pgadmin/tools/sqleditor/static/js/sqleditor.js:4087 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4093 msgid "Auto Commit Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4182 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4176 msgid "The data has changed. Do you want to save changes?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4188 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4182 msgid "The text has changed. Do you want to save changes?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4268 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4262 msgid "" "The current transaction is not commited to the database.Do you want to " "commit or rollback the transaction?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4271 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4265 msgid "Commit transaction?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4294 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4288 msgid "Don't save" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4337 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4331 msgid "Save changes?" msgstr "" diff --git a/web/pgadmin/misc/__init__.py b/web/pgadmin/misc/__init__.py index a96df4674..d0bef8e15 100644 --- a/web/pgadmin/misc/__init__.py +++ b/web/pgadmin/misc/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/misc/bgprocess/__init__.py b/web/pgadmin/misc/bgprocess/__init__.py index bc5fe5900..be17a8309 100644 --- a/web/pgadmin/misc/bgprocess/__init__.py +++ b/web/pgadmin/misc/bgprocess/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/misc/bgprocess/process_executor.py b/web/pgadmin/misc/bgprocess/process_executor.py index 5e9b4d048..8f3c423d7 100755 --- a/web/pgadmin/misc/bgprocess/process_executor.py +++ b/web/pgadmin/misc/bgprocess/process_executor.py @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL License # ########################################################################## diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index b48d4bf73..1996bfa80 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -3,7 +3,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL License # ########################################################################## diff --git a/web/pgadmin/misc/bgprocess/static/js/bgprocess.js b/web/pgadmin/misc/bgprocess/static/js/bgprocess.js index e63466a0e..c6df35c92 100644 --- a/web/pgadmin/misc/bgprocess/static/js/bgprocess.js +++ b/web/pgadmin/misc/bgprocess/static/js/bgprocess.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/dependencies/__init__.py b/web/pgadmin/misc/dependencies/__init__.py index 636539232..06ceebf4a 100644 --- a/web/pgadmin/misc/dependencies/__init__.py +++ b/web/pgadmin/misc/dependencies/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/misc/dependencies/static/js/dependencies.js b/web/pgadmin/misc/dependencies/static/js/dependencies.js index f59c2c565..09dbd6913 100644 --- a/web/pgadmin/misc/dependencies/static/js/dependencies.js +++ b/web/pgadmin/misc/dependencies/static/js/dependencies.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/dependents/__init__.py b/web/pgadmin/misc/dependents/__init__.py index 6f4c040dd..cb6c56629 100644 --- a/web/pgadmin/misc/dependents/__init__.py +++ b/web/pgadmin/misc/dependents/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/misc/dependents/static/js/dependents.js b/web/pgadmin/misc/dependents/static/js/dependents.js index 357198084..ec00d6182 100644 --- a/web/pgadmin/misc/dependents/static/js/dependents.js +++ b/web/pgadmin/misc/dependents/static/js/dependents.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py index 19eecc1a6..160f3466f 100644 --- a/web/pgadmin/misc/file_manager/__init__.py +++ b/web/pgadmin/misc/file_manager/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/misc/file_manager/static/js/create_dialogue.js b/web/pgadmin/misc/file_manager/static/js/create_dialogue.js index a3c44ec88..0eeee4cec 100644 --- a/web/pgadmin/misc/file_manager/static/js/create_dialogue.js +++ b/web/pgadmin/misc/file_manager/static/js/create_dialogue.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/file_manager/static/js/file_manager.js b/web/pgadmin/misc/file_manager/static/js/file_manager.js index d0a26a900..a3b66b9f1 100644 --- a/web/pgadmin/misc/file_manager/static/js/file_manager.js +++ b/web/pgadmin/misc/file_manager/static/js/file_manager.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/file_manager/static/js/helpers.js b/web/pgadmin/misc/file_manager/static/js/helpers.js index 6467fa8b1..f36d09f6f 100644 --- a/web/pgadmin/misc/file_manager/static/js/helpers.js +++ b/web/pgadmin/misc/file_manager/static/js/helpers.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/file_manager/static/js/select_dialogue.js b/web/pgadmin/misc/file_manager/static/js/select_dialogue.js index 219e6ba4f..e6ec14d10 100644 --- a/web/pgadmin/misc/file_manager/static/js/select_dialogue.js +++ b/web/pgadmin/misc/file_manager/static/js/select_dialogue.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js index 25aeaebe0..9b85290a9 100644 --- a/web/pgadmin/misc/file_manager/static/js/utility.js +++ b/web/pgadmin/misc/file_manager/static/js/utility.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/sql/__init__.py b/web/pgadmin/misc/sql/__init__.py index 3a13bd84a..f8a167001 100644 --- a/web/pgadmin/misc/sql/__init__.py +++ b/web/pgadmin/misc/sql/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/misc/sql/static/js/sql.js b/web/pgadmin/misc/sql/static/js/sql.js index 0f826bff9..a5167d365 100644 --- a/web/pgadmin/misc/sql/static/js/sql.js +++ b/web/pgadmin/misc/sql/static/js/sql.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/static/explain/js/explain.js b/web/pgadmin/misc/static/explain/js/explain.js index 5da60aa1d..acf284472 100644 --- a/web/pgadmin/misc/static/explain/js/explain.js +++ b/web/pgadmin/misc/static/explain/js/explain.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/static/explain/js/explain_statistics.js b/web/pgadmin/misc/static/explain/js/explain_statistics.js index 51ff772c7..2a818bc5b 100644 --- a/web/pgadmin/misc/static/explain/js/explain_statistics.js +++ b/web/pgadmin/misc/static/explain/js/explain_statistics.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/static/explain/js/image_maper.js b/web/pgadmin/misc/static/explain/js/image_maper.js index 98998b172..babd2a63c 100644 --- a/web/pgadmin/misc/static/explain/js/image_maper.js +++ b/web/pgadmin/misc/static/explain/js/image_maper.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/static/explain/js/svg_downloader.js b/web/pgadmin/misc/static/explain/js/svg_downloader.js index 451912661..4bb37ed9a 100644 --- a/web/pgadmin/misc/static/explain/js/svg_downloader.js +++ b/web/pgadmin/misc/static/explain/js/svg_downloader.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/misc/statistics/__init__.py b/web/pgadmin/misc/statistics/__init__.py index 6880ca955..b2fbece0f 100644 --- a/web/pgadmin/misc/statistics/__init__.py +++ b/web/pgadmin/misc/statistics/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/misc/statistics/static/js/statistics.js b/web/pgadmin/misc/statistics/static/js/statistics.js index 50a460bb5..101ebd5f3 100644 --- a/web/pgadmin/misc/statistics/static/js/statistics.js +++ b/web/pgadmin/misc/statistics/static/js/statistics.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py index f588e401c..b22868fbb 100644 --- a/web/pgadmin/model/__init__.py +++ b/web/pgadmin/model/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/preferences/__init__.py b/web/pgadmin/preferences/__init__.py index b83731901..34c01879b 100644 --- a/web/pgadmin/preferences/__init__.py +++ b/web/pgadmin/preferences/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/preferences/static/js/preferences.js b/web/pgadmin/preferences/static/js/preferences.js index b28437a6f..08d5a688a 100644 --- a/web/pgadmin/preferences/static/js/preferences.js +++ b/web/pgadmin/preferences/static/js/preferences.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/redirects/__init__.py b/web/pgadmin/redirects/__init__.py index 8415be9b0..558dab236 100644 --- a/web/pgadmin/redirects/__init__.py +++ b/web/pgadmin/redirects/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/settings/__init__.py b/web/pgadmin/settings/__init__.py index b987d264a..b84a50723 100644 --- a/web/pgadmin/settings/__init__.py +++ b/web/pgadmin/settings/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/settings/static/js/settings.js b/web/pgadmin/settings/static/js/settings.js index 606693c3f..a79471a6c 100644 --- a/web/pgadmin/settings/static/js/settings.js +++ b/web/pgadmin/settings/static/js/settings.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/setup/__init__.py b/web/pgadmin/setup/__init__.py index 528b6a92d..486ccd2e3 100644 --- a/web/pgadmin/setup/__init__.py +++ b/web/pgadmin/setup/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/setup/data_directory.py b/web/pgadmin/setup/data_directory.py index 8433f994b..38fe1a458 100644 --- a/web/pgadmin/setup/data_directory.py +++ b/web/pgadmin/setup/data_directory.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/setup/db_upgrade.py b/web/pgadmin/setup/db_upgrade.py index 4b2b26368..80b6a1c2f 100644 --- a/web/pgadmin/setup/db_upgrade.py +++ b/web/pgadmin/setup/db_upgrade.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/setup/db_version.py b/web/pgadmin/setup/db_version.py index 52b237f50..c0867a85b 100644 --- a/web/pgadmin/setup/db_version.py +++ b/web/pgadmin/setup/db_version.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/setup/tests/__init__.py b/web/pgadmin/setup/tests/__init__.py index 7af45b1b5..168bc2e9b 100644 --- a/web/pgadmin/setup/tests/__init__.py +++ b/web/pgadmin/setup/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/setup/tests/test_export_import_servers.py b/web/pgadmin/setup/tests/test_export_import_servers.py index 8a1ffa103..b4d6d4e32 100644 --- a/web/pgadmin/setup/tests/test_export_import_servers.py +++ b/web/pgadmin/setup/tests/test_export_import_servers.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/setup/tests/test_permissions.py b/web/pgadmin/setup/tests/test_permissions.py index 9fdc0b0b6..e78abed5e 100644 --- a/web/pgadmin/setup/tests/test_permissions.py +++ b/web/pgadmin/setup/tests/test_permissions.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/setup/user_info.py b/web/pgadmin/setup/user_info.py index 3bc0f0dca..204b78400 100644 --- a/web/pgadmin/setup/user_info.py +++ b/web/pgadmin/setup/user_info.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/static/bundle/app.js b/web/pgadmin/static/bundle/app.js index 56e972176..71034c93e 100644 --- a/web/pgadmin/static/bundle/app.js +++ b/web/pgadmin/static/bundle/app.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/static/bundle/browser.js b/web/pgadmin/static/bundle/browser.js index 7ed9b725d..8fd744223 100644 --- a/web/pgadmin/static/bundle/browser.js +++ b/web/pgadmin/static/bundle/browser.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/static/bundle/codemirror.js b/web/pgadmin/static/bundle/codemirror.js index fda8f5af2..614fdc32f 100644 --- a/web/pgadmin/static/bundle/codemirror.js +++ b/web/pgadmin/static/bundle/codemirror.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/static/bundle/slickgrid.js b/web/pgadmin/static/bundle/slickgrid.js index 59755a511..20670b981 100644 --- a/web/pgadmin/static/bundle/slickgrid.js +++ b/web/pgadmin/static/bundle/slickgrid.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// @@ -14,9 +14,12 @@ import 'slickgrid/slick.grid'; import 'slickgrid/slick.dataview'; import 'slickgrid/slick.editors'; import 'slickgrid/slick.formatters'; +import 'slickgrid/slick.groupitemmetadataprovider'; import 'slickgrid/plugins/slick.autotooltips'; import 'slickgrid/plugins/slick.cellrangedecorator'; import 'slickgrid/plugins/slick.cellrangeselector'; +import 'slickgrid/plugins/slick.checkboxselectcolumn'; +import 'slickgrid/plugins/slick.rowselectionmodel'; import 'sources/slickgrid/custom_header_buttons'; export default window.Slick; diff --git a/web/pgadmin/static/js/alertify.pgadmin.defaults.js b/web/pgadmin/static/js/alertify.pgadmin.defaults.js index 79a7632df..4d78ce331 100644 --- a/web/pgadmin/static/js/alertify.pgadmin.defaults.js +++ b/web/pgadmin/static/js/alertify.pgadmin.defaults.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/static/js/alertify/dialog.js b/web/pgadmin/static/js/alertify/dialog.js index 6f4933720..d243e6241 100644 --- a/web/pgadmin/static/js/alertify/dialog.js +++ b/web/pgadmin/static/js/alertify/dialog.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/static/js/alertify/dialog_factory.js b/web/pgadmin/static/js/alertify/dialog_factory.js index cb0ae1552..683fa756d 100644 --- a/web/pgadmin/static/js/alertify/dialog_factory.js +++ b/web/pgadmin/static/js/alertify/dialog_factory.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/static/js/alertify/dialog_wrapper.js b/web/pgadmin/static/js/alertify/dialog_wrapper.js index 83186e710..77663805d 100644 --- a/web/pgadmin/static/js/alertify/dialog_wrapper.js +++ b/web/pgadmin/static/js/alertify/dialog_wrapper.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js index 11b504566..6c47ae2a5 100644 --- a/web/pgadmin/static/js/backform.pgadmin.js +++ b/web/pgadmin/static/js/backform.pgadmin.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// @@ -10,10 +10,10 @@ define([ 'sources/gettext', 'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'codemirror', 'sources/sqleditor_utils', - 'sources/keyboard_shortcuts', 'sources/window', 'sources/select2/configure_show_on_scroll', + 'sources/keyboard_shortcuts', 'sources/window', 'spectrum', 'pgadmin.backgrid', 'select2', 'bootstrap.toggle', ], function(gettext, _, $, Backbone, Backform, Backgrid, CodeMirror, - SqlEditorUtils, keyboardShortcuts, pgWindow, configure_show_on_scroll) { + SqlEditorUtils, keyboardShortcuts, pgWindow) { var pgAdmin = (window.pgAdmin = window.pgAdmin || {}), pgBrowser = pgAdmin.Browser; @@ -817,7 +817,7 @@ define([ }, }); - Backform.Accordian = Backform.Dialog.extend({ + Backform.Accordian = Backform.Dialog.extend({ className: function() { return 'set-group pg-el-12'; }, @@ -2129,7 +2129,9 @@ define([ formatter: Select2Formatter, template: _.template([ - '', + '<% if(label == false) {} else {%>', + ' ', + '<% }%>', '
', ' ', + ' <% if (helpMessage && helpMessage.length) { %>', + ' <%=helpMessage%>', + ' <% } %>', + '
', + ].join('\n')), + initialize: function() { + Backform.TextareaControl.prototype.initialize.apply(this, arguments); + this.sqlCtrl = null; + + _.bindAll(this, 'onFocus', 'onBlur', 'refreshTextArea', 'copyData',); + }, + render: function() { + let obj = Backform.SqlFieldControl.prototype.render.apply(this, arguments); + if(this.$el.find('.ddl-copy')) this.$el.find('.ddl-copy').on('click', this.copyData); + return obj; + }, + copyData() { + event.stopPropagation(); + clipboard.copyTextToClipboard(this.model.get('diff_ddl')); + return false; + }, + onFocus: function() { + let $ctrl = this.$el.find('.pgadmin-controls').first(), + $copy = this.$el.find('.ddl-copy'); + if (!$ctrl.hasClass('focused')) $ctrl.addClass('focused'); + if ($copy.hasClass('d-none')) $copy.removeClass('d-none'); + + }, + onBlur: function() { + let $copy = this.$el.find('.ddl-copy'); + if (!$(event.relatedTarget).hasClass('ddl-copy')) { + if (!$copy.hasClass('d-none')) $copy.addClass('d-none'); + this.$el.find('.pgadmin-controls').first().removeClass('focused'); + } + }, + + }); + +let SchemaDiffSelect2Control = + Backform.Select2Control.extend({ + defaults: _.extend(Backform.Select2Control.prototype.defaults, { + url: undefined, + transform: undefined, + url_with_id: false, + select2: { + allowClear: true, + placeholder: gettext('Select an item...'), + width: 'style', + templateResult: formatNode, + templateSelection: formatNode, + }, + controlsClassName: 'pgadmin-controls pg-el-sm-11 pg-el-12', + }), + className: function() { + return 'pgadmin-controls pg-el-sm-4'; + }, + events: { + 'focus select': 'clearInvalid', + 'keydown :input': 'processTab', + 'select2:select': 'onSelect', + 'select2:selecting': 'beforeSelect', + 'select2:clear': 'onChange', + }, + template: _.template([ + '<% if(label == false) {} else {%>', + ' ', + '<% }%>', + '
', + ' ', + ' <% if (helpMessage && helpMessage.length) { %>', + ' <%=helpMessage%>', + ' <% } %>', + '
', + ].join('\n')), + beforeSelect: function() { + var selVal = arguments[0].params.args.data.id; + + if(this.field.get('connect') && this.$el.find('option[value="'+selVal+'"]').attr('data-connected') !== 'connected') { + this.field.get('connect').apply(this, [selVal, this.changeIcon.bind(this)]); + } else { + $(this.$sel).trigger('change'); + setTimeout(function(){ this.onChange.apply(this); }.bind(this), 200); + } + }, + changeIcon: function(data) { + let span = this.$el.find('.select2-selection .select2-selection__rendered span.wcTabIcon'), + selSpan = this.$el.find('option:selected'); + + if (span.hasClass('icon-server-not-connected')) { + let icon = (data.icon) ? data.icon : 'icon-pg'; + span.removeClass('icon-server-not-connected'); + span.addClass(icon); + span.attr('data-connected', 'connected'); + + selSpan.data().image = icon; + selSpan.attr('data-connected', 'connected'); + + this.onChange.apply(this); + } + else if (span.hasClass('icon-database-not-connected')) { + let icon = (data.icon) ? data.icon : 'pg-icon-database'; + + span.removeClass('icon-database-not-connected'); + span.addClass(icon); + span.attr('data-connected', 'connected'); + + selSpan.removeClass('icon-database-not-connected'); + selSpan.data().image = icon; + selSpan.attr('data-connected', 'connected'); + + this.onChange.apply(this); + } + }, + onChange: function() { + var model = this.model, + attrArr = this.field.get('name').split('.'), + name = attrArr.shift(), + path = attrArr.join('.'), + value = this.getValueFromDOM(), + changes = {}, + that = this; + + if (this.model.errorModel instanceof Backbone.Model) { + if (_.isEmpty(path)) { + this.model.errorModel.unset(name); + } else { + var nestedError = this.model.errorModel.get(name); + if (nestedError) { + this.keyPathSetter(nestedError, path, null); + this.model.errorModel.set(name, nestedError); + } + } + } + + changes[name] = _.isEmpty(path) ? value : _.clone(model.get(name)) || {}; + + if (!_.isEmpty(path)) that.keyPathSetter(changes[name], path, value); + that.stopListening(that.model, 'change:' + name, that.render); + model.set(changes); + that.listenTo(that.model, 'change:' + name, that.render); + + }, + render: function() { + /* + * Initialization from the original control. + */ + this.fetchData(); + return Backform.Select2Control.prototype.render.apply(this, arguments); + + }, + fetchData: function() { + /* + * We're about to fetch the options required for this control. + */ + var self = this, + url = self.field.get('url'), + m = self.model; + + url = _.isFunction(url) ? url.apply(m) : url; + + if (url && self.field.get('deps')) { + url = url.replace('sid', m.get(self.field.get('deps')[0])); + } + + // Hmm - we found the url option. + // That means - we needs to fetch the options from that node. + if (url) { + var data; + + m.trigger('pgadmin:view:fetching', m, self.field); + $.ajax({ + async: false, + url: url, + }) + .done(function(res) { + /* + * We will cache this data for short period of time for avoiding + * same calls. + */ + data = res.data; + }) + .fail(function() { + m.trigger('pgadmin:view:fetch:error', m, self.field); + }); + + m.trigger('pgadmin:view:fetched', m, self.field); + // To fetch only options from cache, we do not need time from 'at' + // attribute but only options. + // + + /* + * Transform the data + */ + var transform = this.field.get('transform') || self.defaults.transform; + if (transform && _.isFunction(transform)) { + // We will transform the data later, when rendering. + // It will allow us to generate different data based on the + // dependencies. + self.field.set('options', transform.bind(self, data)); + } else { + self.field.set('options', data); + } + } + }, + }); + + +let SchemaDiffHeaderView = Backform.Form.extend({ + label: '', + className: function() { + return 'pg-el-sm-12 pg-el-md-12 pg-el-lg-12 pg-el-12'; + }, + tabPanelClassName: function() { + return Backform.tabClassName; + }, + tabIndex: 0, + initialize: function(opts) { + this.label = opts.label; + Backform.Form.prototype.initialize.apply(this, arguments); + }, + template: _.template(` +
+
Select Source
+
+
+
+
Select Target
+
+
+
+ + +
+ + ` + + [ + '', + '
', + '
', + '
', + '
', + ].join('\n') + ), + render: function() { + this.cleanup(); + + var controls = this.controls, + m = this.model, + self = this, + idx = (this.tabIndex * 100); + + this.$el.empty(); + + $(this.template()).appendTo(this.$el); + + this.fields.each(function(f) { + var cntr = new(f.get('control'))({ + field: f, + model: m, + dialog: self, + tabIndex: idx, + }); + + if (f.get('group') && f.get('group') == 'source') { + self.$el.find('.source').append(cntr.render().$el); + } + else { + self.$el.find('.target').append(cntr.render().$el); + } + + controls.push(cntr); + }); + + return this; + }, + remove: function(opts) { + if (opts && opts.data) { + if (this.model) { + if (this.model.reset) { + this.model.reset({ + validate: false, + silent: true, + stop: true, + }); + } + this.model.clear({ + validate: false, + silent: true, + stop: true, + }); + delete(this.model); + } + if (this.errorModel) { + this.errorModel.clear({ + validate: false, + silent: true, + stop: true, + }); + delete(this.errorModel); + } + } + this.cleanup(); + Backform.Form.prototype.remove.apply(this, arguments); + }, +}); + +let SchemaDiffFooterView = Backform.Form.extend({ + className: function() { + return 'set-group pg-el-12'; + }, + tabPanelClassName: function() { + return Backform.tabClassName; + }, + legendClass: 'badge', + contentClass: Backform.accordianContentClassName, + template: { + 'content': _.template(` +
+
Source
+
Target
+
Difference +
+
+ + `), + }, + initialize: function(opts) { + this.label = opts.label; + Backform.Form.prototype.initialize.apply(this, arguments); + }, + render: function() { + this.cleanup(); + + let m = this.model, + $el = this.$el, + tmpl = this.template, + controls = this.controls, + data = { + 'className': _.result(this, 'className'), + 'legendClass': _.result(this, 'legendClass'), + 'contentClass': _.result(this, 'contentClass'), + 'collapse': _.result(this, 'collapse'), + }, + idx = (this.tabIndex * 100); + + this.$el.empty(); + + let el = $((tmpl['content'])(data)).appendTo($el); + + this.fields.each(function(f) { + let cntr = new(f.get('control'))({ + field: f, + model: m, + dialog: self, + tabIndex: idx, + name: f.get('name'), + }); + + if (f.get('group') && f.get('group') == 'ddl-source') { + el.find('.ddl-source').append(cntr.render().$el); + } + else if (f.get('group') && f.get('group') == 'ddl-target') { + el.find('.ddl-target').append(cntr.render().$el); + } + else { + el.find('.ddl-diff').append(cntr.render().$el); + } + controls.push(cntr); + }); + + let $diff_sc = this.$el.find('.source_ddl'), + $diff_tr = this.$el.find('.target_ddl'), + $diff = this.$el.find('.diff_ddl'), + footer_height = this.$el.parent().height() - 50; + $diff_sc.height(footer_height); + $diff_sc.css({ + 'height': footer_height + 'px', + }); + $diff_tr.height(footer_height); + $diff_tr.css({ + 'height': footer_height + 'px', + }); + $diff.height(footer_height); + $diff.css({ + 'height': footer_height + 'px', + }); + + + return this; + }, +}); +export { + SchemaDiffSelect2Control, + SchemaDiffHeaderView, + SchemaDiffFooterView, + SchemaDiffSqlControl, +}; diff --git a/web/pgadmin/tools/schema_diff/static/js/schema_diff.js b/web/pgadmin/tools/schema_diff/static/js/schema_diff.js new file mode 100644 index 000000000..a565019bc --- /dev/null +++ b/web/pgadmin/tools/schema_diff/static/js/schema_diff.js @@ -0,0 +1,145 @@ +///////////////////////////////////////////////////////////// +// +// pgAdmin 4 - PostgreSQL Tools +// +// Copyright (C) 2013 - 2019, The pgAdmin Development Team +// This software is released under the PostgreSQL Licence +// +////////////////////////////////////////////////////////////// + +define('pgadmin.schemadiff', [ + 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', + 'sources/pgadmin', 'sources/csrf', 'pgadmin.browser.node', +], function( + gettext, url_for, $, _, pgAdmin, csrfToken +) { + + var wcDocker = window.wcDocker, + pgBrowser = pgAdmin.Browser; + /* Return back, this has been called more than once */ + if (pgBrowser.SchemaDiff) + return pgBrowser.SchemaDiff; + + // Create an Object Restore of pgBrowser class + pgBrowser.SchemaDiff = { + init: function() { + if (this.initialized) + return; + + this.initialized = true; + csrfToken.setPGCSRFToken(pgAdmin.csrf_token_header, pgAdmin.csrf_token); + + + // Define the nodes on which the menus to be appear + var menus = [{ + name: 'schema_diff', + module: this, + applies: ['tools'], + callback: 'show_schema_diff_tool', + priority: 1, + label: gettext('Schema Diff'), + enable: true, + }]; + + pgBrowser.add_menus(menus); + + // Creating a new pgBrowser frame to show the data. + var schemaDiffFrameType = new pgBrowser.Frame({ + name: 'frm_schemadiff', + showTitle: true, + isCloseable: true, + isPrivate: true, + url: 'about:blank', + }); + + let self = this; + /* Cache may take time to load for the first time + * Keep trying till available + */ + let cacheIntervalId = setInterval(function() { + if(pgBrowser.preference_version() > 0) { + self.preferences = pgBrowser.get_preferences_for_module('schema_diff'); + clearInterval(cacheIntervalId); + } + },0); + + pgBrowser.onPreferencesChange('schema_diff', function() { + self.preferences = pgBrowser.get_preferences_for_module('schema_diff'); + }); + + // Load the newly created frame + schemaDiffFrameType.load(pgBrowser.docker); + return this; + }, + + // Callback to draw schema diff for objects + show_schema_diff_tool: function() { + var self = this, + baseUrl = url_for('schema_diff.initialize', null); + + $.ajax({ + url: baseUrl, + method: 'GET', + dataType: 'json', + contentType: 'application/json', + }) + .done(function(res) { + self.trans_id = res.data.schemaDiffTransId; + res.data.panel_title = 'Schema Diff'; //TODO: Set the panel title + // TODO: Following function is used to test the fetching of the + // databases this should be moved to server selection event later. + self.launch_schema_diff(res.data); + }) + .fail(function(xhr) { + self.raise_error_on_fail(gettext('Schema Diff initialize error') , xhr); + }); + }, + + launch_schema_diff: function(data) { + var panel_title = data.panel_title, + trans_id = data.schemaDiffTransId, + panel_tooltip = ''; + + var url_params = { + 'trans_id': trans_id, + 'editor_title': panel_title, + }, + baseUrl = url_for('schema_diff.panel', url_params); + + if (this.preferences.schema_diff_new_browser_tab) { + window.open(baseUrl, '_blank'); + } else { + + var propertiesPanel = pgBrowser.docker.findPanels('properties'), + schemaDiffPanel = pgBrowser.docker.addPanel('frm_schemadiff', wcDocker.DOCK.STACKED, propertiesPanel[0]); + + // Set panel title and icon + schemaDiffPanel.title(''+panel_title+''); + schemaDiffPanel.icon('icon-schema-diff'); + schemaDiffPanel.focus(); + + var openSchemaDiffURL = function(j) { + // add spinner element + $(j).data('embeddedFrame').$container.append(pgBrowser.SchemaDiff.spinner_el); + setTimeout(function() { + var frameInitialized = $(j).data('frameInitialized'); + if (frameInitialized) { + var frame = $(j).data('embeddedFrame'); + if (frame) { + frame.openURL(baseUrl); + frame.$container.find('.pg-sp-container').delay(1000).hide(1); + } + } else { + openSchemaDiffURL(j); + } + }, 100); + }; + + openSchemaDiffURL(schemaDiffPanel); + } + + }, + }; + + return pgBrowser.SchemaDiff; +}); diff --git a/web/pgadmin/tools/schema_diff/static/js/schema_diff_hook.js b/web/pgadmin/tools/schema_diff/static/js/schema_diff_hook.js new file mode 100644 index 000000000..571e5c8d5 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/static/js/schema_diff_hook.js @@ -0,0 +1,38 @@ +///////////////////////////////////////////////////////////// +// +// pgAdmin 4 - PostgreSQL Tools +// +// Copyright (C) 2013 - 2019, The pgAdmin Development Team +// This software is released under the PostgreSQL Licence +// +////////////////////////////////////////////////////////////// + +define([ + 'sources/url_for', 'jquery', + 'sources/pgadmin', 'pgadmin.tools.schema_diff_ui', +], function( + url_for, $, pgAdmin, SchemaDiffUIModule +) { + var pgTools = pgAdmin.Tools = pgAdmin.Tools || {}; + var SchemaDiffUI = SchemaDiffUIModule.default; + + /* Return back, this has been called more than once */ + if (pgTools.SchemaDiffHook) + return pgTools.SchemaDiffHook; + + pgTools.SchemaDiffHook = { + load: function(trans_id) { + window.onbeforeunload = function() { + $.ajax({ + url: url_for('schemadiff.index') + 'close/'+trans_id, + method: 'DELETE', + }); + }; + + let schemaUi = new SchemaDiffUI($('#schema-diff-container'), trans_id); + schemaUi.render(); + }, + }; + + return pgTools.SchemaDiffHook; +}); diff --git a/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js b/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js new file mode 100644 index 000000000..2e62c95fc --- /dev/null +++ b/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js @@ -0,0 +1,845 @@ +///////////////////////////////////////////////////////////// +// +// pgAdmin 4 - PostgreSQL Tools +// +// Copyright (C) 2013 - 2019, The pgAdmin Development Team +// This software is released under the PostgreSQL Licence +// +////////////////////////////////////////////////////////////// + +import url_for from 'sources/url_for'; +import $ from 'jquery'; +import gettext from 'sources/gettext'; +import Alertify from 'pgadmin.alertifyjs'; +import Backbone from 'backbone'; +import Slick from 'sources/../bundle/slickgrid'; +import pgAdmin from 'sources/pgadmin'; +import {setPGCSRFToken} from 'sources/csrf'; +import {generateScript} from 'tools/datagrid/static/js/show_query_tool'; +import 'pgadmin.sqleditor'; +import pgWindow from 'sources/window'; + +import {SchemaDiffSelect2Control, SchemaDiffHeaderView, + SchemaDiffFooterView, SchemaDiffSqlControl} from './schema_diff.backform'; + +var wcDocker = window.wcDocker; + +export default class SchemaDiffUI { + constructor(container, trans_id) { + var self = this; + this.$container = container; + this.header = null; + this.trans_id = trans_id; + this.filters = ['Identical', 'Different', 'Source Only', 'Target Only']; + this.sel_filters = ['Identical', 'Different', 'Source Only', 'Target Only']; + this.dataView = null; + this.grid = null, + this.selection = {}; + + this.model = new Backbone.Model({ + source_sid: undefined, + source_did: undefined, + source_scid: undefined, + target_sid: undefined, + target_did: undefined, + target_scid: undefined, + source_ddl: undefined, + target_ddl: undefined, + diff_ddl: undefined, + }); + + setPGCSRFToken(pgAdmin.csrf_token_header, pgAdmin.csrf_token); + + this.docker = new wcDocker( + this.$container, { + allowContextMenu: false, + allowCollapse: false, + loadingClass: 'pg-sp-icon', + themePath: url_for('static', { + 'filename': 'css', + }), + theme: 'webcabin.overrides.css', + } + ); + + this.header_panel = new pgAdmin.Browser.Panel({ + name: 'schema_diff_header_panel', + showTitle: false, + isCloseable: false, + isPrivate: true, + content: '
', + elContainer: true, + }); + + this.footer_panel = new pgAdmin.Browser.Panel({ + name: 'schema_diff_footer_panel', + title: gettext('DDL Comparison'), + isCloseable: false, + isPrivate: true, + height: '60', + content: `
+
+
+
+
+
+
` + gettext('Comparing objects...') + `
+
+
`, + }); + + this.header_panel.load(this.docker); + this.footer_panel.load(this.docker); + + + this.panel_obj = this.docker.addPanel('schema_diff_header_panel', wcDocker.DOCK.TOP, {w:'95%', h:'50%'}); + this.footer_panel_obj = this.docker.addPanel('schema_diff_footer_panel', wcDocker.DOCK.BOTTOM, this.panel_obj, {w:'95%', h:'50%'}); + + self.footer_panel_obj.on(wcDocker.EVENT.VISIBILITY_CHANGED, function() { + setTimeout(function() { + this.resize_grid(); + }.bind(self), 200); + }); + + self.footer_panel_obj.on(wcDocker.EVENT.RESIZE_ENDED, function() { + setTimeout(function() { + this.resize_panels(); + }.bind(self), 200); + }); + + } + + + raise_error_on_fail(alert_title, xhr) { + try { + var err = JSON.parse(xhr.responseText); + Alertify.alert(alert_title, err.errormsg); + } catch (e) { + Alertify.alert(alert_title, e.statusText); + } + } + + resize_panels() { + let $src_ddl = $('#schema-diff-ddl-comp .source_ddl'), + $tar_ddl = $('#schema-diff-ddl-comp .target_ddl'), + $diff_ddl = $('#schema-diff-ddl-comp .diff_ddl'), + footer_height = $('#schema-diff-ddl-comp').height() - 50; + + $src_ddl.height(footer_height); + $src_ddl.css({ + 'height': footer_height + 'px', + }); + $tar_ddl.height(footer_height); + $tar_ddl.css({ + 'height': footer_height + 'px', + }); + $diff_ddl.height(footer_height); + $diff_ddl.css({ + 'height': footer_height + 'px', + }); + + this.resize_grid(); + } + + compare_schemas() { + var self = this, + url_params = self.model.toJSON(); + + if (url_params['source_sid'] == '' || _.isUndefined(url_params['source_sid']) || + url_params['source_did'] == '' || _.isUndefined(url_params['source_did']) || + url_params['source_scid'] == '' || _.isUndefined(url_params['source_scid']) || + url_params['target_sid'] == '' || _.isUndefined(url_params['target_sid']) || + url_params['target_did'] == '' || _.isUndefined(url_params['target_did']) || + url_params['target_scid'] == '' || _.isUndefined(url_params['target_scid']) + ) { + Alertify.alert(gettext('Selection Error'), gettext('Please select source and target.')); + return false; + } + + this.selection = JSON.parse(JSON.stringify(url_params)); + + url_params['trans_id'] = self.trans_id; + + _.each(url_params, function(key, val) { + url_params[key] = parseInt(val, 10); + }); + + var baseUrl = url_for('schema_diff.compare', url_params); + + self.model.set({ + 'source_ddl': undefined, + 'target_ddl': undefined, + 'diff_ddl': undefined, + }); + + self.render_grid([]); + self.footer.render(); + self.startDiffPoller(); + + return $.ajax({ + url: baseUrl, + method: 'GET', + dataType: 'json', + contentType: 'application/json', + }) + .done(function (res) { + self.stopDiffPoller(); + self.render_grid(res.data); + }) + .fail(function (xhr) { + self.raise_error_on_fail(gettext('Schema compare error'), xhr); + self.stopDiffPoller(); + }); + } + + generate_script() { + var self = this, + baseServerUrl = url_for('schema_diff.get_server', {'sid': self.selection['target_sid'], + 'did': self.selection['target_did']}), + sel_rows = self.grid ? self.grid.getSelectedRows() : [], + sel_rows_data = [], + url_params = self.selection, + generated_script = undefined, + open_query_tool; + + _.each(url_params, function(key, val) { + url_params[key] = parseInt(val, 10); + }); + + $('#diff_fetching_data').removeClass('d-none'); + $('#diff_fetching_data').find('.schema-diff-busy-text').text('Generating script...'); + + + open_query_tool = function get_server_details() { + $.ajax({ + url: baseServerUrl, + method: 'GET', + dataType: 'json', + contentType: 'application/json', + }) + .done(function (res) { + let data = res.data; + let server_data = {}; + if (data) { + server_data['sgid'] = data.gid; + server_data['sid'] = data.sid; + server_data['stype'] = data.type; + server_data['server'] = data.name; + server_data['user'] = data.user; + server_data['did'] = self.model.get('target_did'); + server_data['database'] = data.database; + + if (_.isUndefined(generated_script)) + generated_script = 'BEGIN;' + '\n' + self.model.get('diff_ddl') + '\n' + 'END;'; + + let preferences = pgWindow.pgAdmin.Browser.get_preferences_for_module('schema_diff'); + if (preferences.schema_diff_new_browser_tab) { + pgWindow.pgAdmin.ddl_diff = generated_script; + generateScript(server_data, pgWindow.pgAdmin.DataGrid); + } else { + pgWindow.pgAdmin.ddl_diff = generated_script; + generateScript(server_data, pgWindow.pgAdmin.DataGrid); + } + } + + $('#diff_fetching_data').find('.schema-diff-busy-text').text(''); + $('#diff_fetching_data').addClass('d-none'); + + }) + .fail(function (xhr) { + self.raise_error_on_fail(gettext('Generate script error'), xhr); + $('#diff_fetching_data').find('.schema-diff-busy-text').text(''); + $('#diff_fetching_data').addClass('d-none'); + }); + }; + + if (sel_rows.length > 0) { + for (var row = 0; row < sel_rows.length; row++) { + let data = self.grid.getData().getItem(sel_rows[row]); + + if (data.type) { + let tmp_data = { + 'node_type': data.type, + 'source_oid': parseInt(data.oid, 10), + 'target_oid': parseInt(data.oid, 10), + 'comp_status': data.status, + }; + + if(data.status && (data.status.toLowerCase() == 'different' || data.status.toLowerCase() == 'identical')) { + tmp_data['target_oid'] = data.target_oid; + } + sel_rows_data.push(tmp_data); + } + } + + url_params['sel_rows'] = sel_rows_data; + + let baseUrl = url_for('schema_diff.generate_script', {'trans_id': self.trans_id}); + + $.ajax({ + url: baseUrl, + method: 'POST', + dataType: 'json', + contentType: 'application/json', + data: JSON.stringify(url_params), + }) + .done(function (res) { + if (res) { + generated_script = 'BEGIN;' + '\n' + res.diff_ddl + '\n' + 'END;'; + } + open_query_tool(); + }) + .fail(function (xhr) { + self.raise_error_on_fail(gettext('Generate script error'), xhr); + $('#diff_fetching_data').addClass('d-none'); + }); + } else if (!_.isUndefined(self.model.get('diff_ddl'))) { + open_query_tool(); + } + return false; + } + + render_grid(data) { + + var self = this; + var grid; + + if (self.grid) { + // Only render the data + self.render_grid_data(data); + return; + } + // Checkbox Column + var checkboxSelector = new Slick.CheckboxSelectColumn({ + cssClass: 'slick-cell-checkboxsel', + minWidth: 30, + }); + + // Format Schema object title with appropriate icon + var formatColumnTitle = function (row, cell, value, columnDef, dataContext) { + let icon = 'icon-' + dataContext.type; + return '' + value + ''; + }; + + // Grid Columns + var grid_width = (self.grid_width - 47) / 2 ; + var columns = [ + checkboxSelector.getColumnDefinition(), + {id: 'title', name: 'Schema Objects', field: 'title', minWidth: grid_width, formatter: formatColumnTitle}, + {id: 'status', name: 'Comparison Result', field: 'status', minWidth: grid_width}, + {id: 'label', name: 'Schema Objects', field: 'label', width: 0, minWidth: 0, maxWidth: 0, + cssClass: 'really-hidden', headerCssClass: 'really-hidden'}, + {id: 'type', name: 'Schema Objects', field: 'type', width: 0, minWidth: 0, maxWidth: 0, + cssClass: 'really-hidden', headerCssClass: 'really-hidden'}, + {id: 'id', name: 'id', field: 'id', width: 0, minWidth: 0, maxWidth: 0, + cssClass: 'really-hidden', headerCssClass: 'really-hidden' }, + + ]; + + // Grid Options + var options = { + enableCellNavigation: true, + enableColumnReorder: false, + enableRowSelection: true, + }; + + // Grouping by Schema Object + self.groupBySchemaObject = function() { + self.dataView.setGrouping({ + getter: 'type', + formatter: function (g) { + let icon = 'icon-coll-' + g.value; + return '' + g.rows[0].label + ''; + }, + aggregateCollapsed: true, + lazyTotalsCalculation: true, + }); + }; + + var groupItemMetadataProvider = new Slick.Data.GroupItemMetadataProvider({ checkboxSelect: true, + checkboxSelectPlugin: checkboxSelector }); + + // Dataview for grid + self.dataView = new Slick.Data.DataView({ + groupItemMetadataProvider: groupItemMetadataProvider, + inlineFilters: false, + }); + + // Wire up model events to drive the grid + self.dataView.onRowCountChanged.subscribe(function () { + grid.updateRowCount(); + grid.render(); + }); + self.dataView.onRowsChanged.subscribe(function (e, args) { + grid.invalidateRows(args.rows); + grid.render(); + }); + + // Change Row css on the basis of item status + self.dataView.getItemMetadata = function(row) { + var item = self.dataView.getItem(row); + if (item.__group) { + return groupItemMetadataProvider.getGroupRowMetadata(item); + } + + if(item.status === 'Different') { + return { cssClasses: 'different' }; + } else if (item.status === 'Source Only') { + return { cssClasses: 'source' }; + } else if (item.status === 'Target Only') { + return { cssClasses: 'target' }; + } + + return null; + }; + + // Grid filter + self.filter = function (item) { + let self = this; + if (self.sel_filters.indexOf(item.status) !== -1) return true; + return false; + }; + + let $data_grid = $('#schema-diff-grid'); + grid = this.grid = new Slick.Grid($data_grid, self.dataView, columns, options); + grid.registerPlugin(groupItemMetadataProvider); + grid.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false})); + grid.registerPlugin(checkboxSelector); + + grid.onClick.subscribe(function(e, args) { + if (args.row) { + data = args.grid.getData().getItem(args.row); + if (data.status) this.ddlCompare(data); + } + }.bind(self)); + + grid.onSelectedRowsChanged.subscribe(self.handle_generate_button.bind(self)); + + self.model.on('change:diff_ddl', self.handle_generate_button.bind(self)); + + $('#schema-diff-grid').on('keyup', function() { + if ((event.keyCode == 38 || event.keyCode ==40) && this.grid.getActiveCell().row) { + data = this.grid.getData().getItem(this.grid.getActiveCell().row); + this.ddlCompare(data); + } + }.bind(self)); + + self.render_grid_data(data); + } + + + + render_grid_data(data) { + var self = this; + self.dataView.beginUpdate(); + self.dataView.setItems(data); + self.dataView.setFilter(self.filter.bind(self)); + self.groupBySchemaObject(); + self.dataView.endUpdate(); + + self.resize_grid(); + } + + handle_generate_button(){ + if (this.grid.getSelectedRows().length > 0 || (this.model.get('diff_ddl') != '' && !_.isUndefined(this.model.get('diff_ddl')))) { + this.header.$el.find('button#generate-script').removeAttr('disabled'); + } else { + this.header.$el.find('button#generate-script').attr('disabled', true); + } + } + + resize_grid() { + let $data_grid = $('#schema-diff-grid'), + grid_height = (this.panel_obj.height() > 0) ? this.panel_obj.height() - 100 : this.grid_height - 100; + + $data_grid.height(grid_height); + $data_grid.css({ + 'height': grid_height + 'px', + }); + if (this.grid) this.grid.resizeCanvas(); + } + + getCompareStatus() { + var self = this, + url_params = {'trans_id': self.trans_id}, + baseUrl = url_for('schema_diff.poll', url_params); + + $.ajax({ + url: baseUrl, + method: 'GET', + dataType: 'json', + contentType: 'application/json', + }) + .done(function (res) { + let msg = res.data.compare_msg + res.data.diff_percentage + '% completed'; + $('#diff_fetching_data').find('.schema-diff-busy-text').text(msg); + }) + .fail(function (xhr) { + self.raise_error_on_fail(gettext('Poll error'), xhr); + self.stopDiffPoller('fail'); + }); + } + + startDiffPoller() { + $('#ddl_comp_fetching_data').addClass('d-none'); + $('#diff_fetching_data').removeClass('d-none'); + /* Execute once for the first time as setInterval will not do */ + this.getCompareStatus(); + this.diff_poller_int_id = setInterval(this.getCompareStatus.bind(this), 1000); + } + + stopDiffPoller(status) { + clearInterval(this.diff_poller_int_id); + // The last polling for comparison + if (status !== 'fail') this.getCompareStatus(); + + $('#diff_fetching_data').find('.schema-diff-busy-text').text(''); + $('#diff_fetching_data').addClass('d-none'); + + } + + ddlCompare(data) { + var self = this, + node_type = data.type, + source_oid = data.oid, + target_oid = data.oid; + + self.model.set({ + 'source_ddl': undefined, + 'target_ddl': undefined, + 'diff_ddl': undefined, + }); + + var url_params = self.selection; + + if(data.status && (data.status.toLowerCase() == 'different' || data.status.toLowerCase() == 'identical')) { + target_oid = data.target_oid; + } + + url_params['trans_id'] = self.trans_id; + url_params['source_oid'] = source_oid; + url_params['target_oid'] = target_oid; + url_params['comp_status'] = data.status; + url_params['node_type'] = node_type; + + _.each(url_params, function(key, val) { + url_params[key] = parseInt(val, 10); + }); + + $('#ddl_comp_fetching_data').removeClass('d-none'); + + var baseUrl = url_for('schema_diff.ddl_compare', url_params); + self.model.url = baseUrl; + + self.model.fetch({ + success: function() { + self.footer.render(); + $('#ddl_comp_fetching_data').addClass('d-none'); + }, + error: function() { + self.footer.render(); + $('#ddl_comp_fetching_data').addClass('d-none'); + }, + }); + } + + render() { + let self = this; + let panel = self.docker.findPanels('schema_diff_header_panel')[0]; + + var header = panel.$container.find('#schema-diff-header'); + + self.header = new SchemaDiffHeaderView({ + el: header, + model: this.model, + fields: [{ + name: 'source_sid', label: false, + control: SchemaDiffSelect2Control, + url: url_for('schema_diff.servers'), + select2: { + allowClear: true, + placeholder: gettext('Select server...'), + }, + connect: function() { + self.connect_server(arguments[0], arguments[1]); + }, + group: 'source', + disabled: function() { + return false; + }, + }, { + name: 'source_did', + group: 'source', + deps: ['source_sid'], + control: SchemaDiffSelect2Control, + url: function() { + if (this.get('source_sid')) + return url_for('schema_diff.databases', {'sid': this.get('source_sid')}); + return false; + }, + select2: { + allowClear: true, + placeholder: gettext('Select database...'), + }, + disabled: function(m) { + if (!_.isUndefined(m.get('source_sid')) && !_.isNull(m.get('source_sid'))) + return false; + return true; + }, + connect: function() { + self.connect_database(this.model.get('source_sid'), arguments[0], arguments[1]); + }, + }, { + name: 'source_scid', + control: SchemaDiffSelect2Control, + group: 'source', + deps: ['source_sid', 'source_did'], + url: function() { + if (this.get('source_sid') && this.get('source_did')) + return url_for('schema_diff.schemas', {'sid': this.get('source_sid'), 'did': this.get('source_did')}); + return false; + }, + select2: { + allowClear: true, + placeholder: gettext('Select schema...'), + }, + disabled: function(m) { + if (!_.isUndefined(m.get('source_did')) && !_.isNull(m.get('source_did'))) + return false; + return true; + }, + }, { + name: 'target_sid', label: false, + control: SchemaDiffSelect2Control, + group: 'target', + url: url_for('schema_diff.servers'), + select2: { + allowClear: true, + placeholder: gettext('Select server...'), + }, + disabled: function() { + return false; + }, + connect: function() { + self.connect_server(arguments[0], arguments[1]); + }, + }, { + name: 'target_did', + control: SchemaDiffSelect2Control, + group: 'target', + deps: ['target_sid'], + url: function() { + if (this.get('target_sid')) + return url_for('schema_diff.databases', {'sid': this.get('target_sid')}); + return false; + }, + select2: { + allowClear: true, + placeholder: gettext('Select database...'), + }, + disabled: function(m) { + if (!_.isUndefined(m.get('target_sid')) && !_.isNull(m.get('target_sid'))) + return false; + return true; + }, + connect: function() { + self.connect_database(this.model.get('target_sid'), arguments[0], arguments[1]); + }, + }, { + name: 'target_scid', + control: SchemaDiffSelect2Control, + group: 'target', + deps: ['target_sid', 'target_did'], + url: function() { + if (this.get('target_sid') && this.get('target_did')) + return url_for('schema_diff.schemas', {'sid': this.get('target_sid'), 'did': this.get('target_did')}); + return false; + }, + select2: { + allowClear: true, + placeholder: gettext('Select schema...'), + }, + disabled: function(m) { + if (!_.isUndefined(m.get('target_did')) && !_.isNull(m.get('target_did'))) + return false; + return true; + }, + }], + }); + + self.footer = new SchemaDiffFooterView({ + model: this.model, + fields: [{ + name: 'source_ddl', label: false, + control: SchemaDiffSqlControl, + group: 'ddl-source', + }, { + name: 'target_ddl', label: false, + control: SchemaDiffSqlControl, + group: 'ddl-target', + }, { + name: 'diff_ddl', label: false, + control: SchemaDiffSqlControl, + group: 'ddl-diff', copyRequired: true, + }], + }); + + self.header.render(); + + self.header.$el.find('button.btn-primary').on('click', self.compare_schemas.bind(self)); + self.header.$el.find('button#generate-script').on('click', self.generate_script.bind(self)); + self.header.$el.find('ul.filter a.dropdown-item').on('click', self.refresh_filters.bind(self)); + + let footer_panel = self.docker.findPanels('schema_diff_footer_panel')[0], + header_panel = self.docker.findPanels('schema_diff_header_panel')[0]; + + footer_panel.$container.find('#schema-diff-ddl-comp').append(self.footer.render().$el); + header_panel.$container.find('#schema-diff-grid').append(`
+
` + gettext('Select the server, database and schema for the source and target and click Compare to compare them.') + '
'); + + self.grid_width = $('#schema-diff-grid').width(); + self.grid_height = this.panel_obj.height(); + } + + refresh_filters(event) { + let self = this; + _.each(self.filters, function(filter) { + let index = self.sel_filters.indexOf(filter); + let filter_class = '.' + filter.replace(' ', '-').toLowerCase(); + if ($(event.currentTarget).find(filter_class).length == 1) { + if ($(filter_class).hasClass('visibility-hidden') === true) { + $(filter_class).removeClass('visibility-hidden'); + if (index === -1) self.sel_filters.push(filter); + } else { + $(filter_class).addClass('visibility-hidden'); + if(index !== -1 ) delete self.sel_filters[index]; + } + } + }); + // Refresh the grid + self.dataView.refresh(); + } + + connect_database(server_id, db_id, callback) { + var url = url_for('schema_diff.connect_database', {'sid': server_id, 'did': db_id}); + $.post(url) + .done(function(res) { + if (res.success && res.data) { + callback(res.data); + } + }) + .fail(function(xhr, error) { + Alertify.pgNotifier(error, xhr, gettext('Failed to connect the database.')); + }); + + } + + connect_server(server_id, callback) { + var onFailure = function( + xhr, status, error, server_id, callback + ) { + Alertify.pgNotifier('error', xhr, error, function(msg) { + setTimeout(function() { + Alertify.dlgServerPass( + gettext('Connect to Server'), + msg, + server_id, + callback + ).resizeTo(); + }, 100); + }); + }, + onSuccess = function(res, callback) { + if (res && res.data) { + // We're not reconnecting + callback(res.data); + } + }; + + + // Ask Password and send it back to the connect server + if (!Alertify.dlgServerPass) { + Alertify.dialog('dlgServerPass', function factory() { + return { + main: function( + title, message, server_id, success_callback, _onSuccess, _onFailure, _onCancel + ) { + this.set('title', title); + this.message = message; + this.server_id = server_id; + this.success_callback = success_callback; + this.onSuccess = _onSuccess || onSuccess; + this.onFailure = _onFailure || onFailure; + this.onCancel = _onCancel || onCancel; + }, + setup:function() { + return { + buttons:[{ + text: gettext('Cancel'), className: 'btn btn-secondary fa fa-times pg-alertify-button', + key: 27, + },{ + text: gettext('OK'), key: 13, className: 'btn btn-primary fa fa-check pg-alertify-button', + }], + focus: {element: '#password', select: true}, + options: { + modal: 0, resizable: false, maximizable: false, pinnable: false, + }, + }; + }, + build:function() {}, + prepare:function() { + this.setContent(this.message); + }, + callback: function(closeEvent) { + var _onFailure = this.onFailure, + _onSuccess = this.onSuccess, + _onCancel = this.onCancel, + _success_callback = this.success_callback; + + if (closeEvent.button.text == gettext('OK')) { + + var _url = url_for('schema_diff.connect_server', {'sid': this.server_id}); + + $.ajax({ + type: 'POST', + timeout: 30000, + url: _url, + data: $('#frmPassword').serialize(), + }) + .done(function(res) { + if (res.success == 1) { + return _onSuccess(res, _success_callback); + } + }) + .fail(function(xhr, status, error) { + return _onFailure( + xhr, status, error, this.server_id, _success_callback + ); + }); + } else { + _onCancel && typeof(_onCancel) == 'function' && + _onCancel(); + } + }, + }; + }); + } + + var onCancel = function() { + return false; + }; + + var url = url_for('schema_diff.connect_server', {'sid': server_id}); + $.post(url) + .done(function(res) { + if (res.success == 1) { + return onSuccess(res, callback); + } + }) + .fail(function(xhr, status, error) { + return onFailure( + xhr, status, error, server_id, callback + ); + }); + } +} diff --git a/web/pgadmin/tools/schema_diff/static/scss/_schema_diff.scss b/web/pgadmin/tools/schema_diff/static/scss/_schema_diff.scss new file mode 100644 index 000000000..800449655 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/static/scss/_schema_diff.scss @@ -0,0 +1,85 @@ +#schema-diff-container { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + padding-top: 10px; + background-color: $color-gray-light; +} + +#schema-diff-grid { + background: $color-bg; + outline: 0; + font-size: 9pt; + margin-top: 28px; + background: none; + background-color: $color-gray-light; +} + +#schema-diff-grid .slick-header .slick-header-columns { + background: $color-bg; + height: 40px; + border-bottom: $panel-border; +} + +#schema-diff-grid .slick-header .slick-header-column.ui-state-default { + padding: 4px 0 3px 6px; + border-bottom: $panel-border; + border-right: $panel-border; +} + +.slick-row:hover .slick-cell{ + border-top: $table-hover-border; + border-bottom: $table-hover-border; + background-color: $table-hover-bg-color; +} + +#schema-diff-grid .slick-header .slick-header-column.selected { + background-color: $color-primary; + color: $color-primary-fg; +} +.slick-row .slick-cell { + border-bottom: $panel-border; + border-right: $panel-border; + z-index: 0; +} + +#schema-diff-grid .slick-row .slick-cell.l0.r0.selected { + background-color: $color-primary; + color: $color-primary-fg; +} + +#schema-diff-grid .slick-row > .slick-cell:not(.l0):not(.r0).selected { + background-color: $table-hover-bg-color; + border-top: $table-hover-border; + border-bottom: $table-hover-border; +} + +#schema-diff-grid div.slick-header.ui-state-default { + background: $color-bg; + border-bottom: none; + border-right: none; + border-top: none; +} + +#schema-diff-grid .different { + background-color: $schemadiff-diff-row-color !important; +} +#schema-diff-grid .source { + background-color: $schemadiff-source-row-color !important; +} +#schema-diff-grid .target { + background-color: $schemadiff-target-row-color !important; +} + +#schema-diff-grid .slick-row.active { + background-color: $table-bg-selected !important; +} + +#schema-diff-ddl-comp { + height: 100%; + bottom: 10px; + background-color: $color-bg !important; + overflow-y: hidden; +} diff --git a/web/pgadmin/tools/schema_diff/templates/schema_diff/index.html b/web/pgadmin/tools/schema_diff/templates/schema_diff/index.html new file mode 100644 index 000000000..9788264d9 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/templates/schema_diff/index.html @@ -0,0 +1,31 @@ +{% extends "base.html" %} +{% block init_script %} +try { + require( + ['sources/generated/schema_diff', 'sources/generated/slickgrid', 'sources/generated/codemirror', 'sources/generated/browser_nodes'], + function(pgSchemaDiffHook) { + var pgSchemaDiffHook = pgSchemaDiffHook || pgAdmin.Tools.SchemaDiffHook; + pgSchemaDiffHook.load({{trans_id}}); + }, + function() { + console.log(arguments); + }); +} catch (err) { + console.log(err); +} +{% endblock %} +{% block css_link %} + +{% endblock %} +{% block body %} +
+
+
+
+
+
+
+
+
+
+{% endblock %} diff --git a/web/pgadmin/tools/schema_diff/tests/__init__.py b/web/pgadmin/tools/schema_diff/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/web/pgadmin/tools/schema_diff/tests/pg/10_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/pg/10_plus/source.sql new file mode 100644 index 000000000..99757ceb2 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/pg/10_plus/source.sql @@ -0,0 +1,440 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:54:15 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; +SET row_security = off; + +-- +-- TOC entry 17 (class 2615 OID 139770) +-- Name: source; Type: SCHEMA; Schema: -; Owner: postgres +-- + +CREATE SCHEMA source; + + +ALTER SCHEMA source OWNER TO postgres; + +SET default_tablespace = ''; + + +CREATE EXTENSION btree_gist + SCHEMA source; + +-- +-- TOC entry 12272 (class 1259 OID 149205) +-- Name: table_for_partition; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_partition ( + col1 bigint NOT NULL +) +PARTITION BY RANGE (col1); + + +ALTER TABLE source.table_for_partition OWNER TO postgres; + +-- +-- TOC entry 12273 (class 1259 OID 149208) +-- Name: part1; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.part1 ( + col1 bigint NOT NULL +); +ALTER TABLE ONLY source.table_for_partition ATTACH PARTITION source.part1 FOR VALUES FROM ('1') TO ('23'); + + +ALTER TABLE source.part1 OWNER TO postgres; + +-- +-- TOC entry 12274 (class 1259 OID 149213) +-- Name: table_for_partition_1; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_partition_1 ( + col1 bigint +) +PARTITION BY RANGE (col1); + + +ALTER TABLE source.table_for_partition_1 OWNER TO postgres; + +-- +-- TOC entry 12275 (class 1259 OID 149216) +-- Name: part3; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.part3 ( + col1 bigint +); +ALTER TABLE ONLY source.table_for_partition_1 ATTACH PARTITION source.part3 FOR VALUES FROM ('1') TO ('10'); + + +ALTER TABLE source.part3 OWNER TO postgres; + +-- +-- TOC entry 12276 (class 1259 OID 149219) +-- Name: part4; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.part4 ( + col1 bigint +); +ALTER TABLE ONLY source.table_for_partition_1 ATTACH PARTITION source.part4 FOR VALUES FROM ('11') TO ('20'); + + +ALTER TABLE source.part4 OWNER TO postgres; + +-- +-- TOC entry 12258 (class 1259 OID 148963) +-- Name: table_for_column; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_column ( + col1 bigint NOT NULL, + col2 text, + col3 text +); + + +ALTER TABLE source.table_for_column OWNER TO postgres; + +-- +-- TOC entry 12256 (class 1259 OID 148895) +-- Name: table_for_constraints; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_constraints ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_constraints OWNER TO postgres; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12256 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON TABLE source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 12262 (class 1259 OID 149004) +-- Name: table_for_identical; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_identical OWNER TO postgres; + +-- +-- TOC entry 12260 (class 1259 OID 148977) +-- Name: table_for_index; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_index OWNER TO postgres; + +-- +-- TOC entry 12269 (class 1259 OID 149128) +-- Name: table_for_primary_key; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE source.table_for_primary_key OWNER TO postgres; + +-- +-- TOC entry 12264 (class 1259 OID 149024) +-- Name: table_for_rule; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_rule OWNER TO postgres; + +-- +-- TOC entry 12266 (class 1259 OID 149048) +-- Name: table_for_trigger; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_trigger OWNER TO postgres; + +-- +-- TOC entry 56893 (class 2606 OID 148904) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='12') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 56893 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT "Exclusion" ON source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56891 (class 2606 OID 148911) +-- Name: table_for_constraints check_con; Type: CHECK CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE source.table_for_constraints + ADD CONSTRAINT check_con CHECK ((col1 > 10)) NOT VALID; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56891 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT check_con ON source.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 56899 (class 2606 OID 148970) +-- Name: table_for_column table_for_column_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_column + ADD CONSTRAINT table_for_column_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56895 (class 2606 OID 148902) +-- Name: table_for_constraints table_for_constraints_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT table_for_constraints_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 148984) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56913 (class 2606 OID 149135) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1, col2); + + +-- +-- TOC entry 56909 (class 2606 OID 149031) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56907 (class 2606 OID 149011) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56911 (class 2606 OID 149055) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148913) +-- Name: table_for_constraints unique; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "unique" UNIQUE (col1); + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 56897 +-- Name: CONSTRAINT "unique" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT "unique" ON source.table_for_constraints IS 'cmnt'; + + +-- +-- TOC entry 56900 (class 1259 OID 149023) +-- Name: index1; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index1 ON source.table_for_index USING btree (col2 varchar_pattern_ops); + + +-- +-- TOC entry 56905 (class 1259 OID 149012) +-- Name: index_identical; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index_identical ON source.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56901 (class 1259 OID 149211) +-- Name: index_same; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index_same ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56902 (class 1259 OID 149022) +-- Name: index_source; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index_source ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 61044 (class 2618 OID 149032) +-- Name: table_for_rule rule1; Type: RULE; Schema: source; Owner: postgres +-- + +CREATE RULE rule1 AS + ON UPDATE TO source.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61070 (class 0 OID 0) +-- Dependencies: 61044 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON RULE rule1 ON source.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61045 (class 2618 OID 149033) +-- Name: table_for_rule rule2; Type: RULE; Schema: source; Owner: postgres +-- + +CREATE RULE rule2 AS + ON INSERT TO source.table_for_rule DO NOTHING; + +-- +-- TOC entry 12283 (class 1259 OID 347818) +-- Name: test view; Type: VIEW; Schema: source; Owner: postgres +-- + +CREATE VIEW source."test view" AS + SELECT pg_class.relname, + pg_class.relnamespace, + pg_class.reltype, + pg_class.reloftype, + pg_class.relowner, + pg_class.relam, + pg_class.relfilenode, + pg_class.reltablespace, + pg_class.relpages, + pg_class.reltuples, + pg_class.relallvisible, + pg_class.reltoastrelid, + pg_class.relhasindex, + pg_class.relisshared, + pg_class.relpersistence, + pg_class.relkind, + pg_class.relnatts, + pg_class.relchecks, + pg_class.relhasoids, + pg_class.relhaspkey, + pg_class.relhasrules, + pg_class.relhastriggers, + pg_class.relhassubclass, + pg_class.relrowsecurity, + pg_class.relforcerowsecurity, + pg_class.relispopulated, + pg_class.relreplident, + pg_class.relispartition, + pg_class.relfrozenxid, + pg_class.relminmxid, + pg_class.relacl, + pg_class.reloptions, + pg_class.relpartbound + FROM pg_class + LIMIT 10; + + +ALTER TABLE source."test view" OWNER TO postgres; + +-- +-- TOC entry 12286 (class 1259 OID 347832) +-- Name: test view f; Type: VIEW; Schema: source; Owner: postgres +-- + +CREATE VIEW source."test view f" WITH (security_barrier='false') AS + SELECT 2; + + +ALTER TABLE source."test view f" OWNER TO postgres; + +-- +-- TOC entry 61111 (class 0 OID 0) +-- Dependencies: 12286 +-- Name: VIEW "test view f"; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON VIEW source."test view f" IS 'cmn'; diff --git a/web/pgadmin/tools/schema_diff/tests/pg/10_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/pg/10_plus/target.sql new file mode 100644 index 000000000..c3042ab60 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/pg/10_plus/target.sql @@ -0,0 +1,429 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:55:22 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; +SET row_security = off; + +-- +-- TOC entry 18 (class 2615 OID 139771) +-- Name: target; Type: SCHEMA; Schema: -; Owner: postgres +-- + +CREATE SCHEMA target; + +ALTER SCHEMA target OWNER TO postgres; + +SET default_tablespace = ''; + +CREATE EXTENSION btree_gist + SCHEMA target; + +-- +-- TOC entry 12250 (class 1259 OID 139938) +-- Name: MView; Type: MATERIALIZED VIEW; Schema: target; Owner: postgres +-- + +CREATE MATERIALIZED VIEW target."MView" AS + SELECT 'tekst'::text AS text + WITH NO DATA; + + +ALTER TABLE target."MView" OWNER TO postgres; + +-- +-- TOC entry 12277 (class 1259 OID 149234) +-- Name: table_for_partition_1; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_partition_1 ( + col1 bigint +) +PARTITION BY RANGE (col1); + + +ALTER TABLE target.table_for_partition_1 OWNER TO postgres; + +-- +-- TOC entry 12278 (class 1259 OID 149237) +-- Name: part3; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.part3 ( + col1 bigint +); +ALTER TABLE ONLY target.table_for_partition_1 ATTACH PARTITION target.part3 FOR VALUES FROM ('13') TO ('56'); + + +ALTER TABLE target.part3 OWNER TO postgres; + +-- +-- TOC entry 12259 (class 1259 OID 148971) +-- Name: table_for_column; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_column ( + col1 bigint, + col2 bigint, + col4 text +); + + +ALTER TABLE target.table_for_column OWNER TO postgres; + +-- +-- TOC entry 12268 (class 1259 OID 149089) +-- Name: table_for_constraints; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_constraints ( + col1 integer NOT NULL, + col2 text, + CONSTRAINT check_con CHECK ((col1 > 30)) +); + + +ALTER TABLE target.table_for_constraints OWNER TO postgres; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON TABLE target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON CONSTRAINT check_con ON target.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 12257 (class 1259 OID 148960) +-- Name: table_for_del; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_del ( +); + + +ALTER TABLE target.table_for_del OWNER TO postgres; + +-- +-- TOC entry 12271 (class 1259 OID 149172) +-- Name: table_for_foreign_key; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_foreign_key ( + col1 integer NOT NULL, + col2 "char", + col3 bigint +); + + +ALTER TABLE target.table_for_foreign_key OWNER TO postgres; + +-- +-- TOC entry 12263 (class 1259 OID 149013) +-- Name: table_for_identical; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_identical OWNER TO postgres; + +-- +-- TOC entry 12261 (class 1259 OID 148986) +-- Name: table_for_index; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_index OWNER TO postgres; + +-- +-- TOC entry 12270 (class 1259 OID 149144) +-- Name: table_for_primary_key; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE target.table_for_primary_key OWNER TO postgres; + +-- +-- TOC entry 12265 (class 1259 OID 149034) +-- Name: table_for_rule; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_rule OWNER TO postgres; + +-- +-- TOC entry 12267 (class 1259 OID 149066) +-- Name: table_for_trigger; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_trigger OWNER TO postgres; + + +-- +-- TOC entry 56906 (class 2606 OID 149097) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='15') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56906 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON CONSTRAINT "Exclusion" ON target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56910 (class 2606 OID 149176) +-- Name: table_for_foreign_key table_for_foreign_key_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_foreign_key + ADD CONSTRAINT table_for_foreign_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148993) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56908 (class 2606 OID 149151) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56902 (class 2606 OID 149041) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56900 (class 2606 OID 149020) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 149073) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56893 (class 1259 OID 148994) +-- Name: index1; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index1 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56894 (class 1259 OID 148995) +-- Name: index2; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index2 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56898 (class 1259 OID 149021) +-- Name: index_identical; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index_identical ON target.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56895 (class 1259 OID 149212) +-- Name: index_same; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index_same ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56892 (class 1259 OID 139945) +-- Name: mview_index; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX mview_index ON target."MView" USING btree (text text_pattern_ops); + + +-- +-- TOC entry 61045 (class 2618 OID 149042) +-- Name: table_for_rule rule1; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule1 AS + ON UPDATE TO target.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 61045 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON RULE rule1 ON target.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61046 (class 2618 OID 149043) +-- Name: table_for_rule rule2; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule2 AS + ON UPDATE TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61047 (class 2618 OID 149044) +-- Name: table_for_rule rule3; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule3 AS + ON INSERT TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61050 (class 0 OID 139938) +-- Dependencies: 12250 61062 +-- Name: MView; Type: MATERIALIZED VIEW DATA; Schema: target; Owner: postgres +-- + +REFRESH MATERIALIZED VIEW target."MView"; + + +-- +-- TOC entry 12284 (class 1259 OID 347823) +-- Name: test view; Type: VIEW; Schema: target; Owner: postgres +-- + +CREATE VIEW target."test view" AS + SELECT pg_class.relname, + pg_class.relnamespace, + pg_class.reltype, + pg_class.reloftype, + pg_class.relowner, + pg_class.relam, + pg_class.relfilenode, + pg_class.reltablespace, + pg_class.relpages, + pg_class.reltuples, + pg_class.relallvisible, + pg_class.reltoastrelid, + pg_class.relhasindex, + pg_class.relisshared, + pg_class.relpersistence, + pg_class.relkind, + pg_class.relnatts, + pg_class.relchecks, + pg_class.relhasoids, + pg_class.relhaspkey, + pg_class.relhasrules, + pg_class.relhastriggers, + pg_class.relhassubclass, + pg_class.relrowsecurity, + pg_class.relforcerowsecurity, + pg_class.relispopulated, + pg_class.relreplident, + pg_class.relispartition, + pg_class.relfrozenxid, + pg_class.relminmxid, + pg_class.relacl, + pg_class.reloptions, + pg_class.relpartbound + FROM pg_class + LIMIT 10; + + +ALTER TABLE target."test view" OWNER TO postgres; + +-- +-- TOC entry 12285 (class 1259 OID 347828) +-- Name: test view f; Type: VIEW; Schema: target; Owner: postgres +-- + +CREATE VIEW target."test view f" WITH (security_barrier='true') AS + SELECT 2; + + +ALTER TABLE target."test view f" OWNER TO postgres; + +-- +-- TOC entry 61105 (class 0 OID 0) +-- Dependencies: 12285 +-- Name: VIEW "test view f"; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON VIEW target."test view f" IS 'cmn'; diff --git a/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql new file mode 100644 index 000000000..8ef87e3bc --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql @@ -0,0 +1,440 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:54:15 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; +SET row_security = off; + +-- +-- TOC entry 17 (class 2615 OID 139770) +-- Name: source; Type: SCHEMA; Schema: -; Owner: postgres +-- + +CREATE SCHEMA source; + + +ALTER SCHEMA source OWNER TO postgres; + +SET default_tablespace = ''; + + +CREATE EXTENSION btree_gist + SCHEMA source; + +-- +-- TOC entry 12272 (class 1259 OID 149205) +-- Name: table_for_partition; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_partition ( + col1 bigint NOT NULL +) +PARTITION BY RANGE (col1); + + +ALTER TABLE source.table_for_partition OWNER TO postgres; + +-- +-- TOC entry 12273 (class 1259 OID 149208) +-- Name: part1; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.part1 ( + col1 bigint NOT NULL +); +ALTER TABLE ONLY source.table_for_partition ATTACH PARTITION source.part1 FOR VALUES FROM ('1') TO ('23'); + + +ALTER TABLE source.part1 OWNER TO postgres; + +-- +-- TOC entry 12274 (class 1259 OID 149213) +-- Name: table_for_partition_1; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_partition_1 ( + col1 bigint +) +PARTITION BY RANGE (col1); + + +ALTER TABLE source.table_for_partition_1 OWNER TO postgres; + +-- +-- TOC entry 12275 (class 1259 OID 149216) +-- Name: part3; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.part3 ( + col1 bigint +); +ALTER TABLE ONLY source.table_for_partition_1 ATTACH PARTITION source.part3 FOR VALUES FROM ('1') TO ('10'); + + +ALTER TABLE source.part3 OWNER TO postgres; + +-- +-- TOC entry 12276 (class 1259 OID 149219) +-- Name: part4; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.part4 ( + col1 bigint +); +ALTER TABLE ONLY source.table_for_partition_1 ATTACH PARTITION source.part4 FOR VALUES FROM ('11') TO ('20'); + + +ALTER TABLE source.part4 OWNER TO postgres; + +-- +-- TOC entry 12258 (class 1259 OID 148963) +-- Name: table_for_column; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_column ( + col1 bigint NOT NULL, + col2 text, + col3 text +); + + +ALTER TABLE source.table_for_column OWNER TO postgres; + +-- +-- TOC entry 12256 (class 1259 OID 148895) +-- Name: table_for_constraints; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_constraints ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_constraints OWNER TO postgres; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12256 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON TABLE source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 12262 (class 1259 OID 149004) +-- Name: table_for_identical; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_identical OWNER TO postgres; + +-- +-- TOC entry 12260 (class 1259 OID 148977) +-- Name: table_for_index; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_index OWNER TO postgres; + +-- +-- TOC entry 12269 (class 1259 OID 149128) +-- Name: table_for_primary_key; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE source.table_for_primary_key OWNER TO postgres; + +-- +-- TOC entry 12264 (class 1259 OID 149024) +-- Name: table_for_rule; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_rule OWNER TO postgres; + +-- +-- TOC entry 12266 (class 1259 OID 149048) +-- Name: table_for_trigger; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_trigger OWNER TO postgres; + +-- +-- TOC entry 56893 (class 2606 OID 148904) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='12') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 56893 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT "Exclusion" ON source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56891 (class 2606 OID 148911) +-- Name: table_for_constraints check_con; Type: CHECK CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE source.table_for_constraints + ADD CONSTRAINT check_con CHECK ((col1 > 10)) NOT VALID; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56891 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT check_con ON source.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 56899 (class 2606 OID 148970) +-- Name: table_for_column table_for_column_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_column + ADD CONSTRAINT table_for_column_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56895 (class 2606 OID 148902) +-- Name: table_for_constraints table_for_constraints_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT table_for_constraints_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 148984) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56913 (class 2606 OID 149135) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1, col2); + + +-- +-- TOC entry 56909 (class 2606 OID 149031) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56907 (class 2606 OID 149011) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56911 (class 2606 OID 149055) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148913) +-- Name: table_for_constraints unique; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "unique" UNIQUE (col1); + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 56897 +-- Name: CONSTRAINT "unique" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT "unique" ON source.table_for_constraints IS 'cmnt'; + + +-- +-- TOC entry 56900 (class 1259 OID 149023) +-- Name: index1; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index1 ON source.table_for_index USING btree (col2 varchar_pattern_ops); + + +-- +-- TOC entry 56905 (class 1259 OID 149012) +-- Name: index_identical; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index_identical ON source.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56901 (class 1259 OID 149211) +-- Name: index_same; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index_same ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56902 (class 1259 OID 149022) +-- Name: index_source; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index_source ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 61044 (class 2618 OID 149032) +-- Name: table_for_rule rule1; Type: RULE; Schema: source; Owner: postgres +-- + +CREATE RULE rule1 AS + ON UPDATE TO source.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61070 (class 0 OID 0) +-- Dependencies: 61044 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON RULE rule1 ON source.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61045 (class 2618 OID 149033) +-- Name: table_for_rule rule2; Type: RULE; Schema: source; Owner: postgres +-- + +CREATE RULE rule2 AS + ON INSERT TO source.table_for_rule DO NOTHING; + +-- +-- TOC entry 12283 (class 1259 OID 347818) +-- Name: test view; Type: VIEW; Schema: source; Owner: postgres +-- + +CREATE VIEW source."test view" AS + SELECT pg_class.relname, + pg_class.relnamespace, + pg_class.reltype, + pg_class.reloftype, + pg_class.relowner, + pg_class.relam, + pg_class.relfilenode, + pg_class.reltablespace, + pg_class.relpages + FROM pg_class + LIMIT 10; + + +ALTER TABLE source."test view" OWNER TO postgres; + +-- +-- TOC entry 12286 (class 1259 OID 347832) +-- Name: test view f; Type: VIEW; Schema: source; Owner: postgres +-- + +CREATE VIEW source."test view f" WITH (security_barrier='false') AS + SELECT 2; + + +ALTER TABLE source."test view f" OWNER TO postgres; + +-- +-- TOC entry 61111 (class 0 OID 0) +-- Dependencies: 12286 +-- Name: VIEW "test view f"; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON VIEW source."test view f" IS 'cmn'; + +-- +-- TOC entry 223 (class 1255 OID 67206) +-- Name: dodaj_klijenta(character varying, character varying, character varying, character varying, integer, character varying, character varying, character varying, boolean, boolean, character varying, character varying, character varying, character varying, numeric, character varying); Type: PROCEDURE; Schema: public; Owner: postgres +-- + +CREATE PROCEDURE source.dodaj_klijenta(v_naziv character varying, v_oib character varying, v_pdv_id character varying, v_adresa character varying, v_mjesto integer, v_drzava character varying, v_tip_p_sub character varying, v_vlasnik character varying, v_pdv boolean, v_fisk boolean, v_iban character varying, v_k_osoba character varying, v_email character varying, v_br_tel character varying, v_radna_god numeric, v_schema character varying) + LANGUAGE sql + AS $$select 1;$$; + + +ALTER PROCEDURE source.dodaj_klijenta(v_naziv character varying, v_oib character varying, v_pdv_id character varying, v_adresa character varying, v_mjesto integer, v_drzava character varying, v_tip_p_sub character varying, v_vlasnik character varying, v_pdv boolean, v_fisk boolean, v_iban character varying, v_k_osoba character varying, v_email character varying, v_br_tel character varying, v_radna_god numeric, v_schema character varying) OWNER TO postgres; + +-- +-- TOC entry 220 (class 1255 OID 67205) +-- Name: proc1(bigint); Type: PROCEDURE; Schema: source; Owner: postgres +-- + +CREATE PROCEDURE source.proc1(arg1 bigint) + LANGUAGE sql + AS $$select 1;$$; + + +ALTER PROCEDURE source.proc1(arg1 bigint) OWNER TO postgres; diff --git a/web/pgadmin/tools/schema_diff/tests/pg/12_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/pg/12_plus/target.sql new file mode 100644 index 000000000..d57841744 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/pg/12_plus/target.sql @@ -0,0 +1,417 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:55:22 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; +SET row_security = off; + +-- +-- TOC entry 18 (class 2615 OID 139771) +-- Name: target; Type: SCHEMA; Schema: -; Owner: postgres +-- + +CREATE SCHEMA target; + +ALTER SCHEMA target OWNER TO postgres; + +SET default_tablespace = ''; + +CREATE EXTENSION btree_gist + SCHEMA target; + +-- +-- TOC entry 12250 (class 1259 OID 139938) +-- Name: MView; Type: MATERIALIZED VIEW; Schema: target; Owner: postgres +-- + +CREATE MATERIALIZED VIEW target."MView" AS + SELECT 'tekst'::text AS text + WITH NO DATA; + + +ALTER TABLE target."MView" OWNER TO postgres; + +-- +-- TOC entry 12277 (class 1259 OID 149234) +-- Name: table_for_partition_1; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_partition_1 ( + col1 bigint +) +PARTITION BY RANGE (col1); + + +ALTER TABLE target.table_for_partition_1 OWNER TO postgres; + +-- +-- TOC entry 12278 (class 1259 OID 149237) +-- Name: part3; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.part3 ( + col1 bigint +); +ALTER TABLE ONLY target.table_for_partition_1 ATTACH PARTITION target.part3 FOR VALUES FROM ('13') TO ('56'); + + +ALTER TABLE target.part3 OWNER TO postgres; + +-- +-- TOC entry 12259 (class 1259 OID 148971) +-- Name: table_for_column; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_column ( + col1 bigint, + col2 bigint, + col4 text +); + + +ALTER TABLE target.table_for_column OWNER TO postgres; + +-- +-- TOC entry 12268 (class 1259 OID 149089) +-- Name: table_for_constraints; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_constraints ( + col1 integer NOT NULL, + col2 text, + CONSTRAINT check_con CHECK ((col1 > 30)) +); + + +ALTER TABLE target.table_for_constraints OWNER TO postgres; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON TABLE target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON CONSTRAINT check_con ON target.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 12257 (class 1259 OID 148960) +-- Name: table_for_del; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_del ( +); + + +ALTER TABLE target.table_for_del OWNER TO postgres; + +-- +-- TOC entry 12271 (class 1259 OID 149172) +-- Name: table_for_foreign_key; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_foreign_key ( + col1 integer NOT NULL, + col2 "char", + col3 bigint +); + + +ALTER TABLE target.table_for_foreign_key OWNER TO postgres; + +-- +-- TOC entry 12263 (class 1259 OID 149013) +-- Name: table_for_identical; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_identical OWNER TO postgres; + +-- +-- TOC entry 12261 (class 1259 OID 148986) +-- Name: table_for_index; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_index OWNER TO postgres; + +-- +-- TOC entry 12270 (class 1259 OID 149144) +-- Name: table_for_primary_key; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE target.table_for_primary_key OWNER TO postgres; + +-- +-- TOC entry 12265 (class 1259 OID 149034) +-- Name: table_for_rule; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_rule OWNER TO postgres; + +-- +-- TOC entry 12267 (class 1259 OID 149066) +-- Name: table_for_trigger; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_trigger OWNER TO postgres; + + +-- +-- TOC entry 56906 (class 2606 OID 149097) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='15') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56906 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON CONSTRAINT "Exclusion" ON target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56910 (class 2606 OID 149176) +-- Name: table_for_foreign_key table_for_foreign_key_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_foreign_key + ADD CONSTRAINT table_for_foreign_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148993) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56908 (class 2606 OID 149151) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56902 (class 2606 OID 149041) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56900 (class 2606 OID 149020) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 149073) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56893 (class 1259 OID 148994) +-- Name: index1; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index1 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56894 (class 1259 OID 148995) +-- Name: index2; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index2 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56898 (class 1259 OID 149021) +-- Name: index_identical; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index_identical ON target.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56895 (class 1259 OID 149212) +-- Name: index_same; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index_same ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56892 (class 1259 OID 139945) +-- Name: mview_index; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX mview_index ON target."MView" USING btree (text text_pattern_ops); + + +-- +-- TOC entry 61045 (class 2618 OID 149042) +-- Name: table_for_rule rule1; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule1 AS + ON UPDATE TO target.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 61045 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON RULE rule1 ON target.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61046 (class 2618 OID 149043) +-- Name: table_for_rule rule2; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule2 AS + ON UPDATE TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61047 (class 2618 OID 149044) +-- Name: table_for_rule rule3; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule3 AS + ON INSERT TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61050 (class 0 OID 139938) +-- Dependencies: 12250 61062 +-- Name: MView; Type: MATERIALIZED VIEW DATA; Schema: target; Owner: postgres +-- + +REFRESH MATERIALIZED VIEW target."MView"; + +-- +-- TOC entry 12284 (class 1259 OID 347823) +-- Name: test view; Type: VIEW; Schema: target; Owner: postgres +-- + +CREATE VIEW target."test view" AS + SELECT pg_class.relname, + pg_class.relnamespace, + pg_class.reltype, + pg_class.reloftype, + pg_class.relowner, + pg_class.relam, + pg_class.relfilenode, + pg_class.reltablespace, + pg_class.relpages + FROM pg_class + LIMIT 10; + + +ALTER TABLE target."test view" OWNER TO postgres; + +-- +-- TOC entry 12285 (class 1259 OID 347828) +-- Name: test view f; Type: VIEW; Schema: target; Owner: postgres +-- + +CREATE VIEW target."test view f" WITH (security_barrier='true') AS + SELECT 2; + + +ALTER TABLE target."test view f" OWNER TO postgres; + +-- +-- TOC entry 61105 (class 0 OID 0) +-- Dependencies: 12285 +-- Name: VIEW "test view f"; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON VIEW target."test view f" IS 'cmn'; + + +-- +-- TOC entry 437 (class 1255 OID 112907) +-- Name: dodaj_klijenta(character varying, character varying, character varying, character varying, integer, character varying, character varying, character varying, boolean, boolean, character varying, character varying, character varying, character varying, numeric, character varying); Type: PROCEDURE; Schema: target schema; Owner: postgres +-- + +CREATE PROCEDURE target.dodaj_klijenta(v_naziv character varying, v_oib character varying, v_pdv_id character varying, v_adresa character varying, v_mjesto integer, v_drzava character varying, v_tip_p_sub character varying, v_vlasnik character varying, v_pdv boolean, v_fisk boolean, v_iban character varying, v_k_osoba character varying, v_email character varying, v_br_tel character varying, v_radna_god numeric, v_schema character varying) + LANGUAGE sql + AS $$select 4;$$; + + +ALTER PROCEDURE target.dodaj_klijenta(v_naziv character varying, v_oib character varying, v_pdv_id character varying, v_adresa character varying, v_mjesto integer, v_drzava character varying, v_tip_p_sub character varying, v_vlasnik character varying, v_pdv boolean, v_fisk boolean, v_iban character varying, v_k_osoba character varying, v_email character varying, v_br_tel character varying, v_radna_god numeric, v_schema character varying) OWNER TO postgres; diff --git a/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql new file mode 100644 index 000000000..af9054eeb --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql @@ -0,0 +1,311 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:54:15 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; + +-- +-- TOC entry 17 (class 2615 OID 139770) +-- Name: source; Type: SCHEMA; Schema: -; Owner: postgres +-- + +CREATE SCHEMA source; + + +ALTER SCHEMA source OWNER TO postgres; + +SET default_tablespace = ''; + + +CREATE EXTENSION btree_gist + SCHEMA source; + + +-- +-- TOC entry 12258 (class 1259 OID 148963) +-- Name: table_for_column; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_column ( + col1 bigint NOT NULL, + col2 text, + col3 text +); + + +ALTER TABLE source.table_for_column OWNER TO postgres; + +-- +-- TOC entry 12256 (class 1259 OID 148895) +-- Name: table_for_constraints; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_constraints ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_constraints OWNER TO postgres; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12256 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON TABLE source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 12262 (class 1259 OID 149004) +-- Name: table_for_identical; Type: TABLE; Schema: source; Owner: postgres; +-- + +CREATE TABLE source.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_identical OWNER TO postgres;; + +-- +-- TOC entry 12260 (class 1259 OID 148977) +-- Name: table_for_index; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_index OWNER TO postgres; + +-- +-- TOC entry 12269 (class 1259 OID 149128) +-- Name: table_for_primary_key; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE source.table_for_primary_key OWNER TO postgres; + +-- +-- TOC entry 12264 (class 1259 OID 149024) +-- Name: table_for_rule; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_rule OWNER TO postgres; + +-- +-- TOC entry 12266 (class 1259 OID 149048) +-- Name: table_for_trigger; Type: TABLE; Schema: source; Owner: postgres +-- + +CREATE TABLE source.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_trigger OWNER TO postgres; + +-- +-- TOC entry 56893 (class 2606 OID 148904) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='12') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 56893 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT "Exclusion" ON source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56891 (class 2606 OID 148911) +-- Name: table_for_constraints check_con; Type: CHECK CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE source.table_for_constraints + ADD CONSTRAINT check_con CHECK ((col1 > 10)) NOT VALID; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56891 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT check_con ON source.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 56899 (class 2606 OID 148970) +-- Name: table_for_column table_for_column_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_column + ADD CONSTRAINT table_for_column_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56895 (class 2606 OID 148902) +-- Name: table_for_constraints table_for_constraints_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT table_for_constraints_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 148984) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56913 (class 2606 OID 149135) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1, col2); + + +-- +-- TOC entry 56909 (class 2606 OID 149031) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56907 (class 2606 OID 149011) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres; +-- + +ALTER TABLE ONLY source.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56911 (class 2606 OID 149055) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148913) +-- Name: table_for_constraints unique; Type: CONSTRAINT; Schema: source; Owner: postgres +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "unique" UNIQUE (col1); + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 56897 +-- Name: CONSTRAINT "unique" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON CONSTRAINT "unique" ON source.table_for_constraints IS 'cmnt'; + + +-- +-- TOC entry 56900 (class 1259 OID 149023) +-- Name: index1; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index1 ON source.table_for_index USING btree (col2 varchar_pattern_ops); + + +-- +-- TOC entry 56905 (class 1259 OID 149012) +-- Name: index_identical; Type: INDEX; Schema: source; Owner: postgres; +-- + +CREATE INDEX index_identical ON source.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56901 (class 1259 OID 149211) +-- Name: index_same; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index_same ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56902 (class 1259 OID 149022) +-- Name: index_source; Type: INDEX; Schema: source; Owner: postgres +-- + +CREATE INDEX index_source ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 61044 (class 2618 OID 149032) +-- Name: table_for_rule rule1; Type: RULE; Schema: source; Owner: postgres +-- + +CREATE RULE rule1 AS + ON UPDATE TO source.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61070 (class 0 OID 0) +-- Dependencies: 61044 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: source; Owner: postgres +-- + +COMMENT ON RULE rule1 ON source.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61045 (class 2618 OID 149033) +-- Name: table_for_rule rule2; Type: RULE; Schema: source; Owner: postgres +-- + +CREATE RULE rule2 AS + ON INSERT TO source.table_for_rule DO NOTHING; + diff --git a/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql new file mode 100644 index 000000000..ddc4fda28 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql @@ -0,0 +1,337 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:55:22 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; + +-- +-- TOC entry 18 (class 2615 OID 139771) +-- Name: target; Type: SCHEMA; Schema: -; Owner: postgres +-- + +CREATE SCHEMA target; + + +ALTER SCHEMA target OWNER TO postgres; + +SET default_tablespace = ''; + +CREATE EXTENSION btree_gist + SCHEMA target; + +-- +-- TOC entry 12250 (class 1259 OID 139938) +-- Name: MView; Type: MATERIALIZED VIEW; Schema: target; Owner: postgres +-- + +CREATE MATERIALIZED VIEW target."MView" AS + SELECT 'tekst'::text AS text + WITH NO DATA; + + +ALTER TABLE target."MView" OWNER TO postgres; + +-- +-- TOC entry 12259 (class 1259 OID 148971) +-- Name: table_for_column; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_column ( + col1 bigint, + col2 bigint, + col4 text +); + + +ALTER TABLE target.table_for_column OWNER TO postgres; + +-- +-- TOC entry 12268 (class 1259 OID 149089) +-- Name: table_for_constraints; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_constraints ( + col1 integer NOT NULL, + col2 text, + CONSTRAINT check_con CHECK ((col1 > 30)) +); + + +ALTER TABLE target.table_for_constraints OWNER TO postgres; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON TABLE target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON CONSTRAINT check_con ON target.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 12257 (class 1259 OID 148960) +-- Name: table_for_del; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_del ( +); + + +ALTER TABLE target.table_for_del OWNER TO postgres; + +-- +-- TOC entry 12271 (class 1259 OID 149172) +-- Name: table_for_foreign_key; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_foreign_key ( + col1 integer NOT NULL, + col2 "char", + col3 bigint +); + + +ALTER TABLE target.table_for_foreign_key OWNER TO postgres; + +-- +-- TOC entry 12263 (class 1259 OID 149013) +-- Name: table_for_identical; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_identical OWNER TO postgres; + +-- +-- TOC entry 12261 (class 1259 OID 148986) +-- Name: table_for_index; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_index OWNER TO postgres; + +-- +-- TOC entry 12270 (class 1259 OID 149144) +-- Name: table_for_primary_key; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE target.table_for_primary_key OWNER TO postgres; + +-- +-- TOC entry 12265 (class 1259 OID 149034) +-- Name: table_for_rule; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_rule OWNER TO postgres; + +-- +-- TOC entry 12267 (class 1259 OID 149066) +-- Name: table_for_trigger; Type: TABLE; Schema: target; Owner: postgres +-- + +CREATE TABLE target.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_trigger OWNER TO postgres; + + +-- +-- TOC entry 56906 (class 2606 OID 149097) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='15') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56906 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON CONSTRAINT "Exclusion" ON target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56910 (class 2606 OID 149176) +-- Name: table_for_foreign_key table_for_foreign_key_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_foreign_key + ADD CONSTRAINT table_for_foreign_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148993) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56908 (class 2606 OID 149151) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56902 (class 2606 OID 149041) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56900 (class 2606 OID 149020) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 149073) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: target; Owner: postgres +-- + +ALTER TABLE ONLY target.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56893 (class 1259 OID 148994) +-- Name: index1; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index1 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56894 (class 1259 OID 148995) +-- Name: index2; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index2 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56898 (class 1259 OID 149021) +-- Name: index_identical; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index_identical ON target.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56895 (class 1259 OID 149212) +-- Name: index_same; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX index_same ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56892 (class 1259 OID 139945) +-- Name: mview_index; Type: INDEX; Schema: target; Owner: postgres +-- + +CREATE INDEX mview_index ON target."MView" USING btree (text text_pattern_ops); + + +-- +-- TOC entry 61045 (class 2618 OID 149042) +-- Name: table_for_rule rule1; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule1 AS + ON UPDATE TO target.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 61045 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: target; Owner: postgres +-- + +COMMENT ON RULE rule1 ON target.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61046 (class 2618 OID 149043) +-- Name: table_for_rule rule2; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule2 AS + ON UPDATE TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61047 (class 2618 OID 149044) +-- Name: table_for_rule rule3; Type: RULE; Schema: target; Owner: postgres +-- + +CREATE RULE rule3 AS + ON INSERT TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61050 (class 0 OID 139938) +-- Dependencies: 12250 61062 +-- Name: MView; Type: MATERIALIZED VIEW DATA; Schema: target; Owner: postgres +-- + +REFRESH MATERIALIZED VIEW target."MView"; diff --git a/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/source.sql new file mode 100644 index 000000000..b60dbcd55 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/source.sql @@ -0,0 +1,376 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:54:15 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; +SET row_security = off; + +-- +-- TOC entry 17 (class 2615 OID 139770) +-- Name: source; Type: SCHEMA; Schema: -; Owner: enterprisedb +-- + +CREATE SCHEMA source; + + +ALTER SCHEMA source OWNER TO enterprisedb; + +SET default_tablespace = ''; + + +CREATE EXTENSION btree_gist + SCHEMA source; + +-- +-- TOC entry 12272 (class 1259 OID 149205) +-- Name: table_for_partition; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_partition ( + col1 bigint NOT NULL +) +PARTITION BY RANGE (col1); + + +ALTER TABLE source.table_for_partition OWNER TO enterprisedb; + +-- +-- TOC entry 12273 (class 1259 OID 149208) +-- Name: part1; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.part1 ( + col1 bigint NOT NULL +); +ALTER TABLE ONLY source.table_for_partition ATTACH PARTITION source.part1 FOR VALUES FROM ('1') TO ('23'); + + +ALTER TABLE source.part1 OWNER TO enterprisedb; + +-- +-- TOC entry 12274 (class 1259 OID 149213) +-- Name: table_for_partition_1; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_partition_1 ( + col1 bigint +) +PARTITION BY RANGE (col1); + + +ALTER TABLE source.table_for_partition_1 OWNER TO enterprisedb; + +-- +-- TOC entry 12275 (class 1259 OID 149216) +-- Name: part3; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.part3 ( + col1 bigint +); +ALTER TABLE ONLY source.table_for_partition_1 ATTACH PARTITION source.part3 FOR VALUES FROM ('1') TO ('10'); + + +ALTER TABLE source.part3 OWNER TO enterprisedb; + +-- +-- TOC entry 12276 (class 1259 OID 149219) +-- Name: part4; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.part4 ( + col1 bigint +); +ALTER TABLE ONLY source.table_for_partition_1 ATTACH PARTITION source.part4 FOR VALUES FROM ('11') TO ('20'); + + +ALTER TABLE source.part4 OWNER TO enterprisedb; + +-- +-- TOC entry 12258 (class 1259 OID 148963) +-- Name: table_for_column; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_column ( + col1 bigint NOT NULL, + col2 text, + col3 text +); + + +ALTER TABLE source.table_for_column OWNER TO enterprisedb; + +-- +-- TOC entry 12256 (class 1259 OID 148895) +-- Name: table_for_constraints; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_constraints ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_constraints OWNER TO enterprisedb; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12256 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON TABLE source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 12262 (class 1259 OID 149004) +-- Name: table_for_identical; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_identical OWNER TO enterprisedb; + +-- +-- TOC entry 12260 (class 1259 OID 148977) +-- Name: table_for_index; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_index OWNER TO enterprisedb; + +-- +-- TOC entry 12269 (class 1259 OID 149128) +-- Name: table_for_primary_key; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE source.table_for_primary_key OWNER TO enterprisedb; + +-- +-- TOC entry 12264 (class 1259 OID 149024) +-- Name: table_for_rule; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_rule OWNER TO enterprisedb; + +-- +-- TOC entry 12266 (class 1259 OID 149048) +-- Name: table_for_trigger; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_trigger OWNER TO enterprisedb; + +-- +-- TOC entry 56893 (class 2606 OID 148904) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='12') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 56893 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT "Exclusion" ON source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56891 (class 2606 OID 148911) +-- Name: table_for_constraints check_con; Type: CHECK CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE source.table_for_constraints + ADD CONSTRAINT check_con CHECK ((col1 > 10)) NOT VALID; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56891 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT check_con ON source.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 56899 (class 2606 OID 148970) +-- Name: table_for_column table_for_column_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_column + ADD CONSTRAINT table_for_column_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56895 (class 2606 OID 148902) +-- Name: table_for_constraints table_for_constraints_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT table_for_constraints_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 148984) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56913 (class 2606 OID 149135) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1, col2); + + +-- +-- TOC entry 56909 (class 2606 OID 149031) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56907 (class 2606 OID 149011) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56911 (class 2606 OID 149055) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148913) +-- Name: table_for_constraints unique; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "unique" UNIQUE (col1); + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 56897 +-- Name: CONSTRAINT "unique" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT "unique" ON source.table_for_constraints IS 'cmnt'; + + +-- +-- TOC entry 56900 (class 1259 OID 149023) +-- Name: index1; Type: INDEX; Schema: source; Owner: enterprisedb +-- + +CREATE INDEX index1 ON source.table_for_index USING btree (col2 varchar_pattern_ops); + + +-- +-- TOC entry 56905 (class 1259 OID 149012) +-- Name: index_identical; Type: INDEX; Schema: source; Owner: enterprisedb +-- + +CREATE INDEX index_identical ON source.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56901 (class 1259 OID 149211) +-- Name: index_same; Type: INDEX; Schema: source; Owner: enterprisedb +-- + +CREATE INDEX index_same ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56902 (class 1259 OID 149022) +-- Name: index_source; Type: INDEX; Schema: source; Owner: enterprisedb +-- + +CREATE INDEX index_source ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 61044 (class 2618 OID 149032) +-- Name: table_for_rule rule1; Type: RULE; Schema: source; Owner: enterprisedb +-- + +CREATE RULE rule1 AS + ON UPDATE TO source.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61070 (class 0 OID 0) +-- Dependencies: 61044 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON RULE rule1 ON source.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61045 (class 2618 OID 149033) +-- Name: table_for_rule rule2; Type: RULE; Schema: source; Owner: enterprisedb +-- + +CREATE RULE rule2 AS + ON INSERT TO source.table_for_rule DO NOTHING; diff --git a/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/target.sql new file mode 100644 index 000000000..57ef05d6a --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/ppas/10_plus/target.sql @@ -0,0 +1,364 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:55:22 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; +SET row_security = off; + +-- +-- TOC entry 18 (class 2615 OID 139771) +-- Name: target; Type: SCHEMA; Schema: -; Owner: enterprisedb +-- + +CREATE SCHEMA target; + +ALTER SCHEMA target OWNER TO enterprisedb; + +SET default_tablespace = ''; + +CREATE EXTENSION btree_gist + SCHEMA target; + +-- +-- TOC entry 12250 (class 1259 OID 139938) +-- Name: MView; Type: MATERIALIZED VIEW; Schema: target; Owner: enterprisedb +-- + +CREATE MATERIALIZED VIEW target."MView" AS + SELECT 'tekst'::text AS text + WITH NO DATA; + + +ALTER TABLE target."MView" OWNER TO enterprisedb; + +-- +-- TOC entry 12277 (class 1259 OID 149234) +-- Name: table_for_partition_1; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_partition_1 ( + col1 bigint +) +PARTITION BY RANGE (col1); + + +ALTER TABLE target.table_for_partition_1 OWNER TO enterprisedb; + +-- +-- TOC entry 12278 (class 1259 OID 149237) +-- Name: part3; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.part3 ( + col1 bigint +); +ALTER TABLE ONLY target.table_for_partition_1 ATTACH PARTITION target.part3 FOR VALUES FROM ('13') TO ('56'); + + +ALTER TABLE target.part3 OWNER TO enterprisedb; + +-- +-- TOC entry 12259 (class 1259 OID 148971) +-- Name: table_for_column; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_column ( + col1 bigint, + col2 bigint, + col4 text +); + + +ALTER TABLE target.table_for_column OWNER TO enterprisedb; + +-- +-- TOC entry 12268 (class 1259 OID 149089) +-- Name: table_for_constraints; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_constraints ( + col1 integer NOT NULL, + col2 text, + CONSTRAINT check_con CHECK ((col1 > 30)) +); + + +ALTER TABLE target.table_for_constraints OWNER TO enterprisedb; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: target; Owner: enterprisedb +-- + +COMMENT ON TABLE target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: target; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT check_con ON target.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 12257 (class 1259 OID 148960) +-- Name: table_for_del; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_del ( +); + + +ALTER TABLE target.table_for_del OWNER TO enterprisedb; + +-- +-- TOC entry 12271 (class 1259 OID 149172) +-- Name: table_for_foreign_key; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_foreign_key ( + col1 integer NOT NULL, + col2 "char", + col3 bigint +); + + +ALTER TABLE target.table_for_foreign_key OWNER TO enterprisedb; + +-- +-- TOC entry 12263 (class 1259 OID 149013) +-- Name: table_for_identical; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_identical OWNER TO enterprisedb; + +-- +-- TOC entry 12261 (class 1259 OID 148986) +-- Name: table_for_index; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_index OWNER TO enterprisedb; + +-- +-- TOC entry 12270 (class 1259 OID 149144) +-- Name: table_for_primary_key; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE target.table_for_primary_key OWNER TO enterprisedb; + +-- +-- TOC entry 12265 (class 1259 OID 149034) +-- Name: table_for_rule; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_rule OWNER TO enterprisedb; + +-- +-- TOC entry 12267 (class 1259 OID 149066) +-- Name: table_for_trigger; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_trigger OWNER TO enterprisedb; + + +-- +-- TOC entry 56906 (class 2606 OID 149097) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='15') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56906 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: target; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT "Exclusion" ON target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56910 (class 2606 OID 149176) +-- Name: table_for_foreign_key table_for_foreign_key_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_foreign_key + ADD CONSTRAINT table_for_foreign_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148993) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56908 (class 2606 OID 149151) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56902 (class 2606 OID 149041) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56900 (class 2606 OID 149020) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 149073) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56893 (class 1259 OID 148994) +-- Name: index1; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX index1 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56894 (class 1259 OID 148995) +-- Name: index2; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX index2 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56898 (class 1259 OID 149021) +-- Name: index_identical; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX index_identical ON target.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56895 (class 1259 OID 149212) +-- Name: index_same; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX index_same ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56892 (class 1259 OID 139945) +-- Name: mview_index; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX mview_index ON target."MView" USING btree (text text_pattern_ops); + + +-- +-- TOC entry 61045 (class 2618 OID 149042) +-- Name: table_for_rule rule1; Type: RULE; Schema: target; Owner: enterprisedb +-- + +CREATE RULE rule1 AS + ON UPDATE TO target.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 61045 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: target; Owner: enterprisedb +-- + +COMMENT ON RULE rule1 ON target.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61046 (class 2618 OID 149043) +-- Name: table_for_rule rule2; Type: RULE; Schema: target; Owner: enterprisedb +-- + +CREATE RULE rule2 AS + ON UPDATE TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61047 (class 2618 OID 149044) +-- Name: table_for_rule rule3; Type: RULE; Schema: target; Owner: enterprisedb +-- + +CREATE RULE rule3 AS + ON INSERT TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61050 (class 0 OID 139938) +-- Dependencies: 12250 61062 +-- Name: MView; Type: MATERIALIZED VIEW DATA; Schema: target; Owner: enterprisedb +-- + +REFRESH MATERIALIZED VIEW target."MView"; diff --git a/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql new file mode 100644 index 000000000..67ec216d6 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql @@ -0,0 +1,311 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:54:15 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; + +-- +-- TOC entry 17 (class 2615 OID 139770) +-- Name: source; Type: SCHEMA; Schema: -; Owner: enterprisedb +-- + +CREATE SCHEMA source; + + +ALTER SCHEMA source OWNER TO enterprisedb; + +SET default_tablespace = ''; + + +CREATE EXTENSION btree_gist + SCHEMA source; + + +-- +-- TOC entry 12258 (class 1259 OID 148963) +-- Name: table_for_column; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_column ( + col1 bigint NOT NULL, + col2 text, + col3 text +); + + +ALTER TABLE source.table_for_column OWNER TO enterprisedb; + +-- +-- TOC entry 12256 (class 1259 OID 148895) +-- Name: table_for_constraints; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_constraints ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_constraints OWNER TO enterprisedb; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12256 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON TABLE source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 12262 (class 1259 OID 149004) +-- Name: table_for_identical; Type: TABLE; Schema: source; Owner: enterprisedb; +-- + +CREATE TABLE source.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_identical OWNER TO enterprisedb;; + +-- +-- TOC entry 12260 (class 1259 OID 148977) +-- Name: table_for_index; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_index OWNER TO enterprisedb; + +-- +-- TOC entry 12269 (class 1259 OID 149128) +-- Name: table_for_primary_key; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE source.table_for_primary_key OWNER TO enterprisedb; + +-- +-- TOC entry 12264 (class 1259 OID 149024) +-- Name: table_for_rule; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_rule OWNER TO enterprisedb; + +-- +-- TOC entry 12266 (class 1259 OID 149048) +-- Name: table_for_trigger; Type: TABLE; Schema: source; Owner: enterprisedb +-- + +CREATE TABLE source.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE source.table_for_trigger OWNER TO enterprisedb; + +-- +-- TOC entry 56893 (class 2606 OID 148904) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='12') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 56893 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT "Exclusion" ON source.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56891 (class 2606 OID 148911) +-- Name: table_for_constraints check_con; Type: CHECK CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE source.table_for_constraints + ADD CONSTRAINT check_con CHECK ((col1 > 10)) NOT VALID; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56891 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT check_con ON source.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 56899 (class 2606 OID 148970) +-- Name: table_for_column table_for_column_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_column + ADD CONSTRAINT table_for_column_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56895 (class 2606 OID 148902) +-- Name: table_for_constraints table_for_constraints_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT table_for_constraints_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 148984) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56913 (class 2606 OID 149135) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1, col2); + + +-- +-- TOC entry 56909 (class 2606 OID 149031) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56907 (class 2606 OID 149011) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb; +-- + +ALTER TABLE ONLY source.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56911 (class 2606 OID 149055) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148913) +-- Name: table_for_constraints unique; Type: CONSTRAINT; Schema: source; Owner: enterprisedb +-- + +ALTER TABLE ONLY source.table_for_constraints + ADD CONSTRAINT "unique" UNIQUE (col1); + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 56897 +-- Name: CONSTRAINT "unique" ON table_for_constraints; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT "unique" ON source.table_for_constraints IS 'cmnt'; + + +-- +-- TOC entry 56900 (class 1259 OID 149023) +-- Name: index1; Type: INDEX; Schema: source; Owner: enterprisedb +-- + +CREATE INDEX index1 ON source.table_for_index USING btree (col2 varchar_pattern_ops); + + +-- +-- TOC entry 56905 (class 1259 OID 149012) +-- Name: index_identical; Type: INDEX; Schema: source; Owner: enterprisedb; +-- + +CREATE INDEX index_identical ON source.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56901 (class 1259 OID 149211) +-- Name: index_same; Type: INDEX; Schema: source; Owner: enterprisedb +-- + +CREATE INDEX index_same ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56902 (class 1259 OID 149022) +-- Name: index_source; Type: INDEX; Schema: source; Owner: enterprisedb +-- + +CREATE INDEX index_source ON source.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 61044 (class 2618 OID 149032) +-- Name: table_for_rule rule1; Type: RULE; Schema: source; Owner: enterprisedb +-- + +CREATE RULE rule1 AS + ON UPDATE TO source.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61070 (class 0 OID 0) +-- Dependencies: 61044 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: source; Owner: enterprisedb +-- + +COMMENT ON RULE rule1 ON source.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61045 (class 2618 OID 149033) +-- Name: table_for_rule rule2; Type: RULE; Schema: source; Owner: enterprisedb +-- + +CREATE RULE rule2 AS + ON INSERT TO source.table_for_rule DO NOTHING; + diff --git a/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql new file mode 100644 index 000000000..f64765224 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql @@ -0,0 +1,337 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.7 +-- Dumped by pg_dump version 12beta2 + +-- Started on 2019-11-01 12:55:22 IST + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; + +-- +-- TOC entry 18 (class 2615 OID 139771) +-- Name: target; Type: SCHEMA; Schema: -; Owner: enterprisedb +-- + +CREATE SCHEMA target; + + +ALTER SCHEMA target OWNER TO enterprisedb; + +SET default_tablespace = ''; + +CREATE EXTENSION btree_gist + SCHEMA target; + +-- +-- TOC entry 12250 (class 1259 OID 139938) +-- Name: MView; Type: MATERIALIZED VIEW; Schema: target; Owner: enterprisedb +-- + +CREATE MATERIALIZED VIEW target."MView" AS + SELECT 'tekst'::text AS text + WITH NO DATA; + + +ALTER TABLE target."MView" OWNER TO enterprisedb; + +-- +-- TOC entry 12259 (class 1259 OID 148971) +-- Name: table_for_column; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_column ( + col1 bigint, + col2 bigint, + col4 text +); + + +ALTER TABLE target.table_for_column OWNER TO enterprisedb; + +-- +-- TOC entry 12268 (class 1259 OID 149089) +-- Name: table_for_constraints; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_constraints ( + col1 integer NOT NULL, + col2 text, + CONSTRAINT check_con CHECK ((col1 > 30)) +); + + +ALTER TABLE target.table_for_constraints OWNER TO enterprisedb; + +-- +-- TOC entry 61066 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: TABLE table_for_constraints; Type: COMMENT; Schema: target; Owner: enterprisedb +-- + +COMMENT ON TABLE target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 61067 (class 0 OID 0) +-- Dependencies: 12268 +-- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: target; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT check_con ON target.table_for_constraints IS 'coment'; + + +-- +-- TOC entry 12257 (class 1259 OID 148960) +-- Name: table_for_del; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_del ( +); + + +ALTER TABLE target.table_for_del OWNER TO enterprisedb; + +-- +-- TOC entry 12271 (class 1259 OID 149172) +-- Name: table_for_foreign_key; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_foreign_key ( + col1 integer NOT NULL, + col2 "char", + col3 bigint +); + + +ALTER TABLE target.table_for_foreign_key OWNER TO enterprisedb; + +-- +-- TOC entry 12263 (class 1259 OID 149013) +-- Name: table_for_identical; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_identical ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_identical OWNER TO enterprisedb; + +-- +-- TOC entry 12261 (class 1259 OID 148986) +-- Name: table_for_index; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_index ( + col1 integer NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_index OWNER TO enterprisedb; + +-- +-- TOC entry 12270 (class 1259 OID 149144) +-- Name: table_for_primary_key; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_primary_key ( + col1 integer NOT NULL, + col2 text NOT NULL +); + + +ALTER TABLE target.table_for_primary_key OWNER TO enterprisedb; + +-- +-- TOC entry 12265 (class 1259 OID 149034) +-- Name: table_for_rule; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_rule ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_rule OWNER TO enterprisedb; + +-- +-- TOC entry 12267 (class 1259 OID 149066) +-- Name: table_for_trigger; Type: TABLE; Schema: target; Owner: enterprisedb +-- + +CREATE TABLE target.table_for_trigger ( + col1 bigint NOT NULL, + col2 text +); + + +ALTER TABLE target.table_for_trigger OWNER TO enterprisedb; + + +-- +-- TOC entry 56906 (class 2606 OID 149097) +-- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_constraints + ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='15') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; + + +-- +-- TOC entry 61068 (class 0 OID 0) +-- Dependencies: 56906 +-- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: target; Owner: enterprisedb +-- + +COMMENT ON CONSTRAINT "Exclusion" ON target.table_for_constraints IS 'comments'; + + +-- +-- TOC entry 56910 (class 2606 OID 149176) +-- Name: table_for_foreign_key table_for_foreign_key_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_foreign_key + ADD CONSTRAINT table_for_foreign_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56897 (class 2606 OID 148993) +-- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_index + ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56908 (class 2606 OID 149151) +-- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_primary_key + ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56902 (class 2606 OID 149041) +-- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_rule + ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56900 (class 2606 OID 149020) +-- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_identical + ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56904 (class 2606 OID 149073) +-- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: target; Owner: enterprisedb +-- + +ALTER TABLE ONLY target.table_for_trigger + ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); + + +-- +-- TOC entry 56893 (class 1259 OID 148994) +-- Name: index1; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX index1 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56894 (class 1259 OID 148995) +-- Name: index2; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX index2 ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56898 (class 1259 OID 149021) +-- Name: index_identical; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX index_identical ON target.table_for_identical USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56895 (class 1259 OID 149212) +-- Name: index_same; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX index_same ON target.table_for_index USING btree (col2 text_pattern_ops); + + +-- +-- TOC entry 56892 (class 1259 OID 139945) +-- Name: mview_index; Type: INDEX; Schema: target; Owner: enterprisedb +-- + +CREATE INDEX mview_index ON target."MView" USING btree (text text_pattern_ops); + + +-- +-- TOC entry 61045 (class 2618 OID 149042) +-- Name: table_for_rule rule1; Type: RULE; Schema: target; Owner: enterprisedb +-- + +CREATE RULE rule1 AS + ON UPDATE TO target.table_for_rule DO INSTEAD NOTHING; + + +-- +-- TOC entry 61069 (class 0 OID 0) +-- Dependencies: 61045 +-- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: target; Owner: enterprisedb +-- + +COMMENT ON RULE rule1 ON target.table_for_rule IS 'comments'; + + +-- +-- TOC entry 61046 (class 2618 OID 149043) +-- Name: table_for_rule rule2; Type: RULE; Schema: target; Owner: enterprisedb +-- + +CREATE RULE rule2 AS + ON UPDATE TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61047 (class 2618 OID 149044) +-- Name: table_for_rule rule3; Type: RULE; Schema: target; Owner: enterprisedb +-- + +CREATE RULE rule3 AS + ON INSERT TO target.table_for_rule DO NOTHING; + + +-- +-- TOC entry 61050 (class 0 OID 139938) +-- Dependencies: 12250 61062 +-- Name: MView; Type: MATERIALIZED VIEW DATA; Schema: target; Owner: enterprisedb +-- + +REFRESH MATERIALIZED VIEW target."MView"; diff --git a/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py b/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py new file mode 100644 index 000000000..3e790bc06 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py @@ -0,0 +1,204 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2019, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import uuid +import json +import os +import random + +from pgadmin.utils import server_utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from .utils import create_table, create_schema, restore_schema +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.versioned_template_loader import \ + get_version_mapping_directories + + +class SchemaDiffTestCase(BaseTestGenerator): + """ This class will test the schema diff. """ + scenarios = [ + # Fetching default URL for database node. + ('Schema diff comparison', dict( + url='schema_diff/compare/{0}/{1}/{2}/{3}/{4}/{5}/{6}')) + ] + + def setUp(self): + self.src_database = "db_schema_diff_src_%s" % str(uuid.uuid4())[1:8] + self.tar_database = "db_schema_diff_tar_%s" % str(uuid.uuid4())[1:8] + + self.src_db_id = utils.create_database(self.server, self.src_database) + self.tar_db_id = utils.create_database(self.server, self.tar_database) + + self.server = parent_node_dict["server"][-1]["server"] + self.server_id = parent_node_dict["server"][-1]["server_id"] + self.nodes = ['table', 'function', 'procedure', 'view', 'mview'] + self.restore_backup() + + def restore_backup(self): + self.sql_folder = self.get_sql_folder() + + if self.sql_folder is None: + raise FileNotFoundError('Schema diff folder does not exists') + + src_sql_path = os.path.join(self.sql_folder, 'source.sql') + tar_sql_path = os.path.join(self.sql_folder, 'target.sql') + + if not os.path.exists(src_sql_path): + raise FileNotFoundError( + '{} file does not exists'.format(src_sql_path)) + + if not os.path.exists(tar_sql_path): + raise FileNotFoundError( + '{} file does not exists'.format(tar_sql_path)) + + self.src_schema_id = restore_schema(self.server, self.src_database, + 'source', src_sql_path) + self.tar_schema_id = restore_schema(self.server, self.tar_database, + 'target', tar_sql_path) + + def get_sql_folder(self): + """ + This function will get the appropriate test folder based on + server version and their existence. + + :param module_path: Path of the module to be tested. + :return: + """ + # Join the application path, module path and tests folder + tests_folder_path = os.path.dirname(os.path.abspath(__file__)) + + # A folder name matching the Server Type (pg, ppas) takes priority so + # check whether that exists or not. If so, than check the version + # folder in it, else look directly in the 'tests' folder. + absolute_path = os.path.join(tests_folder_path, self.server['type']) + if not os.path.exists(absolute_path): + absolute_path = tests_folder_path + + # Iterate the version mapping directories. + for version_mapping in get_version_mapping_directories( + self.server['type']): + if version_mapping['number'] > \ + self.server_information['server_version']: + continue + + complete_path = os.path.join(absolute_path, + version_mapping['name']) + + if os.path.exists(complete_path): + return complete_path + + return None + + def compare(self): + comp_url = self.url.format(self.trans_id, self.server_id, + self.src_db_id, + self.src_schema_id, + self.server_id, + self.tar_db_id, + self.tar_schema_id + ) + + response = self.tester.get(comp_url) + + self.assertEquals(response.status_code, 200) + return json.loads(response.data.decode('utf-8')) + + def runTest(self): + """ This function will test the schema diff.""" + + response = self.tester.get("schema_diff/initialize") + self.assertEquals(response.status_code, 200) + response_data = json.loads(response.data.decode('utf-8')) + self.trans_id = response_data['data']['schemaDiffTransId'] + + url = 'schema_diff/server/connect/{}'.format(self.server_id) + data = {'password': self.server['db_password']} + response = self.tester.post(url, + data=json.dumps(data), + content_type='html/json' + ) + response = self.tester.post( + 'schema_diff/database/connect/{0}/{1}'.format( + self.server_id, + self.src_db_id)) + response = self.tester.post( + 'schema_diff/database/connect/{0}/{1}'.format( + self.server_id, + self.tar_db_id)) + + response_data = self.compare() + + diff_file = os.path.join(self.sql_folder, 'diff_{0}.sql'.format( + str(random.randint(1, 99999)))) + file_obj = open(diff_file, 'a') + + for diff in response_data['data']: + if diff['type'] in self.nodes: + src_obj_oid = tar_obj_oid = None + if diff['status'] == 'Source Only' or\ + diff['status'] == 'Target Only': + src_obj_oid = tar_obj_oid = diff['oid'] + elif diff['status'] == 'Different': + src_obj_oid = diff['source_oid'] + tar_obj_oid = diff['target_oid'] + + if src_obj_oid is not None: + url = 'schema_diff/ddl_compare/{0}/{1}/{2}/{3}/{4}/{5}/' \ + '{6}/{7}/{8}/{9}/{10}/'.format(self.trans_id, + self.server_id, + self.src_db_id, + self.src_schema_id, + self.server_id, + self.tar_db_id, + self.tar_schema_id, + src_obj_oid, + tar_obj_oid, + diff['type'], + diff['status'] + ) + + response = self.tester.get(url) + + self.assertEquals(response.status_code, 200) + response_data = json.loads(response.data.decode('utf-8')) + file_obj.write(response_data['diff_ddl']) + + file_obj.close() + try: + restore_schema(self.server, self.tar_database, 'target', + diff_file) + + os.remove(diff_file) + + response_data = self.compare() + for diff in response_data['data']: + if diff['type'] in self.nodes: + self.assertEquals(diff['status'], 'Identical') + except Exception as e: + os.remove(diff_file) + + def tearDown(self): + """This function drop the added database""" + connection = utils.get_db_connection(self.server['db'], + self.server['username'], + self.server['db_password'], + self.server['host'], + self.server['port'], + self.server['sslmode']) + utils.drop_database(connection, self.src_database) + connection = utils.get_db_connection(self.server['db'], + self.server['username'], + self.server['db_password'], + self.server['host'], + self.server['port'], + self.server['sslmode']) + utils.drop_database(connection, self.tar_database) diff --git a/web/pgadmin/tools/schema_diff/tests/utils.py b/web/pgadmin/tools/schema_diff/tests/utils.py new file mode 100644 index 000000000..ee513e490 --- /dev/null +++ b/web/pgadmin/tools/schema_diff/tests/utils.py @@ -0,0 +1,103 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2019, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + +import sys +import traceback + +from regression.python_test_utils import test_utils as utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils + + +def restore_schema(server, db_name, schema_name, sql_path): + connection = utils.get_db_connection(db_name, + server['username'], + server['db_password'], + server['host'], + server['port'], + server['sslmode'] + ) + + old_isolation_level = connection.isolation_level + connection.set_isolation_level(0) + pg_cursor = connection.cursor() + + sql = '' + with open(sql_path, 'r') as content_file: + sql = content_file.read() + pg_cursor.execute(sql) + connection.set_isolation_level(old_isolation_level) + connection.commit() + + SQL = """SELECT + nsp.oid +FROM + pg_namespace nsp + WHERE nsp.nspname = '{0}'""".format(schema_name) + + pg_cursor.execute(SQL) + schema = pg_cursor.fetchone() + schema_id = None + if schema: + schema_id = schema[0] + connection.close() + return schema_id + + +def create_schema(server, db_name, schema_name): + connection = utils.get_db_connection(db_name, + server['username'], + server['db_password'], + server['host'], + server['port'], + server['sslmode'] + ) + return schema_utils.create_schema(connection, schema_name) + + +def create_table(server, db_name, schema_id, table_name, query): + """ + This function creates a table under provided schema. + :param server: server details + :type server: dict + :param db_name: database name + :type db_name: str + :param schema_id: schema oid + :type schema_name: int + :param table_name: table name + :type table_name: str + :return table_id: table id + :rtype: int + """ + try: + connection = utils.get_db_connection(db_name, + server['username'], + server['db_password'], + server['host'], + server['port'], + server['sslmode']) + old_isolation_level = connection.isolation_level + connection.set_isolation_level(0) + pg_cursor = connection.cursor() + pg_cursor.execute(query) + connection.set_isolation_level(old_isolation_level) + connection.commit() + # Get 'oid' from newly created table + pg_cursor.execute("SELECT oid FROM pg_class WHERE relname='{0}'" + " AND relnamespace = {1}".format(table_name, + schema_id)) + table = pg_cursor.fetchone() + table_id = '' + if table: + table_id = table[0] + connection.close() + return table_id + except Exception: + traceback.print_exc(file=sys.stderr) + raise diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index 63fb45a5c..da612da1f 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/command.py b/web/pgadmin/tools/sqleditor/command.py index 3e4549cb1..05268f6d4 100644 --- a/web/pgadmin/tools/sqleditor/command.py +++ b/web/pgadmin/tools/sqleditor/command.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js index ab91f9bb2..e6c2a9f50 100644 --- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js +++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// @@ -84,6 +84,8 @@ define('tools.querytool', [ this.handler.preferences = this.preferences; this.connIntervalId = null; this.layout = opts.layout; + this.set_server_version(opts.server_ver); + this.trigger('pgadmin-sqleditor:view:initialised'); }, // Bind all the events @@ -2318,6 +2320,12 @@ define('tools.querytool', [ } }, + set_value_to_editor: function(query) { + if (this.gridView && this.gridView.query_tool_obj && !_.isUndefined(query)) { + this.gridView.query_tool_obj.setValue(query); + } + }, + init_events: function() { var self = this; // Listen to the file manager button events diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/primary_keys.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/primary_keys.sql index a96c928f6..d1e398579 100644 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/primary_keys.sql +++ b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/primary_keys.sql @@ -4,5 +4,5 @@ SELECT at.attname, at.attnum, ty.typname FROM pg_attribute at LEFT JOIN pg_type ty ON (ty.oid = at.atttypid) WHERE attrelid={{obj_id}}::oid AND attnum = ANY ( (SELECT con.conkey FROM pg_class rel LEFT OUTER JOIN pg_constraint con ON con.conrelid=rel.oid - AND con.contype='p' WHERE rel.relkind IN ('r','s','t') AND rel.oid = {{obj_id}}::oid)::oid[]) + AND con.contype='p' WHERE rel.relkind IN ('r','s','t') AND rel.oid = ({{obj_id}})::oid)::oid[]) {% endif %} diff --git a/web/pgadmin/tools/sqleditor/tests/__init__.py b/web/pgadmin/tools/sqleditor/tests/__init__.py index 7af45b1b5..168bc2e9b 100644 --- a/web/pgadmin/tools/sqleditor/tests/__init__.py +++ b/web/pgadmin/tools/sqleditor/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/execute_query_test_utils.py b/web/pgadmin/tools/sqleditor/tests/execute_query_test_utils.py index 69058a743..af10564dc 100644 --- a/web/pgadmin/tools/sqleditor/tests/execute_query_test_utils.py +++ b/web/pgadmin/tools/sqleditor/tests/execute_query_test_utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py index f4a72f05e..f3652fc05 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py @@ -3,7 +3,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_editor_history.py b/web/pgadmin/tools/sqleditor/tests/test_editor_history.py index 42b28489e..f94c2598f 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_editor_history.py +++ b/web/pgadmin/tools/sqleditor/tests/test_editor_history.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py b/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py index 539787557..d5aa30c9b 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py +++ b/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py @@ -3,7 +3,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py b/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py index 8da233938..daff5ba82 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py +++ b/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py b/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py index aaa50acb9..dfa6e0b7e 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py +++ b/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py b/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py index 0d10c94d4..9b19491f4 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py +++ b/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py index 774fb46df..5b4b354b4 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_sql_ascii_encoding.py b/web/pgadmin/tools/sqleditor/tests/test_sql_ascii_encoding.py index e3f12d57d..a63a2dead 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_sql_ascii_encoding.py +++ b/web/pgadmin/tools/sqleditor/tests/test_sql_ascii_encoding.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py index c69fc5e6d..a5a6aa45f 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py index 589041acc..59c855fb8 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py +++ b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_view_data.py b/web/pgadmin/tools/sqleditor/tests/test_view_data.py index 3466e5c7c..1096d5f63 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_view_data.py +++ b/web/pgadmin/tools/sqleditor/tests/test_view_data.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py b/web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py index cf76cd7b2..6c9603630 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py +++ b/web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/__init__.py b/web/pgadmin/tools/sqleditor/utils/__init__.py index e6b6a2c14..f0953754a 100644 --- a/web/pgadmin/tools/sqleditor/utils/__init__.py +++ b/web/pgadmin/tools/sqleditor/utils/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/apply_explain_plan_wrapper.py b/web/pgadmin/tools/sqleditor/utils/apply_explain_plan_wrapper.py index 2b5ee5d12..989f97792 100644 --- a/web/pgadmin/tools/sqleditor/utils/apply_explain_plan_wrapper.py +++ b/web/pgadmin/tools/sqleditor/utils/apply_explain_plan_wrapper.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/constant_definition.py b/web/pgadmin/tools/sqleditor/utils/constant_definition.py index 1f3296b63..64eb5c194 100644 --- a/web/pgadmin/tools/sqleditor/utils/constant_definition.py +++ b/web/pgadmin/tools/sqleditor/utils/constant_definition.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/filter_dialog.py b/web/pgadmin/tools/sqleditor/utils/filter_dialog.py index 62baab3de..4edb50817 100644 --- a/web/pgadmin/tools/sqleditor/utils/filter_dialog.py +++ b/web/pgadmin/tools/sqleditor/utils/filter_dialog.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/get_column_types.py b/web/pgadmin/tools/sqleditor/utils/get_column_types.py index 5484985be..74b2e2f60 100644 --- a/web/pgadmin/tools/sqleditor/utils/get_column_types.py +++ b/web/pgadmin/tools/sqleditor/utils/get_column_types.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## @@ -35,12 +35,13 @@ def get_columns_types(is_query_tool, columns_info, table_oid, conn, has_oids): column_types[col['name']] = col_type if not is_query_tool: - col_type['not_null'] = col['not_null'] = \ - rset['rows'][key]['not_null'] + if key in rset['rows']: + col_type['not_null'] = col['not_null'] = \ + rset['rows'][key]['not_null'] - col_type['has_default_val'] = \ - col['has_default_val'] = \ - rset['rows'][key]['has_default_val'] + col_type['has_default_val'] = \ + col['has_default_val'] = \ + rset['rows'][key]['has_default_val'] else: for row in rset['rows']: diff --git a/web/pgadmin/tools/sqleditor/utils/is_begin_required.py b/web/pgadmin/tools/sqleditor/utils/is_begin_required.py index 52a20df7f..2f8194277 100644 --- a/web/pgadmin/tools/sqleditor/utils/is_begin_required.py +++ b/web/pgadmin/tools/sqleditor/utils/is_begin_required.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py b/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py index d64cec54a..0582ca3ab 100644 --- a/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py +++ b/web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/query_tool_fs_utils.py b/web/pgadmin/tools/sqleditor/utils/query_tool_fs_utils.py index df31e62d0..ce24821fe 100644 --- a/web/pgadmin/tools/sqleditor/utils/query_tool_fs_utils.py +++ b/web/pgadmin/tools/sqleditor/utils/query_tool_fs_utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py index 114046f6c..c465598b2 100644 --- a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py +++ b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/save_changed_data.py b/web/pgadmin/tools/sqleditor/utils/save_changed_data.py index 9bb68a398..cdfdc2116 100644 --- a/web/pgadmin/tools/sqleditor/utils/save_changed_data.py +++ b/web/pgadmin/tools/sqleditor/utils/save_changed_data.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/start_running_query.py b/web/pgadmin/tools/sqleditor/utils/start_running_query.py index b4d213992..927e91d02 100644 --- a/web/pgadmin/tools/sqleditor/utils/start_running_query.py +++ b/web/pgadmin/tools/sqleditor/utils/start_running_query.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/tests/__init__.py b/web/pgadmin/tools/sqleditor/utils/tests/__init__.py index 7af45b1b5..168bc2e9b 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/__init__.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py b/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py index e219f9381..3cd0f83b0 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py b/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py index c72159313..bd0585163 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py b/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py index aae642dc8..8b451174a 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_query_tool_fs_utils.py b/web/pgadmin/tools/sqleditor/utils/tests/test_query_tool_fs_utils.py index 541f4e7e9..3174ffa84 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_query_tool_fs_utils.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_query_tool_fs_utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py b/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py index f959b2b4b..a0cb9f766 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py b/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py index 9f5f1f4b0..2c0ec3e21 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/sqleditor/utils/update_session_grid_transaction.py b/web/pgadmin/tools/sqleditor/utils/update_session_grid_transaction.py index 41dbf95ee..ea5ae3c4a 100644 --- a/web/pgadmin/tools/sqleditor/utils/update_session_grid_transaction.py +++ b/web/pgadmin/tools/sqleditor/utils/update_session_grid_transaction.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/templates/js/translations.js b/web/pgadmin/tools/templates/js/translations.js index 74dae1fbf..64541d2be 100644 --- a/web/pgadmin/tools/templates/js/translations.js +++ b/web/pgadmin/tools/templates/js/translations.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/tools/user_management/__init__.py b/web/pgadmin/tools/user_management/__init__.py index 55365173f..26407a86e 100644 --- a/web/pgadmin/tools/user_management/__init__.py +++ b/web/pgadmin/tools/user_management/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2020, The pgAdmin Development Team +# Copyright (C) 2013 - 2019, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/tools/user_management/static/js/user_management.js b/web/pgadmin/tools/user_management/static/js/user_management.js index 64014863f..b1156bf4f 100644 --- a/web/pgadmin/tools/user_management/static/js/user_management.js +++ b/web/pgadmin/tools/user_management/static/js/user_management.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/tools/user_management/templates/user_management/js/current_user.js b/web/pgadmin/tools/user_management/templates/user_management/js/current_user.js index cfcb77813..fc1aed7d4 100644 --- a/web/pgadmin/tools/user_management/templates/user_management/js/current_user.js +++ b/web/pgadmin/tools/user_management/templates/user_management/js/current_user.js @@ -2,7 +2,7 @@ // // pgAdmin 4 - PostgreSQL Tools // -// Copyright (C) 2013 - 2020, The pgAdmin Development Team +// Copyright (C) 2013 - 2019, The pgAdmin Development Team // This software is released under the PostgreSQL Licence // ////////////////////////////////////////////////////////////// diff --git a/web/pgadmin/translations/de/LC_MESSAGES/messages.mo b/web/pgadmin/translations/de/LC_MESSAGES/messages.mo index 20539ec24a0759959b21d56f5d66c87d182883ed..1a42bca2c35858ce2d12d1f6d53f5f06614699c0 100644 GIT binary patch delta 21996 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 diff --git a/web/pgadmin/translations/de/LC_MESSAGES/messages.po b/web/pgadmin/translations/de/LC_MESSAGES/messages.po index 0ff5f7096..9dfb7d0eb 100644 --- a/web/pgadmin/translations/de/LC_MESSAGES/messages.po +++ b/web/pgadmin/translations/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgAdmin 4\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-01-03 19:02+0530\n" +"POT-Creation-Date: 2019-12-06 19:29+0530\n" "PO-Revision-Date: 2017-04-14 22:53+0200\n" "Last-Translator: Jonas Thelemann\n" "Language: de\n" @@ -47,13 +47,13 @@ msgstr "Desktop" #: pgadmin/static/js/slickgrid/editors.js:50 #: pgadmin/static/js/slickgrid/editors.js:60 #: pgadmin/static/js/slickgrid/editors.js:61 -#: pgadmin/static/js/sqleditor/filter_dialog.js:84 -#: pgadmin/tools/datagrid/static/js/show_data.js:143 -#: pgadmin/tools/datagrid/static/js/show_data.js:218 +#: pgadmin/static/js/sqleditor/filter_dialog.js:83 +#: pgadmin/tools/datagrid/static/js/show_data.js:142 +#: pgadmin/tools/datagrid/static/js/show_data.js:217 #: pgadmin/tools/import_export/static/js/import_export.js:500 -#: pgadmin/tools/maintenance/static/js/maintenance.js:302 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2005 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2035 +#: pgadmin/tools/maintenance/static/js/maintenance.js:301 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1999 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2029 msgid "OK" msgstr "OK" @@ -456,7 +456,7 @@ msgstr "Erforderliche Eigenschaften fehlen." #: pgadmin/browser/utils.py:386 #: pgadmin/static/js/alertify.pgadmin.defaults.js:102 #: pgadmin/static/js/alertify.pgadmin.defaults.js:163 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:305 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:303 #: pgadmin/tools/grant_wizard/__init__.py:129 pgadmin/utils/exception.py:35 msgid "Connection to the server has been lost." msgstr "Die Verbindung zum Server wurde unterbrochen." @@ -577,7 +577,7 @@ msgid "No parameters were changed." msgstr "" #: pgadmin/browser/server_groups/servers/__init__.py:767 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:567 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:562 #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:370 #: pgadmin/browser/server_groups/servers/databases/extensions/__init__.py:264 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py:395 @@ -599,7 +599,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:365 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:569 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py:436 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:888 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:922 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:393 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py:484 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py:478 @@ -772,33 +772,33 @@ msgstr "Konnte nicht das Hilfsprogramm für die Operation '%s' finden" msgid "PostgreSQL" msgstr "PostgreSQL" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:38 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:37 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:21 msgid "Databases" msgstr "Datenbanken" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:375 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:391 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:654 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:724 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:849 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:1021 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:374 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:390 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:649 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:719 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:844 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:1016 msgid "Could not find the database on the server." msgstr "Konnte nicht die Datenbank auf dem Server finden." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:469 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:468 msgid "Database connected." msgstr "Datenbank verbunden." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:488 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:485 msgid "Database could not be disconnected." msgstr "Datenbank konnte nicht getrennt werden." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:492 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:489 msgid "Database disconnected." msgstr "Datenbank getrennt." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:777 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:772 #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:483 #: pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py:522 #: pgadmin/browser/server_groups/servers/databases/extensions/__init__.py:357 @@ -813,10 +813,10 @@ msgstr "Datenbank getrennt." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:548 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:488 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py:453 -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:830 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:829 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py:441 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:462 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1051 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1085 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:474 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py:565 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py:591 @@ -834,11 +834,11 @@ msgstr "Datenbank getrennt." msgid "Error: Object not found." msgstr "Fehler: Objekt nicht gefunden." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:780 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:775 msgid "The specified database could not be found.\n" msgstr "Die angegebene Datenbank konnte nicht gefunden werden.\n" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:876 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:871 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:728 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1561 msgid " -- definition incomplete" @@ -934,19 +934,19 @@ msgstr "Umwandlung..." #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:93 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:39 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:210 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:182 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:107 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:670 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:712 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:119 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:105 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:53 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:292 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:181 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:106 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:669 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:710 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:118 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:104 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:52 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:289 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:358 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:131 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:130 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:265 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:324 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:184 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:183 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:324 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:148 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:112 @@ -998,22 +998,22 @@ msgstr "Name" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:114 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js:65 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:393 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:185 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:110 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:673 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:716 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:123 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:109 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:295 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:184 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:109 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:672 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:714 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:122 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:108 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:292 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:361 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:146 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:145 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:254 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:327 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:187 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:186 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:328 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:151 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:115 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:312 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:309 #: pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js:87 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:391 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:344 @@ -1128,56 +1128,56 @@ msgstr "Quelltyp" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:654 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:658 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:662 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:137 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:158 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:692 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:702 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:747 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:750 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:758 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:781 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:735 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:748 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:772 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:789 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:805 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:853 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:144 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:416 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:513 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:538 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:561 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:576 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:604 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:130 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:402 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:499 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:523 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:550 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:565 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:593 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:315 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:346 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:349 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:136 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:157 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:691 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:701 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:746 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:749 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:757 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:780 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:733 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:746 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:770 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:787 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:803 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:851 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:143 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:415 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:512 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:537 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:560 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:575 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:603 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:129 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:401 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:498 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:522 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:549 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:564 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:592 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:311 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:342 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:345 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:384 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:388 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:392 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:396 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:400 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:404 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:407 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:411 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:415 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:418 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:440 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:166 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:179 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:191 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:207 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:250 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:268 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:292 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:318 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:323 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:414 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:436 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:165 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:190 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:249 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:267 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:291 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:317 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:322 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:350 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:375 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:385 @@ -1189,14 +1189,14 @@ msgstr "Quelltyp" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:173 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:136 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:140 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:338 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:343 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:367 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:376 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:381 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:335 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:340 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:364 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:373 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:378 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:383 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:386 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:389 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:393 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:390 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:395 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:408 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:412 @@ -1251,22 +1251,22 @@ msgstr "Systemumwandlung?" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js:74 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:403 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:674 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:306 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:113 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:676 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:719 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:127 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:113 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:59 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:477 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:305 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:112 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:675 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:717 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:126 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:112 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:58 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:473 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:411 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:203 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:202 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:397 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:515 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:514 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:762 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:169 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:132 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:334 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:331 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:465 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:140 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:206 @@ -1349,7 +1349,7 @@ msgstr "Ereignisauslöser..." #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:331 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:154 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:118 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:315 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:312 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:355 #: pgadmin/dashboard/static/js/dashboard.js:1129 #: pgadmin/dashboard/static/js/dashboard.js:1387 @@ -1361,7 +1361,7 @@ msgstr "Besitzer" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:111 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:155 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:242 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:199 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:198 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:286 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:103 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:144 @@ -1370,28 +1370,28 @@ msgstr "Aktiviert?" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:120 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:39 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:316 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:315 msgid "Trigger function" msgstr "Auslöserfunktion" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:124 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:205 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:267 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:272 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:347 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:387 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:391 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:404 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:417 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:429 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:459 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:464 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:204 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:266 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:271 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:346 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:386 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:390 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:403 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:416 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:428 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:458 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:463 msgid "Events" msgstr "Ereignisse" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:132 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:264 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:456 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:263 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:455 msgid "When" msgstr "Wenn" @@ -1410,7 +1410,7 @@ msgstr "Wenn" #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:784 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:222 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:169 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:409 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:406 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:514 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:378 msgid "Security labels" @@ -1443,14 +1443,14 @@ msgstr "Sicherheitsetiketten" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1124 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:167 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:130 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:317 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:320 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:323 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:326 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:329 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:332 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:400 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:412 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:467 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:397 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:409 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:464 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:516 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:360 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:372 @@ -1557,11 +1557,11 @@ msgstr "Verschiebbar?" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:189 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:479 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:195 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:321 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:495 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:530 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:320 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:491 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:529 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:811 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:455 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:452 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:473 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:163 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:221 @@ -1761,8 +1761,8 @@ msgstr "Typ" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:214 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:129 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:161 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:319 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:396 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:316 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:393 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:420 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:427 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:440 @@ -1945,7 +1945,7 @@ msgid "Schema dropped" msgstr "Schema gelöscht" #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:781 -#: pgadmin/static/js/backform.pgadmin.js:1837 +#: pgadmin/static/js/backform.pgadmin.js:1833 msgid "Definition incomplete." msgstr "Definition unvollständig." @@ -1964,23 +1964,23 @@ msgstr "Konnte nicht das angegebene Katalogobjekt finden." #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:594 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:60 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:23 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:269 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:268 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:786 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:787 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:788 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:909 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:898 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:899 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:143 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:344 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:417 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:908 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:896 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:897 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:142 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:340 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:413 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:421 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:427 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:428 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:401 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:495 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:496 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:461 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:460 #: pgadmin/tools/import_export/static/js/import_export.js:179 #: pgadmin/tools/import_export/static/js/import_export.js:199 #: pgadmin/tools/import_export/static/js/import_export.js:237 @@ -2030,7 +2030,7 @@ msgstr "Datentyp" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:85 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:171 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:449 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:375 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:372 msgid "Collation" msgstr "Kollation" @@ -2148,7 +2148,7 @@ msgstr "Domänen-Einschränkung..." #: pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js:65 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:415 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:21 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:127 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:614 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:679 msgid "Check" @@ -2156,7 +2156,7 @@ msgstr "Überprüfung" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js:97 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:419 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:136 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:135 msgid "No inherit?" msgstr "" @@ -2167,7 +2167,7 @@ msgid "Validate?" msgstr "Validieren?" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:177 msgid "Check cannot be empty." msgstr "Überprüfung kann nicht leer sein." @@ -2272,8 +2272,8 @@ msgstr "Fremdtabelle gelöscht" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py:1285 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py:1330 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1367 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1417 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1401 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1451 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1356 msgid "-- Please create column(s) first..." msgstr "-- Bitte zuerst Spalte(n) erstellen..." @@ -2282,8 +2282,6 @@ msgstr "-- Bitte zuerst Spalte(n) erstellen..." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:487 #: pgadmin/browser/static/js/browser.js:213 #: pgadmin/misc/static/explain/js/explain.js:1219 -#: pgadmin/misc/static/explain/js/explain.js:1348 -#: pgadmin/misc/static/explain/js/explain.js:1349 #: pgadmin/misc/statistics/static/js/statistics.js:129 msgid "Statistics" msgstr "Statistiken" @@ -2293,7 +2291,7 @@ msgid "Inherited From" msgstr "Geerbt von" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:259 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:176 msgid "Column Name cannot be empty." msgstr "Spaltenname kann nicht leer sein." @@ -2490,7 +2488,7 @@ msgid "FTS Dictionary..." msgstr "FTS-Wörterbuch..." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js:153 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:342 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:339 msgid "Template" msgstr "Vorlage" @@ -2644,7 +2642,7 @@ msgstr "Lexize-Funktion muss ausgewählt werden." #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:59 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:21 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:457 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:434 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:431 msgid "Functions" msgstr "Funktionen" @@ -2657,29 +2655,29 @@ msgstr "" msgid "Could not find the function node in the database." msgstr "Konnte nicht den Funktionsknoten in der Datenbank finden" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:833 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:832 msgid "The specified function could not be found.\n" msgstr "Die angegebene Funktion konnte nicht gefunden werden.\n" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:850 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:849 msgid "Function dropped." msgstr "Funktion gelöscht." -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1141 -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1320 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1140 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1319 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:334 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:511 msgid "Could not find the function in the database." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1628 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1627 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js:24 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:621 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js:24 msgid "Procedures" msgstr "Prozeduren" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1728 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1727 msgid "Trigger Functions" msgstr "Triggerfunktionen" @@ -2719,7 +2717,7 @@ msgstr "Argumentzahl" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:327 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:150 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:79 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:322 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:321 msgid "Arguments" msgstr "Argumente" @@ -2743,8 +2741,8 @@ msgstr "Rückgabetyp" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:182 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:98 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:100 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:289 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:493 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:288 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:492 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:154 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:155 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:209 @@ -2812,7 +2810,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:338 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:245 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1119 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:405 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:402 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:508 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:366 #: pgadmin/tools/debugger/static/js/direct.js:1707 @@ -2852,7 +2850,7 @@ msgstr "Linksymbol kann nicht leer sein." #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:406 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js:200 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:314 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:338 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:337 msgid "Code cannot be empty." msgstr "Code kann nicht leer sein." @@ -3042,7 +3040,7 @@ msgstr "Kopfzeile kann nicht leer sein." #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:56 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:25 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:450 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:428 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:425 msgid "Sequences" msgstr "Sequenzen" @@ -3205,22 +3203,22 @@ msgid "System schema?" msgstr "Systemschema?" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:409 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:322 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:319 msgid "Default TABLE privileges" msgstr "Standard-TABLE-Berechtigungen" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:412 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:325 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:322 msgid "Default SEQUENCE privileges" msgstr "Standard-SEQUENCE-Berechtigungen" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:415 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:328 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:325 msgid "Default FUNCTION privileges" msgstr "Standard-FUNCTION-Berechtigungen" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:418 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:331 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:328 msgid "Default TYPE privileges" msgstr "Standard-TYPE-Berechtigungen" @@ -3229,9 +3227,9 @@ msgid "Default privileges" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:443 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:53 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:29 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:422 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:419 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:130 msgid "Tables" msgstr "Tabellen" @@ -3239,7 +3237,7 @@ msgstr "Tabellen" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:464 #: pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py:58 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:24 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:445 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:442 msgid "Types" msgstr "Typen" @@ -3300,8 +3298,8 @@ msgstr "Öffentliches Synonym?" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:185 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:221 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:527 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:791 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:808 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:789 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:806 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:275 #: pgadmin/browser/static/js/browser.js:630 #: pgadmin/browser/static/js/node.js:1283 @@ -3310,17 +3308,17 @@ msgstr "Öffentliches Synonym?" #: pgadmin/misc/file_manager/templates/file_manager/index.html:78 #: pgadmin/static/js/backform.pgadmin.js:538 #: pgadmin/static/js/backgrid.pgadmin.js:621 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1741 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1786 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2385 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1735 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1780 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2379 msgid "Yes" msgstr "Ja" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:185 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:221 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:527 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:792 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:809 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:790 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:807 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:275 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:147 #: pgadmin/browser/static/js/browser.js:631 @@ -3330,9 +3328,9 @@ msgstr "Ja" #: pgadmin/misc/file_manager/templates/file_manager/index.html:77 #: pgadmin/static/js/backform.pgadmin.js:539 #: pgadmin/static/js/backgrid.pgadmin.js:622 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1742 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1787 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2386 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1736 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1781 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2380 msgid "No" msgstr "Nein" @@ -3344,32 +3342,32 @@ msgstr "Zielschema kann nicht leer sein." msgid "Target object cannot be empty." msgstr "Zielobjekt kann nicht leer sein." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:359 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:357 msgid "Could not find the table." msgstr "Konnte nicht die Tabelle finden." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:596 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1271 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:630 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1305 msgid "The specified table could not be found." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1054 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1088 msgid "The specified table could not be found.\n" msgstr "Die angegebene Tabelle konnte nicht gefunden werden.\n" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1067 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1101 msgid "Table dropped" msgstr "Tabelle gelöscht" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1145 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1179 msgid "Trigger(s) have been disabled" msgstr "Auslöser wurde(n) deaktiviert" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1147 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1181 msgid "Trigger(s) have been enabled" msgstr "Auslöser wurde(n) aktiviert" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1501 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1535 #, python-format msgid "Table rows counted: %s" msgstr "" @@ -3422,7 +3420,7 @@ msgstr "Spalte ist gelöscht" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:608 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:704 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:856 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:853 msgid "Could not find the column on the server." msgstr "" @@ -3568,70 +3566,70 @@ msgstr "" msgid "Compound Trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:56 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:62 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:68 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:74 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:90 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:61 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:67 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:73 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:89 msgid "Compound Trigger..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:80 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:79 msgid "Enable compound trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:85 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:84 msgid "Disable compound trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:169 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:168 msgid "Disable compound trigger failed" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:188 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:190 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:187 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:189 msgid "Trigger enabled?" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:205 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:209 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:222 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:235 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:248 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:204 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:208 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:221 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:234 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:247 msgid "FOR Events" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:207 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:389 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:388 msgid "INSERT" msgstr "INSERT" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:220 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:402 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:219 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:401 msgid "UPDATE" msgstr "UPDATE" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:233 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:415 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:232 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:414 msgid "DELETE" msgstr "DELETE" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:246 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:428 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:245 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:427 msgid "TRUNCATE" msgstr "TRUNCATE" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:303 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:512 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:302 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:511 msgid "System trigger?" msgstr "Systemauslöser?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:328 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:543 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:327 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:542 msgid "Specify at least one event." msgstr "Geben Sie mindestens ein Ereignis an." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:347 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:346 msgid "" "-- Enter any global declarations below:\n" "\n" @@ -3701,15 +3699,15 @@ msgstr "" msgid "Check constraint updated." msgstr "Überprüfungseinschränkung aktualisiert." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:40 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:39 msgid "Check..." msgstr "Überprüfung..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:46 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:45 msgid "Validate check constraint" msgstr "Überprüfeinschränkung validieren" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:157 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:156 msgid "Don't validate?" msgstr "Nicht validieren?" @@ -3745,7 +3743,7 @@ msgid "Exclusion constraint dropped." msgstr "Ausschlusseinschränkung gelöscht." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:38 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:97 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:96 msgid "Operator class" msgstr "Operatorklasse" @@ -3773,10 +3771,10 @@ msgstr "Bitte geben Sie den Operator für die Spalte an: " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:453 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:381 #: pgadmin/browser/server_groups/servers/static/js/variable.js:341 -#: pgadmin/static/js/backform.pgadmin.js:1260 -#: pgadmin/static/js/backform.pgadmin.js:1370 -#: pgadmin/static/js/backform.pgadmin.js:1550 -#: pgadmin/static/js/backform.pgadmin.js:1669 +#: pgadmin/static/js/backform.pgadmin.js:1259 +#: pgadmin/static/js/backform.pgadmin.js:1366 +#: pgadmin/static/js/backform.pgadmin.js:1546 +#: pgadmin/static/js/backform.pgadmin.js:1665 msgid "Add new row" msgstr "" @@ -3788,7 +3786,7 @@ msgstr "Ausschlusseinschränkung" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:28 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:28 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:29 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:236 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:234 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/stats.sql:7 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/stats.sql:12 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/stats.sql:7 @@ -3798,87 +3796,87 @@ msgstr "Ausschlusseinschränkung" msgid "Index size" msgstr "Indexgröße" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:642 msgid "Exclusion constraint..." msgstr "Ausschlusseinschränkung..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:691 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:512 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:498 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:298 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:690 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:511 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:497 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:295 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:378 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:344 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:196 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:366 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:363 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:40 #: pgadmin/tools/backup/static/js/backup.js:366 #: pgadmin/tools/restore/static/js/restore.js:255 msgid "Tablespace" msgstr "Tablespace" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:701 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:700 msgid "Access method" msgstr "Zugriffsmethode" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:716 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:326 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:715 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:322 msgid "Changing access method will clear columns collection" msgstr "Das Ändern der Zugriffsmethode löscht die Spaltensammlung" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:746 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:560 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:549 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:386 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:745 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:559 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:548 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:382 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:716 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:790 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:204 msgid "Fill factor" msgstr "Füllfaktor" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:749 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:734 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:575 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:564 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:267 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:748 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:732 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:574 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:563 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:266 msgid "Deferrable?" msgstr "Aufschiebbar?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:757 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:747 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:603 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:592 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:291 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:756 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:745 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:602 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:591 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:290 msgid "Deferred?" msgstr "Aufgeschoben?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:779 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:413 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:778 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:409 msgid "Constraint" msgstr "Einschränkung" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:908 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:415 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:401 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:348 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:439 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:907 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:414 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:400 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:344 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:435 msgid "Include columns" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:931 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:242 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:438 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:228 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:424 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:370 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:461 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:930 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:241 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:437 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:227 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:423 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:366 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:457 msgid "Select the column(s)" msgstr "Wählen Sie die Spalte(n)" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1012 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1011 msgid "Please specify name for exclusion constraint." msgstr "Bitte geben Sie den Namen für die Ausschlusseinschränkung an." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1018 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1017 msgid "Please specify columns for exclusion constraint." msgstr "Bitte geben Sie Spalten für Ausschlusseinschränkung an." @@ -3936,53 +3934,53 @@ msgstr "Referenzen" msgid "Referencing" msgstr "Referenzieren" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:616 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:615 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:585 msgid "Foreign key" msgstr "Fremdschlüssel" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:637 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:635 msgid "Foreign key..." msgstr "Fremdschlüssel..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:641 msgid "Validate foreign key" msgstr "Fremdschlüssel validieren" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:771 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:769 msgid "Match type" msgstr "Übereinstimmungstyp" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:788 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:786 msgid "Validated?" msgstr "Validiert?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:804 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:802 msgid "Auto FK index?" msgstr "Automatischer FK-Index?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:852 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:850 msgid "Covering index" msgstr "Abdeckungsindex" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1002 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1000 msgid "On update" msgstr "Beim Aktualisieren" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1003 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1023 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1001 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1021 msgid "Action" msgstr "Aktion" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1022 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1020 msgid "On delete" msgstr "Beim Löschen" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1050 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1048 msgid "Please specify columns for Foreign key." msgstr "Bitte geben Sie Spalten für Fremdschlüssel an." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1059 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1057 msgid "Please specify covering index name." msgstr "Bitte geben Sie den Deckungsindexnamen an." @@ -4028,7 +4026,7 @@ msgstr "{0} gelöscht." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py:996 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:20 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:43 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:42 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:557 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:729 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:811 @@ -4037,7 +4035,7 @@ msgstr "Primärschlüssel" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py:1006 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:20 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:43 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:42 msgid "Unique constraint" msgstr "Eindeutige Einschränkung" @@ -4045,19 +4043,19 @@ msgstr "Eindeutige Einschränkung" msgid "Could not find the constraint in the table." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:536 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:522 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:231 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:535 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:521 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:229 msgid "Index" msgstr "Index" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:644 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:633 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:632 #, python-format msgid "Please specify columns for %s" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:56 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:55 msgid "Oid" msgstr "Oid" @@ -4084,7 +4082,7 @@ msgid "Index is dropped" msgstr "Index ist gelöscht" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:29 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:236 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:234 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:45 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:33 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:49 @@ -4101,59 +4099,63 @@ msgstr "Index ist gelöscht" msgid "Size" msgstr "Größe" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:130 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:128 msgid "Sort order" msgstr "Sortierreihenfolge" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:151 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:149 msgid "NULLs" msgstr "NULLs" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:248 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:254 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:260 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:266 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:272 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:245 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:251 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:257 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:263 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:269 msgid "Index..." msgstr "Index..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:311 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:308 msgid "Access Method" msgstr "Zugriffsmethode" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:390 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:386 msgid "Unique?" msgstr "Eindeutig?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:394 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:390 msgid "Clustered?" msgstr "Geclustert?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:398 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:394 msgid "Valid?" msgstr "Valide?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:402 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:398 msgid "Primary?" msgstr "Primär?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:406 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:402 msgid "System index?" msgstr "Systemindex?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:409 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:405 msgid "Concurrent build?" msgstr "Gleichzeitiges Erstellen?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:501 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:497 +msgid "Tablespace cannot be empty." +msgstr "Tablespace kann nicht leer sein." + +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:503 msgid "Access method cannot be empty." msgstr "Zugriffsmethode kann nicht leer sein." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:509 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:511 msgid "You must specify column name." msgstr "Sie müssen den Spaltennamen angeben." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:514 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:516 msgid "You must specify at least one column." msgstr "Sie müssen mindestens eine Spalte angeben." @@ -4544,39 +4546,39 @@ msgstr "Regel gelöscht" msgid "rule" msgstr "Regel" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:93 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:99 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:105 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:111 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:117 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:92 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:98 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:104 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:110 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:116 msgid "Rule..." msgstr "Regel..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:165 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:164 #: pgadmin/static/js/sqleditor/query_tool_notifications.js:32 #: pgadmin/static/js/sqleditor/query_tool_notifications.js:80 msgid "Event" msgstr "Ereignis" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:179 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:178 msgid "Do instead?" msgstr "" +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:182 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:183 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:184 msgid "Condition" msgstr "Bedingung" +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:188 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:189 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:190 msgid "Commands" msgstr "Befehle" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:195 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:194 msgid "System rule?" msgstr "Systemregel?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:215 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:214 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:241 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:183 msgid "Please specify name." @@ -5138,56 +5140,56 @@ msgstr "Auslöser ist gelöscht" msgid "Trigger" msgstr "Auslöser" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:56 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:62 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:68 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:74 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:90 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:61 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:67 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:73 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:89 msgid "Trigger..." msgstr "Auslöser..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:80 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:79 msgid "Enable trigger" msgstr "Trigger aktivieren" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:85 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:84 msgid "Disable trigger" msgstr "Auslöser deaktivieren" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:169 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:168 msgid "Disable trigger failed" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:205 msgid "Row trigger?" msgstr "Zeilenauslöser?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:247 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:246 msgid "Constraint trigger?" msgstr "Einschränkungsauslöser?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:346 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:345 msgid "Fires" msgstr "Löst aus" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:481 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:480 msgid "Old table" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:482 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:488 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:481 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:487 msgid "Transition" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:487 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:486 msgid "New table" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:536 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:535 msgid "Trigger function cannot be empty." msgstr "Auslöserfunktion kann nicht leer sein." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:556 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:555 msgid "Trigger code cannot be empty." msgstr "Auslösercode kann nicht leer sein." @@ -5576,7 +5578,7 @@ msgid "Size of temporary files" msgstr "Größe der temporären Dateien" #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:45 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:309 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:306 #: pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/stats.sql:2 #: pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/stats.sql:2 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:176 @@ -5630,35 +5632,35 @@ msgstr "Die Datenbank trennen" msgid "Are you sure you want to disconnect the database - %s?" msgstr "Sind Sie sicher, dass Sie die Datenbank trennen möchten - %s?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:337 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:334 #: pgadmin/static/js/browser/server_groups/servers/databases/external_tables/external_tables.js:52 #: pgadmin/tools/backup/static/js/backup.js:192 #: pgadmin/tools/import_export/static/js/import_export.js:108 msgid "Encoding" msgstr "Codierung" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:380 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:377 msgid "Character type" msgstr "Zeichentyp" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:385 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:382 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:413 msgid "Connection limit" msgstr "Verbindungslimitierung" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:388 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:385 msgid "Template?" msgstr "Vorlage?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:392 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:389 msgid "Allow connections?" msgstr "Verbindungen zulassen?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:417 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:414 msgid "Default Privileges" msgstr "Standard-Berechtigungen" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:499 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:496 msgid "Connect to database" msgstr "Zu Datenbank verbinden" @@ -6497,7 +6499,7 @@ msgstr "Art" #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:139 #: pgadmin/browser/static/js/browser.js:224 #: pgadmin/dashboard/static/js/dashboard.js:191 -#: pgadmin/static/js/backform.pgadmin.js:2032 +#: pgadmin/static/js/backform.pgadmin.js:2028 msgid "SQL" msgstr "SQL" @@ -7100,8 +7102,8 @@ msgid "At least one privilege should be selected." msgstr "Mindestens ein Privileg sollte ausgewählt sein." #: pgadmin/browser/server_groups/servers/static/js/server.js:46 -msgid "Security label must be specified." -msgstr "" +msgid "Label must be specified." +msgstr "Etikett muss angegeben werden." #: pgadmin/browser/server_groups/servers/static/js/server.js:79 #: pgadmin/browser/server_groups/servers/static/js/server.js:84 @@ -7202,20 +7204,20 @@ msgstr "" #: pgadmin/misc/file_manager/static/js/create_dialogue.js:188 #: pgadmin/misc/file_manager/static/js/select_dialogue.js:86 #: pgadmin/misc/file_manager/static/js/select_dialogue.js:129 -#: pgadmin/preferences/static/js/preferences.js:435 +#: pgadmin/preferences/static/js/preferences.js:434 #: pgadmin/static/js/slickgrid/editors.js:50 -#: pgadmin/static/js/sqleditor/filter_dialog.js:79 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:62 -#: pgadmin/tools/datagrid/static/js/show_data.js:139 +#: pgadmin/static/js/sqleditor/filter_dialog.js:78 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:61 +#: pgadmin/tools/datagrid/static/js/show_data.js:138 #: pgadmin/tools/debugger/static/js/debugger_ui.js:588 #: pgadmin/tools/debugger/static/js/debugger_ui.js:893 #: pgadmin/tools/import_export/static/js/import_export.js:495 -#: pgadmin/tools/maintenance/static/js/maintenance.js:297 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:56 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2010 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2164 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4222 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4289 +#: pgadmin/tools/maintenance/static/js/maintenance.js:296 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:55 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2004 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2158 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4216 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4283 msgid "Cancel" msgstr "Abbrechen" @@ -7436,7 +7438,7 @@ msgid "Connection timeout (seconds)" msgstr "" #: pgadmin/browser/server_groups/servers/static/js/server.js:1130 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2192 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2186 msgid "Connect to Server" msgstr "Zu Server verbinden" @@ -7689,17 +7691,15 @@ msgid "Dependents" msgstr "Abhängige Objekte" #: pgadmin/browser/static/js/browser.js:348 -#: pgadmin/browser/static/js/toolbar.js:30 -#: pgadmin/browser/static/js/toolbar.js:31 -#: pgadmin/browser/static/js/toolbar.js:91 +#: pgadmin/browser/static/js/toolbar.js:29 +#: pgadmin/browser/static/js/toolbar.js:88 #: pgadmin/tools/datagrid/static/js/datagrid.js:74 msgid "View Data" msgstr "" #: pgadmin/browser/static/js/browser.js:349 #: pgadmin/browser/static/js/toolbar.js:20 -#: pgadmin/browser/static/js/toolbar.js:21 -#: pgadmin/browser/static/js/toolbar.js:93 +#: pgadmin/browser/static/js/toolbar.js:90 #: pgadmin/tools/datagrid/static/js/datagrid.js:75 msgid "Filtered Rows" msgstr "" @@ -7945,10 +7945,10 @@ msgid "Changes will be lost. Are you sure you want to reset?" msgstr "" #: pgadmin/browser/static/js/node.js:1513 -#: pgadmin/preferences/static/js/preferences.js:439 -#: pgadmin/preferences/static/js/preferences.js:464 +#: pgadmin/preferences/static/js/preferences.js:438 +#: pgadmin/preferences/static/js/preferences.js:463 #: pgadmin/tools/datagrid/templates/datagrid/index.html:37 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4297 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4291 msgid "Save" msgstr "Speichern" @@ -7968,20 +7968,17 @@ msgstr "Alles Auswählen" msgid "Unselect All" msgstr "Komplette Auswahl aufheben" -#: pgadmin/browser/static/js/toolbar.js:40 -#: pgadmin/browser/static/js/toolbar.js:41 -#: pgadmin/browser/static/js/toolbar.js:89 +#: pgadmin/browser/static/js/toolbar.js:38 +#: pgadmin/browser/static/js/toolbar.js:86 #: pgadmin/tools/datagrid/static/js/datagrid.js:103 #: pgadmin/tools/datagrid/static/js/datagrid.js:115 #: pgadmin/tools/sqleditor/__init__.py:68 msgid "Query Tool" msgstr "Abfragewerkzeug" -#: pgadmin/browser/static/js/wizard.js:85 #: pgadmin/browser/static/js/wizard.js:86 #: pgadmin/static/js/alertify.pgadmin.defaults.js:261 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:263 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:457 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:455 #: pgadmin/templates/security/messages.html:7 #: pgadmin/tools/user_management/static/js/user_management.js:81 #: pgadmin/tools/user_management/static/js/user_management.js:174 @@ -7989,11 +7986,9 @@ msgstr "Abfragewerkzeug" msgid "Close" msgstr "Schließen" -#: pgadmin/browser/static/js/wizard.js:88 #: pgadmin/browser/static/js/wizard.js:89 #: pgadmin/static/js/alertify.pgadmin.defaults.js:262 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:264 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:458 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:456 msgid "Maximize" msgstr "" @@ -8001,22 +7996,6 @@ msgstr "" msgid "Left panel logo" msgstr "" -#: pgadmin/browser/static/js/wizard.js:124 -msgid "Close error bar" -msgstr "" - -#: pgadmin/browser/static/js/wizard.js:131 -#: pgadmin/browser/templates/browser/index.html:135 pgadmin/help/__init__.py:59 -#: pgadmin/help/__init__.py:70 pgadmin/preferences/static/js/preferences.js:427 -#: pgadmin/static/js/sqleditor/filter_dialog.js:72 -#: pgadmin/static/js/sqleditor/filter_dialog.js:73 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:56 -#: pgadmin/tools/datagrid/static/js/show_data.js:133 -#: pgadmin/tools/maintenance/static/js/maintenance.js:289 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:50 -msgid "Help" -msgstr "Hilfe" - #: pgadmin/browser/static/js/wizard.js:139 #: pgadmin/misc/file_manager/templates/file_manager/index.html:15 msgid "Back" @@ -8054,6 +8033,11 @@ msgstr "Verwaltung" msgid "Tools" msgstr "Werkzeuge" +#: pgadmin/browser/templates/browser/index.html:135 pgadmin/help/__init__.py:59 +#: pgadmin/help/__init__.py:70 pgadmin/static/js/sqleditor/filter_dialog.js:72 +msgid "Help" +msgstr "Hilfe" + #: pgadmin/browser/templates/browser/index.html:157 msgid "Logout" msgstr "Abmelden" @@ -8444,7 +8428,7 @@ msgstr "" #: pgadmin/dashboard/templates/dashboard/database_dashboard.html:88 #: pgadmin/dashboard/templates/dashboard/server_dashboard.html:92 #: pgadmin/misc/file_manager/templates/file_manager/index.html:27 -#: pgadmin/preferences/static/js/preferences.js:492 +#: pgadmin/preferences/static/js/preferences.js:491 msgid "Refresh" msgstr "Aktualisieren" @@ -8964,33 +8948,13 @@ msgstr "" msgid "Analysis" msgstr "" -#: pgadmin/misc/static/explain/js/explain.js:1286 -#: pgadmin/misc/static/explain/js/explain.js:1287 -msgid "Zoom in" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1295 -#: pgadmin/misc/static/explain/js/explain.js:1296 -msgid "Zoom to original" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1304 -#: pgadmin/misc/static/explain/js/explain.js:1305 -msgid "Zoom out" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1319 -#: pgadmin/misc/static/explain/js/explain.js:1320 -msgid "Download" -msgstr "" - #: pgadmin/misc/statistics/static/js/statistics.js:214 msgid "No statistics are available for the selected object." msgstr "Für das ausgewählte Objekt stehen keine Statistiken zur Verfügung." #: pgadmin/preferences/__init__.py:55 #: pgadmin/preferences/static/js/preferences.js:426 -#: pgadmin/preferences/static/js/preferences.js:449 +#: pgadmin/preferences/static/js/preferences.js:448 msgid "Preferences" msgstr "Einstellungen" @@ -9016,17 +8980,17 @@ msgstr "" msgid "Category is not selected." msgstr "" -#: pgadmin/preferences/static/js/preferences.js:483 +#: pgadmin/preferences/static/js/preferences.js:482 msgid "Refresh required" msgstr "" -#: pgadmin/preferences/static/js/preferences.js:484 +#: pgadmin/preferences/static/js/preferences.js:483 msgid "" "A page refresh is required to apply the theme. Do you wish to refresh the" " page now?" msgstr "" -#: pgadmin/preferences/static/js/preferences.js:493 +#: pgadmin/preferences/static/js/preferences.js:492 msgid "Later" msgstr "" @@ -9070,37 +9034,33 @@ msgstr "" msgid "INTERNAL SERVER ERROR" msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:1550 -msgid "Add" -msgstr "" - -#: pgadmin/static/js/backform.pgadmin.js:1841 +#: pgadmin/static/js/backform.pgadmin.js:1837 msgid "No updates." msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:1956 +#: pgadmin/static/js/backform.pgadmin.js:1952 msgid "General" msgstr "Allgemein" -#: pgadmin/static/js/backform.pgadmin.js:2157 +#: pgadmin/static/js/backform.pgadmin.js:2153 msgid "Preview not available..." msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:2618 +#: pgadmin/static/js/backform.pgadmin.js:2605 #: pgadmin/tools/backup/static/js/backup.js:95 #: pgadmin/tools/backup/static/js/backup.js:230 msgid "Note" msgstr "Hinweis" -#: pgadmin/static/js/backform.pgadmin.js:2974 +#: pgadmin/static/js/backform.pgadmin.js:2961 msgid "More" msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:2975 +#: pgadmin/static/js/backform.pgadmin.js:2962 msgid "Less" msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:3059 +#: pgadmin/static/js/backform.pgadmin.js:3046 msgid "Space" msgstr "" @@ -9129,7 +9089,7 @@ msgstr "" msgid "Delete row" msgstr "" -#: pgadmin/static/js/backgrid.pgadmin.js:1098 +#: pgadmin/static/js/backgrid.pgadmin.js:1091 msgid "Array Values" msgstr "" @@ -9283,13 +9243,13 @@ msgstr "Abfrage wurde in %s erfolgreich zurückgegeben." msgid "Sort/Filter options" msgstr "" -#: pgadmin/static/js/sqleditor/filter_dialog.js:239 +#: pgadmin/static/js/sqleditor/filter_dialog.js:238 msgid "Filter updated successfully" msgstr "" -#: pgadmin/static/js/sqleditor/filter_dialog.js:245 -#: pgadmin/tools/datagrid/static/js/show_data.js:238 -#: pgadmin/tools/datagrid/static/js/show_data.js:245 +#: pgadmin/static/js/sqleditor/filter_dialog.js:244 +#: pgadmin/tools/datagrid/static/js/show_data.js:237 +#: pgadmin/tools/datagrid/static/js/show_data.js:244 msgid "Validation Error" msgstr "" @@ -9370,7 +9330,6 @@ msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:40 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:41 -#: pgadmin/tools/datagrid/templates/datagrid/index.html:56 #: pgadmin/tools/datagrid/templates/datagrid/index.html:68 msgid "Find" msgstr "" @@ -9454,14 +9413,14 @@ msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:129 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:131 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4230 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4224 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:663 msgid "Commit" msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:135 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:137 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4227 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4221 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:681 msgid "Rollback" msgstr "" @@ -9539,7 +9498,7 @@ msgstr "Diese URL kann nicht direkt angefordert werden." #: pgadmin/tools/backup/__init__.py:43 #: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:46 #: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:55 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:67 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:66 msgid "Backup" msgstr "Sicherung" @@ -9819,8 +9778,8 @@ msgstr "Sicherung..." #: pgadmin/tools/backup/static/js/backup_dialog.js:71 #: pgadmin/tools/import_export/static/js/import_export.js:685 #: pgadmin/tools/import_export/static/js/import_export.js:699 -#: pgadmin/tools/maintenance/static/js/maintenance.js:477 -#: pgadmin/tools/maintenance/static/js/maintenance.js:488 +#: pgadmin/tools/maintenance/static/js/maintenance.js:476 +#: pgadmin/tools/maintenance/static/js/maintenance.js:487 #: pgadmin/tools/restore/static/js/restore_dialog.js:51 #: pgadmin/tools/restore/static/js/restore_dialog.js:75 msgid "Utility not found" @@ -9828,25 +9787,25 @@ msgstr "" #: pgadmin/tools/backup/static/js/backup_dialog.js:72 #: pgadmin/tools/import_export/static/js/import_export.js:700 -#: pgadmin/tools/maintenance/static/js/maintenance.js:489 +#: pgadmin/tools/maintenance/static/js/maintenance.js:488 #: pgadmin/tools/restore/static/js/restore_dialog.js:76 msgid "Failed to fetch Utility information" msgstr "" -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:159 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:158 msgid "Backup job created." msgstr "Sicherungsjob erstellt." -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:163 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:162 msgid "Backup job creation failed." msgstr "" -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:171 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:170 msgid "Backup job failed." msgstr "Sicherungsjob ist fehlgeschlagen." -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:242 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:229 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:241 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:228 msgid "Please provide a filename" msgstr "Bitte geben Sie einen Dateinamen an" @@ -9895,7 +9854,7 @@ msgstr "" msgid "Data Filter" msgstr "" -#: pgadmin/tools/datagrid/static/js/show_data.js:161 +#: pgadmin/tools/datagrid/static/js/show_data.js:160 msgid "Use SHIFT + ENTER to apply filter..." msgstr "" @@ -10490,30 +10449,6 @@ msgstr "Stapel" msgid "Debugger - " msgstr "Debugger - " -#: pgadmin/tools/debugger/templates/debugger/direct.html:59 -msgid "Step into" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:67 -msgid "Step over" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:75 -msgid "Continue/Start" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:85 -msgid "Toggle breakpoint" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:93 -msgid "Clear all breakpoints" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:103 -msgid "Stop" -msgstr "" - #: pgadmin/tools/grant_wizard/__init__.py:327 msgid "Unable to fetch the {} objects" msgstr "" @@ -10867,7 +10802,7 @@ msgstr "Ausführliche Meldungen" #: pgadmin/tools/maintenance/static/js/maintenance.js:167 #: pgadmin/tools/maintenance/static/js/maintenance.js:183 -#: pgadmin/tools/maintenance/static/js/maintenance.js:483 +#: pgadmin/tools/maintenance/static/js/maintenance.js:482 msgid "Maintenance..." msgstr "Wartung..." @@ -10881,15 +10816,15 @@ msgid "" "cannot be maintained using this utility." msgstr "" -#: pgadmin/tools/maintenance/static/js/maintenance.js:387 -#: pgadmin/tools/maintenance/static/js/maintenance.js:394 +#: pgadmin/tools/maintenance/static/js/maintenance.js:386 +#: pgadmin/tools/maintenance/static/js/maintenance.js:393 msgid "Maintenance job creation failed." msgstr "Wartungsjoberstellung fehlgeschlagen." #: pgadmin/tools/restore/__init__.py:41 #: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:40 #: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:49 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:62 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:61 msgid "Restore" msgstr "Wiederherstellen" @@ -10955,15 +10890,15 @@ msgstr "Wiederherstellen..." msgid "Restore (%s: %s)" msgstr "" -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:149 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:148 msgid "Restore job created." msgstr "Wiederherstellungsjob erstellt." -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:153 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:152 msgid "Restore job creation failed." msgstr "" -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:161 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:160 msgid "Restore job failed." msgstr "" @@ -11049,77 +10984,77 @@ msgstr "" msgid "Geometry Viewer" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:832 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:826 msgid "Editable column" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:834 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:828 msgid "Read-only column" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1261 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1255 msgid "Fetching all records..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1730 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2369 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3314 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1724 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2363 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3308 msgid "Unsaved changes" msgstr "Nicht gespeicherte Änderungen" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1731 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3315 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1725 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3309 msgid "Are you sure you wish to discard the current changes?" msgstr "Sind Sie sicher, dass Sie die aktuellen Änderungen verwerfen möchten?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1759 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1753 msgid "Clear history" msgstr "Verlauf löschen" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1760 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1754 msgid "Are you sure you wish to clear the history?" msgstr "Sind Sie sicher, dass Sie den Verlauf löschen wollen?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1761 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1755 msgid "" "This will remove all of your query history from this and other sessions " "for this database." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2125 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2119 msgid "Connection Warning" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2132 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2126 msgid "The application has lost the database connection:" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2136 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2130 msgid "⁃ If the connection was idle it may have been forcibly disconnected." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2138 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2132 msgid "⁃ The application server or database server may have been restarted." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2140 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2134 msgid "⁃ The user session may have timed out." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2144 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2138 msgid "Do you want to continue and establish a new session?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2163 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2157 msgid "Continue" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2299 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2293 #, python-format msgid "Error fetching SQL for script: %s." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2370 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2364 msgid "" "The data has been modified, but not saved. Are you sure you wish to " "discard the changes?" @@ -11127,165 +11062,165 @@ msgstr "" "Die Daten wurden geändert, aber nicht gespeichert. Sind Sie sicher, dass " "Sie die Änderungen verwerfen möchten?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2414 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2408 msgid "Running query..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2422 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2416 msgid "Waiting for the query to complete..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2579 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2573 msgid "Loading data from the database server and rendering..." msgstr "Laden von Daten aus dem Datenbankserver und Rendern..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2588 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2582 #, python-format msgid "Successfully run. Total query runtime: %s." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2589 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2583 #, python-format msgid "%s rows affected." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2865 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2859 msgid "" "This query was generated by pgAdmin as part of a \"View/Edit Data\" " "operation" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2966 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2960 msgid "Row(s) deleted." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3040 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3034 msgid "Saving the updated data..." msgstr "Speichern der aktualisierten Daten..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3156 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3150 msgid "Data saved successfully." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3159 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3153 msgid "Auto-commit is off. You still need to commit changes to the database." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3165 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3159 #, python-format msgid "%s." msgstr "%s." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3170 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3164 msgid "" "Saving data changes was rolled back but the current transaction is still " "active; previous queries are unaffected." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3192 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3186 msgid "This query was generated by pgAdmin as part of a \"Save Data\" operation" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3353 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3347 msgid "Loading the file..." msgstr "Lade die Datei..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3404 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3398 msgid "Saving the queries in the file..." msgstr "Speichern der Abfragen in der Datei..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3416 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3410 msgid "File saved successfully." msgstr "Datei erfolgreich gespeichert." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3538 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3597 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3532 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3591 msgid "Applying the new filter..." msgstr "Wende den neuen Filter an ..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3558 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3568 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3552 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3562 msgid "Filter By Selection Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3617 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3627 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3611 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3621 msgid "Filter Exclude Selection Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3637 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3631 msgid "Removing the filter..." msgstr "Filter entfernen..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3655 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3665 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3649 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3659 msgid "Remove Filter Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3768 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3762 msgid "Setting the limit on the result..." msgstr "Setzen des Limits für das Ergebnis..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3787 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3796 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3781 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3790 msgid "Change limit Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3922 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3941 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3916 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3935 msgid "Cancel Query Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3960 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3954 msgid "Downloading CSV..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4014 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4008 msgid "CSV Download cancelled." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4017 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4011 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:395 msgid "Download CSV" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4020 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4014 msgid "Download CSV error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4054 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4061 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4048 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4055 msgid "Auto Rollback Error" msgstr "" +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4081 #: pgadmin/tools/sqleditor/static/js/sqleditor.js:4087 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4093 msgid "Auto Commit Error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4182 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4176 msgid "The data has changed. Do you want to save changes?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4188 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4182 msgid "The text has changed. Do you want to save changes?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4268 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4262 msgid "" "The current transaction is not commited to the database.Do you want to " "commit or rollback the transaction?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4271 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4265 msgid "Commit transaction?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4294 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4288 msgid "Don't save" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4337 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4331 msgid "Save changes?" msgstr "" @@ -12960,9 +12895,3 @@ msgstr "Konnte nicht die angegebene Datenbank finden." #~ msgid "Error dropping %s: \"%s\"" #~ msgstr "Fehler beim Löschen von %s: \"%s\"" -#~ msgid "Tablespace cannot be empty." -#~ msgstr "Tablespace kann nicht leer sein." - -#~ msgid "Label must be specified." -#~ msgstr "Etikett muss angegeben werden." - diff --git a/web/pgadmin/translations/es/LC_MESSAGES/messages.mo b/web/pgadmin/translations/es/LC_MESSAGES/messages.mo index 63a38e846402836e7d33c314aa7868954da8fb8f..9ca606c4fc08b61efc0732dfdf15219f343f96b8 100644 GIT binary patch delta 28053 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 delta 27986 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\n" "Language: es\n" @@ -47,13 +47,13 @@ msgstr "Escritorio" #: pgadmin/static/js/slickgrid/editors.js:50 #: pgadmin/static/js/slickgrid/editors.js:60 #: pgadmin/static/js/slickgrid/editors.js:61 -#: pgadmin/static/js/sqleditor/filter_dialog.js:84 -#: pgadmin/tools/datagrid/static/js/show_data.js:143 -#: pgadmin/tools/datagrid/static/js/show_data.js:218 +#: pgadmin/static/js/sqleditor/filter_dialog.js:83 +#: pgadmin/tools/datagrid/static/js/show_data.js:142 +#: pgadmin/tools/datagrid/static/js/show_data.js:217 #: pgadmin/tools/import_export/static/js/import_export.js:500 -#: pgadmin/tools/maintenance/static/js/maintenance.js:302 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2005 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2035 +#: pgadmin/tools/maintenance/static/js/maintenance.js:301 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1999 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2029 msgid "OK" msgstr "OK" @@ -464,7 +464,7 @@ msgstr "Faltan las propiedades requeridas." #: pgadmin/browser/utils.py:386 #: pgadmin/static/js/alertify.pgadmin.defaults.js:102 #: pgadmin/static/js/alertify.pgadmin.defaults.js:163 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:305 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:303 #: pgadmin/tools/grant_wizard/__init__.py:129 pgadmin/utils/exception.py:35 msgid "Connection to the server has been lost." msgstr "Se ha perdido la conexión con el servidor." @@ -583,7 +583,7 @@ msgid "No parameters were changed." msgstr "Ningún parámetro fue modificado." #: pgadmin/browser/server_groups/servers/__init__.py:767 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:567 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:562 #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:370 #: pgadmin/browser/server_groups/servers/databases/extensions/__init__.py:264 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py:395 @@ -605,7 +605,7 @@ msgstr "Ningún parámetro fue modificado." #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:365 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:569 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py:436 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:888 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:922 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:393 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py:484 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py:478 @@ -782,33 +782,33 @@ msgstr "No se puede encontrar la utilidad para la operación '%s'" msgid "PostgreSQL" msgstr "PostgreSQL" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:38 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:37 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:21 msgid "Databases" msgstr "Bases de Datos" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:375 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:391 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:654 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:724 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:849 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:1021 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:374 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:390 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:649 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:719 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:844 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:1016 msgid "Could not find the database on the server." msgstr "No se puede encontrar la base de datos en el servidor." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:469 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:468 msgid "Database connected." msgstr "Base de datos conectada." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:488 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:485 msgid "Database could not be disconnected." msgstr "La base de datos no se puede desconectar." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:492 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:489 msgid "Database disconnected." msgstr "Base de datos desconectada." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:777 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:772 #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:483 #: pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py:522 #: pgadmin/browser/server_groups/servers/databases/extensions/__init__.py:357 @@ -823,10 +823,10 @@ msgstr "Base de datos desconectada." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:548 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:488 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py:453 -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:830 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:829 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py:441 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:462 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1051 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1085 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:474 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py:565 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py:591 @@ -844,11 +844,11 @@ msgstr "Base de datos desconectada." msgid "Error: Object not found." msgstr "Error: Objeto no encontrado." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:780 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:775 msgid "The specified database could not be found.\n" msgstr "No se puede encontrar la base de datos especificada.\n" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:876 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:871 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:728 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1561 msgid " -- definition incomplete" @@ -946,19 +946,19 @@ msgstr "Conversion..." #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:93 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:39 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:210 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:182 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:107 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:670 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:712 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:119 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:105 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:53 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:292 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:181 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:106 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:669 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:710 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:118 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:104 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:52 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:289 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:358 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:131 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:130 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:265 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:324 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:184 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:183 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:324 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:148 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:112 @@ -1010,22 +1010,22 @@ msgstr "Nombre" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:114 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js:65 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:393 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:185 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:110 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:673 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:716 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:123 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:109 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:295 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:184 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:109 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:672 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:714 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:122 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:108 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:292 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:361 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:146 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:145 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:254 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:327 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:187 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:186 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:328 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:151 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:115 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:312 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:309 #: pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js:87 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:391 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:344 @@ -1140,56 +1140,56 @@ msgstr "Tipo de origen" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:654 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:658 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:662 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:137 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:158 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:692 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:702 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:747 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:750 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:758 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:781 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:735 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:748 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:772 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:789 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:805 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:853 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:144 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:416 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:513 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:538 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:561 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:576 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:604 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:130 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:402 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:499 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:523 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:550 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:565 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:593 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:315 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:346 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:349 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:136 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:157 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:691 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:701 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:746 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:749 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:757 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:780 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:733 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:746 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:770 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:787 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:803 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:851 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:143 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:415 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:512 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:537 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:560 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:575 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:603 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:129 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:401 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:498 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:522 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:549 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:564 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:592 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:311 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:342 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:345 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:384 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:388 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:392 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:396 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:400 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:404 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:407 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:411 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:415 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:418 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:440 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:166 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:179 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:191 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:207 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:250 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:268 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:292 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:318 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:323 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:414 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:436 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:165 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:190 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:249 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:267 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:291 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:317 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:322 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:350 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:375 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:385 @@ -1201,14 +1201,14 @@ msgstr "Tipo de origen" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:173 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:136 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:140 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:338 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:343 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:367 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:376 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:381 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:335 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:340 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:364 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:373 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:378 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:383 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:386 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:389 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:393 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:390 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:395 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:408 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:412 @@ -1263,22 +1263,22 @@ msgstr "Conversión del sistema?" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js:74 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:403 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:674 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:306 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:113 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:676 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:719 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:127 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:113 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:59 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:477 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:305 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:112 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:675 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:717 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:126 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:112 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:58 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:473 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:411 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:203 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:202 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:397 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:515 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:514 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:762 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:169 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:132 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:334 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:331 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:465 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:140 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:206 @@ -1361,7 +1361,7 @@ msgstr "Disparador por Evento..." #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:331 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:154 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:118 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:315 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:312 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:355 #: pgadmin/dashboard/static/js/dashboard.js:1129 #: pgadmin/dashboard/static/js/dashboard.js:1387 @@ -1373,7 +1373,7 @@ msgstr "Dueño" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:111 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:155 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:242 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:199 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:198 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:286 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:103 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:144 @@ -1382,28 +1382,28 @@ msgstr "¿Habilitado?" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:120 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:39 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:316 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:315 msgid "Trigger function" msgstr "Función de disparador" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:124 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:205 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:267 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:272 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:347 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:387 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:391 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:404 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:417 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:429 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:459 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:464 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:204 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:266 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:271 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:346 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:386 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:390 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:403 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:416 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:428 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:458 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:463 msgid "Events" msgstr "Eventos" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:132 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:264 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:456 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:263 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:455 msgid "When" msgstr "Cuando" @@ -1422,7 +1422,7 @@ msgstr "Cuando" #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:784 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:222 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:169 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:409 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:406 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:514 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:378 msgid "Security labels" @@ -1455,14 +1455,14 @@ msgstr "Etiquetas de seguridad" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1124 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:167 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:130 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:317 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:320 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:323 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:326 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:329 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:332 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:400 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:412 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:467 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:397 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:409 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:464 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:516 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:360 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:372 @@ -1569,11 +1569,11 @@ msgstr "¿Reubicable?" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:189 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:479 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:195 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:321 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:495 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:530 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:320 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:491 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:529 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:811 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:455 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:452 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:473 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:163 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:221 @@ -1773,8 +1773,8 @@ msgstr "Tipo" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:214 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:129 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:161 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:319 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:396 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:316 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:393 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:420 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:427 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:440 @@ -1957,7 +1957,7 @@ msgid "Schema dropped" msgstr "Esquema eliminado" #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:781 -#: pgadmin/static/js/backform.pgadmin.js:1837 +#: pgadmin/static/js/backform.pgadmin.js:1833 msgid "Definition incomplete." msgstr "Definición incompleta." @@ -1976,23 +1976,23 @@ msgstr "No se pudo encontrar el objeto del catálogo especificado." #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:594 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:60 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:23 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:269 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:268 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:786 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:787 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:788 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:909 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:898 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:899 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:143 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:344 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:417 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:908 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:896 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:897 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:142 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:340 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:413 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:421 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:427 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:428 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:401 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:495 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:496 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:461 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:460 #: pgadmin/tools/import_export/static/js/import_export.js:179 #: pgadmin/tools/import_export/static/js/import_export.js:199 #: pgadmin/tools/import_export/static/js/import_export.js:237 @@ -2041,7 +2041,7 @@ msgstr "Tipo de Datos" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:85 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:171 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:449 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:375 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:372 msgid "Collation" msgstr "Colación" @@ -2160,7 +2160,7 @@ msgstr "Restricciones de Dominio..." #: pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js:65 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:415 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:21 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:127 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:614 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:679 msgid "Check" @@ -2168,7 +2168,7 @@ msgstr "Comprobar" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js:97 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:419 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:136 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:135 msgid "No inherit?" msgstr "" @@ -2179,7 +2179,7 @@ msgid "Validate?" msgstr "Validar?" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:177 msgid "Check cannot be empty." msgstr "Comprobación no puede estar vacía." @@ -2284,8 +2284,8 @@ msgstr "Tabla Foránea eliminada" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py:1285 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py:1330 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1367 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1417 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1401 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1451 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1356 msgid "-- Please create column(s) first..." msgstr "-- Por favor primero crear columna(s)..." @@ -2294,8 +2294,6 @@ msgstr "-- Por favor primero crear columna(s)..." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:487 #: pgadmin/browser/static/js/browser.js:213 #: pgadmin/misc/static/explain/js/explain.js:1219 -#: pgadmin/misc/static/explain/js/explain.js:1348 -#: pgadmin/misc/static/explain/js/explain.js:1349 #: pgadmin/misc/statistics/static/js/statistics.js:129 msgid "Statistics" msgstr "Estadísticas" @@ -2305,7 +2303,7 @@ msgid "Inherited From" msgstr "Heredada Desde" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:259 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:176 msgid "Column Name cannot be empty." msgstr "Nombre de Columna no puede estar vacía." @@ -2511,7 +2509,7 @@ msgid "FTS Dictionary..." msgstr "Diccionario FTS..." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js:153 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:342 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:339 msgid "Template" msgstr "Plantilla" @@ -2669,7 +2667,7 @@ msgstr "Tiene que seleccionar la función Lexize." #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:59 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:21 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:457 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:434 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:431 msgid "Functions" msgstr "Funciones" @@ -2682,29 +2680,29 @@ msgstr "No se pudo encontrar la %s especificada." msgid "Could not find the function node in the database." msgstr "No se pudo encontrar el nodo de la función en la base de datos." -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:833 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:832 msgid "The specified function could not be found.\n" msgstr "No se pudo encontrar la función especificada.\n" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:850 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:849 msgid "Function dropped." msgstr "Función eliminada." -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1141 -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1320 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1140 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1319 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:334 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:511 msgid "Could not find the function in the database." msgstr "No se pudo encontrar la función en la base de datos." -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1628 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1627 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js:24 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:621 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js:24 msgid "Procedures" msgstr "Procedimientos" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1728 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1727 msgid "Trigger Functions" msgstr "Funciones disparadoras" @@ -2744,7 +2742,7 @@ msgstr "Conteo de argumentos" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:327 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:150 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:79 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:322 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:321 msgid "Arguments" msgstr "Argumentos" @@ -2768,8 +2766,8 @@ msgstr "Tipo del retorno" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:182 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:98 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:100 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:289 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:493 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:288 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:492 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:154 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:155 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:209 @@ -2837,7 +2835,7 @@ msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:338 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:245 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1119 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:405 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:402 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:508 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:366 #: pgadmin/tools/debugger/static/js/direct.js:1707 @@ -2877,7 +2875,7 @@ msgstr "Símbolo de enlace no puede estar vacío." #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:406 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js:200 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:314 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:338 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:337 msgid "Code cannot be empty." msgstr "Código no puede estar vacío." @@ -3067,7 +3065,7 @@ msgstr "Encabezado no puede estar vacío." #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:56 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:25 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:450 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:428 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:425 msgid "Sequences" msgstr "Secuencias" @@ -3230,22 +3228,22 @@ msgid "System schema?" msgstr "¿Esquema del sistema?" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:409 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:322 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:319 msgid "Default TABLE privileges" msgstr "Privilegios de TABLE por defecto" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:412 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:325 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:322 msgid "Default SEQUENCE privileges" msgstr "Privilegios de SEQUENCE por defecto" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:415 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:328 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:325 msgid "Default FUNCTION privileges" msgstr "Privilegios de FUNCTION por defecto" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:418 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:331 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:328 msgid "Default TYPE privileges" msgstr "Privilegios de TYPE por defecto" @@ -3254,9 +3252,9 @@ msgid "Default privileges" msgstr "" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:443 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:53 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:29 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:422 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:419 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:130 msgid "Tables" msgstr "Tablas" @@ -3264,7 +3262,7 @@ msgstr "Tablas" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:464 #: pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py:58 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:24 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:445 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:442 msgid "Types" msgstr "Tipos" @@ -3325,8 +3323,8 @@ msgstr "¿Sinónimo publico?" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:185 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:221 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:527 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:791 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:808 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:789 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:806 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:275 #: pgadmin/browser/static/js/browser.js:630 #: pgadmin/browser/static/js/node.js:1283 @@ -3335,17 +3333,17 @@ msgstr "¿Sinónimo publico?" #: pgadmin/misc/file_manager/templates/file_manager/index.html:78 #: pgadmin/static/js/backform.pgadmin.js:538 #: pgadmin/static/js/backgrid.pgadmin.js:621 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1741 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1786 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2385 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1735 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1780 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2379 msgid "Yes" msgstr "Si" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:185 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:221 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:527 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:792 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:809 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:790 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:807 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:275 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:147 #: pgadmin/browser/static/js/browser.js:631 @@ -3355,9 +3353,9 @@ msgstr "Si" #: pgadmin/misc/file_manager/templates/file_manager/index.html:77 #: pgadmin/static/js/backform.pgadmin.js:539 #: pgadmin/static/js/backgrid.pgadmin.js:622 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1742 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1787 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2386 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1736 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1781 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2380 msgid "No" msgstr "No" @@ -3369,32 +3367,32 @@ msgstr "Esquema destino no puede estar vacío." msgid "Target object cannot be empty." msgstr "Objeto destino no puede estar vacío." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:359 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:357 msgid "Could not find the table." msgstr "No se pudo encontrar la tabla." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:596 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1271 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:630 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1305 msgid "The specified table could not be found." msgstr "No se pudo encontrar la tabla especificada." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1054 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1088 msgid "The specified table could not be found.\n" msgstr "No se pudo encontrar la tabla especificada.\n" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1067 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1101 msgid "Table dropped" msgstr "Tabla eliminada" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1145 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1179 msgid "Trigger(s) have been disabled" msgstr "Disparador(es) ha(n) sido deshabilitado(s)" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1147 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1181 msgid "Trigger(s) have been enabled" msgstr "Disparador(es) ha(n) sido habilitado(s)" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1501 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1535 #, python-format msgid "Table rows counted: %s" msgstr "" @@ -3447,7 +3445,7 @@ msgstr "Columna es eliminada" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:608 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:704 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:856 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:853 msgid "Could not find the column on the server." msgstr "No se pudo encontrar la columna en el servidor." @@ -3593,70 +3591,70 @@ msgstr "" msgid "Compound Trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:56 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:62 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:68 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:74 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:90 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:61 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:67 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:73 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:89 msgid "Compound Trigger..." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:80 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:79 msgid "Enable compound trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:85 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:84 msgid "Disable compound trigger" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:169 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:168 msgid "Disable compound trigger failed" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:188 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:190 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:187 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:189 msgid "Trigger enabled?" msgstr "¿Disparador habilitado?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:205 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:209 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:222 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:235 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:248 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:204 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:208 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:221 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:234 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:247 msgid "FOR Events" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:207 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:389 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:388 msgid "INSERT" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:220 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:402 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:219 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:401 msgid "UPDATE" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:233 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:415 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:232 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:414 msgid "DELETE" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:246 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:428 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:245 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:427 msgid "TRUNCATE" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:303 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:512 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:302 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:511 msgid "System trigger?" msgstr "¿Disparador del sistema?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:328 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:543 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:327 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:542 msgid "Specify at least one event." msgstr "Especificar al menos un evento." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:347 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:346 msgid "" "-- Enter any global declarations below:\n" "\n" @@ -3726,15 +3724,15 @@ msgstr "No se pudo encontrar el objeto en el servidor." msgid "Check constraint updated." msgstr "Restricción de verificación actualizada." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:40 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:39 msgid "Check..." msgstr "Verificación..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:46 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:45 msgid "Validate check constraint" msgstr "Validar restricción de verificación" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:157 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:156 msgid "Don't validate?" msgstr "¿No validar?" @@ -3770,7 +3768,7 @@ msgid "Exclusion constraint dropped." msgstr "Restricción de exclusión eliminada." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:38 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:97 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:96 msgid "Operator class" msgstr "Clase de operador" @@ -3798,10 +3796,10 @@ msgstr "Por favor especifique operador para la columna: " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:453 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:381 #: pgadmin/browser/server_groups/servers/static/js/variable.js:341 -#: pgadmin/static/js/backform.pgadmin.js:1260 -#: pgadmin/static/js/backform.pgadmin.js:1370 -#: pgadmin/static/js/backform.pgadmin.js:1550 -#: pgadmin/static/js/backform.pgadmin.js:1669 +#: pgadmin/static/js/backform.pgadmin.js:1259 +#: pgadmin/static/js/backform.pgadmin.js:1366 +#: pgadmin/static/js/backform.pgadmin.js:1546 +#: pgadmin/static/js/backform.pgadmin.js:1665 msgid "Add new row" msgstr "Agregar nueva fila" @@ -3813,7 +3811,7 @@ msgstr "Restricción de exclusión" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:28 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:28 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:29 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:236 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:234 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/stats.sql:7 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/stats.sql:12 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/stats.sql:7 @@ -3823,87 +3821,87 @@ msgstr "Restricción de exclusión" msgid "Index size" msgstr "Tamaño del índice" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:642 msgid "Exclusion constraint..." msgstr "Restricción de exclusión..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:691 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:512 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:498 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:298 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:690 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:511 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:497 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:295 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:378 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:344 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:196 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:366 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:363 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:40 #: pgadmin/tools/backup/static/js/backup.js:366 #: pgadmin/tools/restore/static/js/restore.js:255 msgid "Tablespace" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:701 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:700 msgid "Access method" msgstr "Método de acceso" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:716 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:326 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:715 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:322 msgid "Changing access method will clear columns collection" msgstr "Cambiar el método de acceso limpiará la colección de columnas" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:746 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:560 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:549 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:386 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:745 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:559 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:548 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:382 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:716 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:790 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:204 msgid "Fill factor" msgstr "Factor de llenado" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:749 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:734 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:575 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:564 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:267 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:748 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:732 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:574 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:563 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:266 msgid "Deferrable?" msgstr "¿Aplazable?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:757 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:747 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:603 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:592 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:291 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:756 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:745 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:602 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:591 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:290 msgid "Deferred?" msgstr "¿Aplazado?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:779 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:413 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:778 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:409 msgid "Constraint" msgstr "Restricción" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:908 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:415 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:401 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:348 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:439 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:907 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:414 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:400 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:344 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:435 msgid "Include columns" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:931 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:242 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:438 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:228 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:424 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:370 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:461 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:930 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:241 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:437 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:227 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:423 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:366 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:457 msgid "Select the column(s)" msgstr "Seleccionar la(s) columna(s)" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1012 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1011 msgid "Please specify name for exclusion constraint." msgstr "Por favor especifique el nombre para la restricción de exclusión." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1018 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1017 msgid "Please specify columns for exclusion constraint." msgstr "Por favor especifique las columnas para la restricción de exclusión." @@ -3961,53 +3959,53 @@ msgstr "Referencias" msgid "Referencing" msgstr "Referenciando" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:616 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:615 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:585 msgid "Foreign key" msgstr "Clave foránea" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:637 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:635 msgid "Foreign key..." msgstr "Clave foránea..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:641 msgid "Validate foreign key" msgstr "Validar clave foránea" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:771 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:769 msgid "Match type" msgstr "Tipo de coincidencia" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:788 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:786 msgid "Validated?" msgstr "¿Validado?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:804 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:802 msgid "Auto FK index?" msgstr "¿Indice auto FK?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:852 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:850 msgid "Covering index" msgstr "Índice de cobertura" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1002 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1000 msgid "On update" msgstr "En actualización" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1003 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1023 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1001 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1021 msgid "Action" msgstr "Acción" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1022 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1020 msgid "On delete" msgstr "En borrado" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1050 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1048 msgid "Please specify columns for Foreign key." msgstr "Por favor especificar columnas para la clave foránea." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1059 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1057 msgid "Please specify covering index name." msgstr "Por favor especificar el nombre del índice de cobertura." @@ -4052,7 +4050,7 @@ msgstr "{0} eliminado." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py:996 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:20 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:43 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:42 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:557 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:729 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:811 @@ -4061,7 +4059,7 @@ msgstr "Clave Primaria" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py:1006 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:20 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:43 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:42 msgid "Unique constraint" msgstr "Restricción de unicidad" @@ -4069,19 +4067,19 @@ msgstr "Restricción de unicidad" msgid "Could not find the constraint in the table." msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:536 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:522 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:231 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:535 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:521 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:229 msgid "Index" msgstr "Índice" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:644 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:633 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:632 #, python-format msgid "Please specify columns for %s" msgstr "" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:56 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:55 msgid "Oid" msgstr "" @@ -4108,7 +4106,7 @@ msgid "Index is dropped" msgstr "Índice es eliminado" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:29 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:236 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:234 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:45 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:33 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:49 @@ -4125,59 +4123,63 @@ msgstr "Índice es eliminado" msgid "Size" msgstr "Tamaño" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:130 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:128 msgid "Sort order" msgstr "Orden de clasificación" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:151 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:149 msgid "NULLs" msgstr "NULOs" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:248 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:254 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:260 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:266 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:272 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:245 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:251 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:257 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:263 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:269 msgid "Index..." msgstr "Índice..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:311 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:308 msgid "Access Method" msgstr "Método de Acceso" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:390 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:386 msgid "Unique?" msgstr "¿Único?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:394 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:390 msgid "Clustered?" msgstr "¿Agrupado?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:398 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:394 msgid "Valid?" msgstr "¿Válido?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:402 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:398 msgid "Primary?" msgstr "¿Primario?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:406 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:402 msgid "System index?" msgstr "¿Índice del sistema?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:409 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:405 msgid "Concurrent build?" msgstr "¿Construcción concurrente?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:501 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:497 +msgid "Tablespace cannot be empty." +msgstr "Tablespace no puede estar vacío." + +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:503 msgid "Access method cannot be empty." msgstr "Método de accesos no puede estar vacío." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:509 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:511 msgid "You must specify column name." msgstr "Tiene que especificar un nombre de columna." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:514 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:516 msgid "You must specify at least one column." msgstr "Tiene que especificar al menos una columna." @@ -4574,39 +4576,39 @@ msgstr "Regla eliminada" msgid "rule" msgstr "regla" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:93 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:99 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:105 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:111 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:117 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:92 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:98 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:104 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:110 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:116 msgid "Rule..." msgstr "Regla..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:165 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:164 #: pgadmin/static/js/sqleditor/query_tool_notifications.js:32 #: pgadmin/static/js/sqleditor/query_tool_notifications.js:80 msgid "Event" msgstr "Evento" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:179 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:178 msgid "Do instead?" msgstr "" +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:182 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:183 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:184 msgid "Condition" msgstr "Condición" +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:188 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:189 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:190 msgid "Commands" msgstr "Comandos" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:195 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:194 msgid "System rule?" msgstr "¿Reglas del sistema?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:215 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:214 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:241 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:183 msgid "Please specify name." @@ -5175,56 +5177,56 @@ msgstr "El disparador es eliminado" msgid "Trigger" msgstr "Disparador" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:56 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:62 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:68 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:74 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:90 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:61 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:67 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:73 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:89 msgid "Trigger..." msgstr "Disparador..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:80 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:79 msgid "Enable trigger" msgstr "Habilitar disparador" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:85 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:84 msgid "Disable trigger" msgstr "Deshabilitar disparador" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:169 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:168 msgid "Disable trigger failed" msgstr "Deshabilitar disparador falló" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:205 msgid "Row trigger?" msgstr "¿Disparador de fila?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:247 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:246 msgid "Constraint trigger?" msgstr "¿Disparador de restricción?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:346 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:345 msgid "Fires" msgstr "Dispara" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:481 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:480 msgid "Old table" msgstr "Tabla old" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:482 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:488 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:481 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:487 msgid "Transition" msgstr "Transición" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:487 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:486 msgid "New table" msgstr "Tabla new" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:536 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:535 msgid "Trigger function cannot be empty." msgstr "Función del disparador no puede estar vacía." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:556 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:555 msgid "Trigger code cannot be empty." msgstr "Código del disparador no puede estar vacío." @@ -5610,7 +5612,7 @@ msgid "Size of temporary files" msgstr "Tamaño de archivos temporales" #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:45 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:309 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:306 #: pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/stats.sql:2 #: pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/stats.sql:2 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:176 @@ -5664,35 +5666,35 @@ msgstr "Desconectar la base de datos" msgid "Are you sure you want to disconnect the database - %s?" msgstr "¿Estas seguro de querer desconectar la base de datos - %s?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:337 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:334 #: pgadmin/static/js/browser/server_groups/servers/databases/external_tables/external_tables.js:52 #: pgadmin/tools/backup/static/js/backup.js:192 #: pgadmin/tools/import_export/static/js/import_export.js:108 msgid "Encoding" msgstr "Codificación" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:380 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:377 msgid "Character type" msgstr "Tipo de caracteres" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:385 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:382 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:413 msgid "Connection limit" msgstr "Limite de conexiones" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:388 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:385 msgid "Template?" msgstr "¿Plantilla?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:392 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:389 msgid "Allow connections?" msgstr "¿Permitir conexiones?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:417 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:414 msgid "Default Privileges" msgstr "Privilegios por defecto" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:499 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:496 msgid "Connect to database" msgstr "Conectar a la base de datos" @@ -6529,7 +6531,7 @@ msgstr "Tipo" #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:139 #: pgadmin/browser/static/js/browser.js:224 #: pgadmin/dashboard/static/js/dashboard.js:191 -#: pgadmin/static/js/backform.pgadmin.js:2032 +#: pgadmin/static/js/backform.pgadmin.js:2028 msgid "SQL" msgstr "SQL" @@ -7177,8 +7179,8 @@ msgid "At least one privilege should be selected." msgstr "Al menos un privilegio debe estar seleccionado." #: pgadmin/browser/server_groups/servers/static/js/server.js:46 -msgid "Security label must be specified." -msgstr "" +msgid "Label must be specified." +msgstr "Nivel tiene que estar especificado." #: pgadmin/browser/server_groups/servers/static/js/server.js:79 #: pgadmin/browser/server_groups/servers/static/js/server.js:84 @@ -7277,20 +7279,20 @@ msgstr "Cambiar Contraseña " #: pgadmin/misc/file_manager/static/js/create_dialogue.js:188 #: pgadmin/misc/file_manager/static/js/select_dialogue.js:86 #: pgadmin/misc/file_manager/static/js/select_dialogue.js:129 -#: pgadmin/preferences/static/js/preferences.js:435 +#: pgadmin/preferences/static/js/preferences.js:434 #: pgadmin/static/js/slickgrid/editors.js:50 -#: pgadmin/static/js/sqleditor/filter_dialog.js:79 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:62 -#: pgadmin/tools/datagrid/static/js/show_data.js:139 +#: pgadmin/static/js/sqleditor/filter_dialog.js:78 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:61 +#: pgadmin/tools/datagrid/static/js/show_data.js:138 #: pgadmin/tools/debugger/static/js/debugger_ui.js:588 #: pgadmin/tools/debugger/static/js/debugger_ui.js:893 #: pgadmin/tools/import_export/static/js/import_export.js:495 -#: pgadmin/tools/maintenance/static/js/maintenance.js:297 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:56 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2010 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2164 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4222 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4289 +#: pgadmin/tools/maintenance/static/js/maintenance.js:296 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:55 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2004 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2158 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4216 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4283 msgid "Cancel" msgstr "Cancelar" @@ -7514,7 +7516,7 @@ msgid "Connection timeout (seconds)" msgstr "Tiempo de espera de conexión (segundos)" #: pgadmin/browser/server_groups/servers/static/js/server.js:1130 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2192 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2186 msgid "Connect to Server" msgstr "Conectar al Servidor" @@ -7773,17 +7775,15 @@ msgid "Dependents" msgstr "Dependientes" #: pgadmin/browser/static/js/browser.js:348 -#: pgadmin/browser/static/js/toolbar.js:30 -#: pgadmin/browser/static/js/toolbar.js:31 -#: pgadmin/browser/static/js/toolbar.js:91 +#: pgadmin/browser/static/js/toolbar.js:29 +#: pgadmin/browser/static/js/toolbar.js:88 #: pgadmin/tools/datagrid/static/js/datagrid.js:74 msgid "View Data" msgstr "" #: pgadmin/browser/static/js/browser.js:349 #: pgadmin/browser/static/js/toolbar.js:20 -#: pgadmin/browser/static/js/toolbar.js:21 -#: pgadmin/browser/static/js/toolbar.js:93 +#: pgadmin/browser/static/js/toolbar.js:90 #: pgadmin/tools/datagrid/static/js/datagrid.js:75 msgid "Filtered Rows" msgstr "" @@ -8029,10 +8029,10 @@ msgid "Changes will be lost. Are you sure you want to reset?" msgstr "" #: pgadmin/browser/static/js/node.js:1513 -#: pgadmin/preferences/static/js/preferences.js:439 -#: pgadmin/preferences/static/js/preferences.js:464 +#: pgadmin/preferences/static/js/preferences.js:438 +#: pgadmin/preferences/static/js/preferences.js:463 #: pgadmin/tools/datagrid/templates/datagrid/index.html:37 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4297 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4291 msgid "Save" msgstr "Salvar" @@ -8052,20 +8052,17 @@ msgstr "Seleccionar Todo" msgid "Unselect All" msgstr "De-seleccionar Todo" -#: pgadmin/browser/static/js/toolbar.js:40 -#: pgadmin/browser/static/js/toolbar.js:41 -#: pgadmin/browser/static/js/toolbar.js:89 +#: pgadmin/browser/static/js/toolbar.js:38 +#: pgadmin/browser/static/js/toolbar.js:86 #: pgadmin/tools/datagrid/static/js/datagrid.js:103 #: pgadmin/tools/datagrid/static/js/datagrid.js:115 #: pgadmin/tools/sqleditor/__init__.py:68 msgid "Query Tool" msgstr "Herramienta de Consulta" -#: pgadmin/browser/static/js/wizard.js:85 #: pgadmin/browser/static/js/wizard.js:86 #: pgadmin/static/js/alertify.pgadmin.defaults.js:261 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:263 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:457 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:455 #: pgadmin/templates/security/messages.html:7 #: pgadmin/tools/user_management/static/js/user_management.js:81 #: pgadmin/tools/user_management/static/js/user_management.js:174 @@ -8073,11 +8070,9 @@ msgstr "Herramienta de Consulta" msgid "Close" msgstr "Cerrar" -#: pgadmin/browser/static/js/wizard.js:88 #: pgadmin/browser/static/js/wizard.js:89 #: pgadmin/static/js/alertify.pgadmin.defaults.js:262 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:264 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:458 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:456 msgid "Maximize" msgstr "Maximizar" @@ -8085,22 +8080,6 @@ msgstr "Maximizar" msgid "Left panel logo" msgstr "Panel izquierdo de logo" -#: pgadmin/browser/static/js/wizard.js:124 -msgid "Close error bar" -msgstr "" - -#: pgadmin/browser/static/js/wizard.js:131 -#: pgadmin/browser/templates/browser/index.html:135 pgadmin/help/__init__.py:59 -#: pgadmin/help/__init__.py:70 pgadmin/preferences/static/js/preferences.js:427 -#: pgadmin/static/js/sqleditor/filter_dialog.js:72 -#: pgadmin/static/js/sqleditor/filter_dialog.js:73 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:56 -#: pgadmin/tools/datagrid/static/js/show_data.js:133 -#: pgadmin/tools/maintenance/static/js/maintenance.js:289 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:50 -msgid "Help" -msgstr "Ayuda" - #: pgadmin/browser/static/js/wizard.js:139 #: pgadmin/misc/file_manager/templates/file_manager/index.html:15 msgid "Back" @@ -8138,6 +8117,11 @@ msgstr "Administración" msgid "Tools" msgstr "Herramientas" +#: pgadmin/browser/templates/browser/index.html:135 pgadmin/help/__init__.py:59 +#: pgadmin/help/__init__.py:70 pgadmin/static/js/sqleditor/filter_dialog.js:72 +msgid "Help" +msgstr "Ayuda" + #: pgadmin/browser/templates/browser/index.html:157 msgid "Logout" msgstr "Salir" @@ -8530,7 +8514,7 @@ msgstr "" #: pgadmin/dashboard/templates/dashboard/database_dashboard.html:88 #: pgadmin/dashboard/templates/dashboard/server_dashboard.html:92 #: pgadmin/misc/file_manager/templates/file_manager/index.html:27 -#: pgadmin/preferences/static/js/preferences.js:492 +#: pgadmin/preferences/static/js/preferences.js:491 msgid "Refresh" msgstr "Actualizar" @@ -9056,33 +9040,13 @@ msgstr "" msgid "Analysis" msgstr "" -#: pgadmin/misc/static/explain/js/explain.js:1286 -#: pgadmin/misc/static/explain/js/explain.js:1287 -msgid "Zoom in" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1295 -#: pgadmin/misc/static/explain/js/explain.js:1296 -msgid "Zoom to original" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1304 -#: pgadmin/misc/static/explain/js/explain.js:1305 -msgid "Zoom out" -msgstr "" - -#: pgadmin/misc/static/explain/js/explain.js:1319 -#: pgadmin/misc/static/explain/js/explain.js:1320 -msgid "Download" -msgstr "" - #: pgadmin/misc/statistics/static/js/statistics.js:214 msgid "No statistics are available for the selected object." msgstr "No hay estadísticas disponibles pata el objeto seleccionado." #: pgadmin/preferences/__init__.py:55 #: pgadmin/preferences/static/js/preferences.js:426 -#: pgadmin/preferences/static/js/preferences.js:449 +#: pgadmin/preferences/static/js/preferences.js:448 msgid "Preferences" msgstr "Preferencias" @@ -9107,17 +9071,17 @@ msgstr "Ocultar" msgid "Category is not selected." msgstr "Categoría no está seleccionada." -#: pgadmin/preferences/static/js/preferences.js:483 +#: pgadmin/preferences/static/js/preferences.js:482 msgid "Refresh required" msgstr "" -#: pgadmin/preferences/static/js/preferences.js:484 +#: pgadmin/preferences/static/js/preferences.js:483 msgid "" "A page refresh is required to apply the theme. Do you wish to refresh the" " page now?" msgstr "" -#: pgadmin/preferences/static/js/preferences.js:493 +#: pgadmin/preferences/static/js/preferences.js:492 msgid "Later" msgstr "" @@ -9163,37 +9127,33 @@ msgstr "Error desconocido" msgid "INTERNAL SERVER ERROR" msgstr "ERROR INTERNO DEL SERVIDOR" -#: pgadmin/static/js/backform.pgadmin.js:1550 -msgid "Add" -msgstr "" - -#: pgadmin/static/js/backform.pgadmin.js:1841 +#: pgadmin/static/js/backform.pgadmin.js:1837 msgid "No updates." msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:1956 +#: pgadmin/static/js/backform.pgadmin.js:1952 msgid "General" msgstr "General" -#: pgadmin/static/js/backform.pgadmin.js:2157 +#: pgadmin/static/js/backform.pgadmin.js:2153 msgid "Preview not available..." msgstr "" -#: pgadmin/static/js/backform.pgadmin.js:2618 +#: pgadmin/static/js/backform.pgadmin.js:2605 #: pgadmin/tools/backup/static/js/backup.js:95 #: pgadmin/tools/backup/static/js/backup.js:230 msgid "Note" msgstr "Nota" -#: pgadmin/static/js/backform.pgadmin.js:2974 +#: pgadmin/static/js/backform.pgadmin.js:2961 msgid "More" msgstr "Mas" -#: pgadmin/static/js/backform.pgadmin.js:2975 +#: pgadmin/static/js/backform.pgadmin.js:2962 msgid "Less" msgstr "Menos" -#: pgadmin/static/js/backform.pgadmin.js:3059 +#: pgadmin/static/js/backform.pgadmin.js:3046 msgid "Space" msgstr "Espacio" @@ -9222,7 +9182,7 @@ msgstr "Este objeto no puede ser borrado." msgid "Delete row" msgstr "Borrar fila" -#: pgadmin/static/js/backgrid.pgadmin.js:1098 +#: pgadmin/static/js/backgrid.pgadmin.js:1091 msgid "Array Values" msgstr "Arreglo de Valores" @@ -9386,13 +9346,13 @@ msgstr "Consulta retornó exitosamente en %s." msgid "Sort/Filter options" msgstr "Opciones Ordenar/Filtrar" -#: pgadmin/static/js/sqleditor/filter_dialog.js:239 +#: pgadmin/static/js/sqleditor/filter_dialog.js:238 msgid "Filter updated successfully" msgstr "Filtro actualizado exitosamente" -#: pgadmin/static/js/sqleditor/filter_dialog.js:245 -#: pgadmin/tools/datagrid/static/js/show_data.js:238 -#: pgadmin/tools/datagrid/static/js/show_data.js:245 +#: pgadmin/static/js/sqleditor/filter_dialog.js:244 +#: pgadmin/tools/datagrid/static/js/show_data.js:237 +#: pgadmin/tools/datagrid/static/js/show_data.js:244 msgid "Validation Error" msgstr "Error de Validación" @@ -9473,7 +9433,6 @@ msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:40 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:41 -#: pgadmin/tools/datagrid/templates/datagrid/index.html:56 #: pgadmin/tools/datagrid/templates/datagrid/index.html:68 msgid "Find" msgstr "Buscar" @@ -9557,14 +9516,14 @@ msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:129 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:131 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4230 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4224 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:663 msgid "Commit" msgstr "" #: pgadmin/static/js/sqleditor/query_tool_preferences.js:135 #: pgadmin/static/js/sqleditor/query_tool_preferences.js:137 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4227 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4221 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:681 msgid "Rollback" msgstr "" @@ -9642,7 +9601,7 @@ msgstr "Esta URL no se puede consultar directamente." #: pgadmin/tools/backup/__init__.py:43 #: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:46 #: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:55 -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:67 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:66 msgid "Backup" msgstr "Respaldo" @@ -9922,8 +9881,8 @@ msgstr "Respaldar..." #: pgadmin/tools/backup/static/js/backup_dialog.js:71 #: pgadmin/tools/import_export/static/js/import_export.js:685 #: pgadmin/tools/import_export/static/js/import_export.js:699 -#: pgadmin/tools/maintenance/static/js/maintenance.js:477 -#: pgadmin/tools/maintenance/static/js/maintenance.js:488 +#: pgadmin/tools/maintenance/static/js/maintenance.js:476 +#: pgadmin/tools/maintenance/static/js/maintenance.js:487 #: pgadmin/tools/restore/static/js/restore_dialog.js:51 #: pgadmin/tools/restore/static/js/restore_dialog.js:75 msgid "Utility not found" @@ -9931,25 +9890,25 @@ msgstr "" #: pgadmin/tools/backup/static/js/backup_dialog.js:72 #: pgadmin/tools/import_export/static/js/import_export.js:700 -#: pgadmin/tools/maintenance/static/js/maintenance.js:489 +#: pgadmin/tools/maintenance/static/js/maintenance.js:488 #: pgadmin/tools/restore/static/js/restore_dialog.js:76 msgid "Failed to fetch Utility information" msgstr "" -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:159 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:158 msgid "Backup job created." msgstr "Trabajo de respaldo creado." -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:163 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:162 msgid "Backup job creation failed." msgstr "" -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:171 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:170 msgid "Backup job failed." msgstr "Trabajo de respaldo falló." -#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:242 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:229 +#: pgadmin/tools/backup/static/js/backup_dialog_wrapper.js:241 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:228 msgid "Please provide a filename" msgstr "Suministre un nombre de archivo" @@ -9998,7 +9957,7 @@ msgstr "Ningún objeto seleccionado." msgid "Data Filter" msgstr "" -#: pgadmin/tools/datagrid/static/js/show_data.js:161 +#: pgadmin/tools/datagrid/static/js/show_data.js:160 msgid "Use SHIFT + ENTER to apply filter..." msgstr "" @@ -10598,30 +10557,6 @@ msgstr "Pila" msgid "Debugger - " msgstr "Depurador - " -#: pgadmin/tools/debugger/templates/debugger/direct.html:59 -msgid "Step into" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:67 -msgid "Step over" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:75 -msgid "Continue/Start" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:85 -msgid "Toggle breakpoint" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:93 -msgid "Clear all breakpoints" -msgstr "" - -#: pgadmin/tools/debugger/templates/debugger/direct.html:103 -msgid "Stop" -msgstr "" - #: pgadmin/tools/grant_wizard/__init__.py:327 msgid "Unable to fetch the {} objects" msgstr "" @@ -10982,7 +10917,7 @@ msgstr "Mensajes detallados" #: pgadmin/tools/maintenance/static/js/maintenance.js:167 #: pgadmin/tools/maintenance/static/js/maintenance.js:183 -#: pgadmin/tools/maintenance/static/js/maintenance.js:483 +#: pgadmin/tools/maintenance/static/js/maintenance.js:482 msgid "Maintenance..." msgstr "Mantenimiento..." @@ -10998,15 +10933,15 @@ msgstr "" "Creación de trabajo de mantenimiento falló. Bases de Datos con símbolo = " "en el nombre no puede mantenerse usando esta utilidad." -#: pgadmin/tools/maintenance/static/js/maintenance.js:387 -#: pgadmin/tools/maintenance/static/js/maintenance.js:394 +#: pgadmin/tools/maintenance/static/js/maintenance.js:386 +#: pgadmin/tools/maintenance/static/js/maintenance.js:393 msgid "Maintenance job creation failed." msgstr "Creación de trabajo de mantenimiento falló." #: pgadmin/tools/restore/__init__.py:41 #: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:40 #: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:49 -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:62 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:61 msgid "Restore" msgstr "Restaurar" @@ -11072,15 +11007,15 @@ msgstr "Restaurar..." msgid "Restore (%s: %s)" msgstr "Restaurar (%s: %s)" -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:149 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:148 msgid "Restore job created." msgstr "Trabajo de restauración creado." -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:153 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:152 msgid "Restore job creation failed." msgstr "" -#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:161 +#: pgadmin/tools/restore/static/js/restore_dialog_wrapper.js:160 msgid "Restore job failed." msgstr "Trabajo de restauración falló." @@ -11168,79 +11103,79 @@ msgstr "Notificaciones" msgid "Geometry Viewer" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:832 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:826 msgid "Editable column" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:834 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:828 msgid "Read-only column" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1261 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1255 msgid "Fetching all records..." msgstr "Obteniendo todos los registros..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1730 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2369 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3314 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1724 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2363 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3308 msgid "Unsaved changes" msgstr "Cambios sin salvar" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1731 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3315 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1725 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3309 msgid "Are you sure you wish to discard the current changes?" msgstr "¿Esta seguro de querer descartar los cambios actuales?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1759 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1753 msgid "Clear history" msgstr "Limpiar historial" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1760 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1754 msgid "Are you sure you wish to clear the history?" msgstr "¿Esta seguro de querer limpiar el historial?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1761 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1755 msgid "" "This will remove all of your query history from this and other sessions " "for this database." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2125 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2119 msgid "Connection Warning" msgstr "Advertencia de Conexión" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2132 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2126 msgid "The application has lost the database connection:" msgstr "La aplicación ha perdido la conexión con la base de datos:" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2136 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2130 msgid "⁃ If the connection was idle it may have been forcibly disconnected." msgstr "- Si la conexión estuvo inactiva pudo haber sido desconectada a la fuerza." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2138 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2132 msgid "⁃ The application server or database server may have been restarted." msgstr "" "- El servidor de la aplicación o el servidor de la base de datos pueden " "haber sido reiniciados." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2140 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2134 msgid "⁃ The user session may have timed out." msgstr "- La sesión de usuario pudo superar el límite de tiempo." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2144 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2138 msgid "Do you want to continue and establish a new session?" msgstr "¿Desea continuar o establecer una nueva sesión?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2163 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2157 msgid "Continue" msgstr "Continuar" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2299 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2293 #, python-format msgid "Error fetching SQL for script: %s." msgstr "Error obteniendo SQL para el código: %s." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2370 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2364 msgid "" "The data has been modified, but not saved. Are you sure you wish to " "discard the changes?" @@ -11248,165 +11183,165 @@ msgstr "" "La data se ha modificado, pero no se ha salvado. ¿Esta seguro de " "descartar los cambios?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2414 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2408 msgid "Running query..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2422 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2416 msgid "Waiting for the query to complete..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2579 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2573 msgid "Loading data from the database server and rendering..." msgstr "Cargando datos desde el servidor de base de datos y representando..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2588 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2582 #, python-format msgid "Successfully run. Total query runtime: %s." msgstr "Ejecución exitosa. Tiempo de ejecución total de la consulta: %s." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2589 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2583 #, python-format msgid "%s rows affected." msgstr "%s filas afectadas." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2865 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2859 msgid "" "This query was generated by pgAdmin as part of a \"View/Edit Data\" " "operation" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2966 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2960 msgid "Row(s) deleted." msgstr "Fila(s) borradas." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3040 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3034 msgid "Saving the updated data..." msgstr "Salvando los datos actualizados..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3156 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3150 msgid "Data saved successfully." msgstr "Datos salvados exitosamente." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3159 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3153 msgid "Auto-commit is off. You still need to commit changes to the database." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3165 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3159 #, python-format msgid "%s." msgstr "%s." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3170 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3164 msgid "" "Saving data changes was rolled back but the current transaction is still " "active; previous queries are unaffected." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3192 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3186 msgid "This query was generated by pgAdmin as part of a \"Save Data\" operation" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3353 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3347 msgid "Loading the file..." msgstr "Cargando el archivo..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3404 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3398 msgid "Saving the queries in the file..." msgstr "Salvando las consultas en el archivo..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3416 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3410 msgid "File saved successfully." msgstr "Archivos salvados exitosamente." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3538 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3597 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3532 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3591 msgid "Applying the new filter..." msgstr "Aplicando el nuevo filtro..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3558 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3568 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3552 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3562 msgid "Filter By Selection Error" msgstr "Error Filtro por Selección" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3617 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3627 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3611 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3621 msgid "Filter Exclude Selection Error" msgstr "Error Filtro Excluir Selección" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3637 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3631 msgid "Removing the filter..." msgstr "Quitando el filtro..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3655 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3665 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3649 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3659 msgid "Remove Filter Error" msgstr "Error al Quitar Filtro" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3768 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3762 msgid "Setting the limit on the result..." msgstr "Configurando el limite en el resultado..." -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3787 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3796 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3781 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3790 msgid "Change limit Error" msgstr "Error Cambiando limite" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3922 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3941 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3916 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3935 msgid "Cancel Query Error" msgstr "Error al Cancelar la Consulta" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3960 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:3954 msgid "Downloading CSV..." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4014 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4008 msgid "CSV Download cancelled." msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4017 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4011 #: pgadmin/tools/sqleditor/utils/query_tool_preferences.py:395 msgid "Download CSV" msgstr "Descargar CSV" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4020 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4014 msgid "Download CSV error" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4054 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4061 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4048 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4055 msgid "Auto Rollback Error" msgstr "Error en Auto Rollback" +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4081 #: pgadmin/tools/sqleditor/static/js/sqleditor.js:4087 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4093 msgid "Auto Commit Error" msgstr "Error en Auto Commit" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4182 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4176 msgid "The data has changed. Do you want to save changes?" msgstr "La data ha cambiado. ¿Quiere salvar los cambios?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4188 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4182 msgid "The text has changed. Do you want to save changes?" msgstr "El texto ha cambiado. ¿Quiere salvar los cambios?" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4268 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4262 msgid "" "The current transaction is not commited to the database.Do you want to " "commit or rollback the transaction?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4271 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4265 msgid "Commit transaction?" msgstr "" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4294 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4288 msgid "Don't save" msgstr "No salvar" -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4337 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:4331 msgid "Save changes?" msgstr "¿Salvar cambios?" @@ -12642,9 +12577,3 @@ msgstr "No se pudo encontrar la base de datos especificada." #~ msgid "Error dropping %s: \"%s\"" #~ msgstr "Error eliminando %s: \"%s\"" -#~ msgid "Tablespace cannot be empty." -#~ msgstr "Tablespace no puede estar vacío." - -#~ msgid "Label must be specified." -#~ msgstr "Nivel tiene que estar especificado." - diff --git a/web/pgadmin/translations/fr/LC_MESSAGES/messages.mo b/web/pgadmin/translations/fr/LC_MESSAGES/messages.mo index 404c7e584182ca2e4bd2c40b75c81c771d313742..1d09217170427a307a1d9311df6eb2e6f6fdea5e 100644 GIT binary patch delta 34607 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 Dq-%ag diff --git a/web/pgadmin/translations/fr/LC_MESSAGES/messages.po b/web/pgadmin/translations/fr/LC_MESSAGES/messages.po index f1429e44f..8723a9cb0 100644 --- a/web/pgadmin/translations/fr/LC_MESSAGES/messages.po +++ b/web/pgadmin/translations/fr/LC_MESSAGES/messages.po @@ -1,6 +1,6 @@ -# French translations for PROJECT. +# French translations for PgAdmin4. # Copyright (C) 2017 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. +# This file is distributed under the same license as the PgAdmin4 project. # FIRST AUTHOR , 2017. # Fred Escallier , 2019. # @@ -8,16 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: PgAdmin4 -3.4\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-01-03 19:02+0530\n" -"PO-Revision-Date: 2020-01-04 14:13+0100\n" +"POT-Creation-Date: 2019-12-06 19:29+0530\n" +"PO-Revision-Date: 2019-12-09 13:54+0100\n" "Last-Translator: Fred Escallier \n" -"Language-Team: français \n" "Language: fr\n" +"Language-Team: français \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Generated-By: Babel 2.6.0\n" +"Generated-By: Babel 2.7.0\n" "X-Generator: Poedit 2.2.1\n" #: pgadmin/__init__.py:509 pgadmin/__init__.py:562 @@ -49,13 +49,13 @@ msgstr "Ordinateur de bureau" #: pgadmin/static/js/slickgrid/editors.js:50 #: pgadmin/static/js/slickgrid/editors.js:60 #: pgadmin/static/js/slickgrid/editors.js:61 -#: pgadmin/static/js/sqleditor/filter_dialog.js:84 -#: pgadmin/tools/datagrid/static/js/show_data.js:143 -#: pgadmin/tools/datagrid/static/js/show_data.js:218 +#: pgadmin/static/js/sqleditor/filter_dialog.js:83 +#: pgadmin/tools/datagrid/static/js/show_data.js:142 +#: pgadmin/tools/datagrid/static/js/show_data.js:217 #: pgadmin/tools/import_export/static/js/import_export.js:500 -#: pgadmin/tools/maintenance/static/js/maintenance.js:302 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2005 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2035 +#: pgadmin/tools/maintenance/static/js/maintenance.js:301 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1999 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2029 msgid "OK" msgstr "OK" @@ -139,12 +139,8 @@ msgid "Please set a master password for pgAdmin." msgstr "Veuillez définir un mot de passe maître pour pgAdmin." #: pgadmin/browser/__init__.py:732 -msgid "" -"This will be used to secure and later unlock saved passwords and other " -"credentials." -msgstr "" -"Ceci sera utilisé pour sécuriser et déverrouiller les mots de passe " -"enregistrés ainsi que d'autres informations d'identification." +msgid "This will be used to secure and later unlock saved passwords and other credentials." +msgstr "Ceci sera utilisé pour sécuriser et déverrouiller les mots de passe enregistrés ainsi que d'autres informations d'identification." #: pgadmin/browser/__init__.py:736 msgid "Unlock Saved Passwords" @@ -155,12 +151,8 @@ msgid "Please enter your master password." msgstr "Veuillez saisir votre mot de passe maître." #: pgadmin/browser/__init__.py:739 -msgid "" -"This is required to unlock saved passwords and reconnect to the database " -"server(s)." -msgstr "" -"Ceci est nécessaire pour déverrouiller les mots de passe enregistrés et pour " -"se reconnecter au(x) serveur(s) de base de données." +msgid "This is required to unlock saved passwords and reconnect to the database server(s)." +msgstr "Ceci est nécessaire pour déverrouiller les mots de passe enregistrés et pour se reconnecter au(x) serveur(s) de base de données." #: pgadmin/browser/__init__.py:802 msgid "Incorrect master password" @@ -172,29 +164,23 @@ msgstr "Le mot de passe maître ne peut pas être vide" #: pgadmin/browser/__init__.py:903 pgadmin/browser/__init__.py:995 #: pgadmin/browser/__init__.py:1066 -msgid "" -"SMTP Socket error: {}\n" +msgid "SMTP Socket error: {}\n" "Your password has not been changed." -msgstr "" -"Erreur de connexion SMTP : {}\n" +msgstr "Erreur de connexion SMTP : {}\n" "Votre mot de passe n'a pas été changé." #: pgadmin/browser/__init__.py:914 pgadmin/browser/__init__.py:1007 #: pgadmin/browser/__init__.py:1078 -msgid "" -"SMTP error: {}\n" +msgid "SMTP error: {}\n" "Your password has not been changed." -msgstr "" -"Erreur SMTP : {}\n" +msgstr "Erreur SMTP : {}\n" "Votre mot de passe n'a pas été changé." #: pgadmin/browser/__init__.py:923 pgadmin/browser/__init__.py:1015 #: pgadmin/browser/__init__.py:1086 -msgid "" -"Error: {}\n" +msgid "Error: {}\n" "Your password has not been changed." -msgstr "" -"Erreur: {}\n" +msgstr "Erreur: {}\n" "Votre mot de passe n'a pas été changé." #: pgadmin/browser/register_browser_preferences.py:21 @@ -233,50 +219,32 @@ msgid "Browser tree state saving interval" msgstr "Intervalle de sauvegarde de l'arborescence" #: pgadmin/browser/register_browser_preferences.py:41 -msgid "" -"Browser tree state saving interval in seconds.Use -1 to disable the tree " -"saving mechanism." -msgstr "" -"Intervalle de sauvegarde de l'état de l'arborescence en secondes. -1 pour " -"désactiver le mécanisme de sauvegarde." +msgid "Browser tree state saving interval in seconds.Use -1 to disable the tree saving mechanism." +msgstr "Intervalle de sauvegarde de l'état de l'arborescence en secondes. -1 pour désactiver le mécanisme de sauvegarde." #: pgadmin/browser/register_browser_preferences.py:49 msgid "Confirm on close or refresh ?" msgstr "Confirmer lors de fermeture ou d'actualisation ?" #: pgadmin/browser/register_browser_preferences.py:51 -msgid "" -"Confirm closure or refresh of the browser or browser tab is intended before " -"proceeding." -msgstr "" -"Demander confirmation lors de la fermeture ou de l'actualisation du " -"navigateur ou de l'onglet du navigateur." +msgid "Confirm closure or refresh of the browser or browser tab is intended before proceeding." +msgstr "Demander confirmation lors de la fermeture ou de l'actualisation du navigateur ou de l'onglet du navigateur." #: pgadmin/browser/register_browser_preferences.py:59 msgid "Confirm before Close/Reset in object properties dialog ?" -msgstr "" -"Confirmer avant de Fermer/Réinitialiser les boites de dialogues des " -"propriétés des objets ?" +msgstr "Confirmer avant de Fermer/Réinitialiser les boites de dialogues des propriétés des objets ?" #: pgadmin/browser/register_browser_preferences.py:62 -msgid "" -"Confirm before closing or resetting the changes in the properties dialog for " -"an object if the changes are not saved." -msgstr "" -"Confirme avant la fermeture ou la réinitialisation des boites de dialogues " -"de propriétés des objets si les modifications ne sont pas enregistrées." +msgid "Confirm before closing or resetting the changes in the properties dialog for an object if the changes are not saved." +msgstr "Confirme avant la fermeture ou la réinitialisation des boites de dialogues de propriétés des objets si les modifications ne sont pas enregistrées." #: pgadmin/browser/register_browser_preferences.py:70 msgid "Auto-expand sole children" msgstr "Auto-extension des objets uniques" #: pgadmin/browser/register_browser_preferences.py:72 -msgid "" -"If a treeview node is expanded and has only a single child, automatically " -"expand the child node as well." -msgstr "" -"Si un noeud de l'arborescence est étendu et ne présente qu'un seul élément, " -"étendre automatiquement ce dernier." +msgid "If a treeview node is expanded and has only a single child, automatically expand the child node as well." +msgstr "Si un noeud de l'arborescence est étendu et ne présente qu'un seul élément, étendre automatiquement ce dernier." #: pgadmin/browser/register_browser_preferences.py:88 msgid "Lock the UI layout at different levels" @@ -297,12 +265,8 @@ msgid "Maximum job history rows" msgstr "Nombre de lignes max de l'historique des tâches" #: pgadmin/browser/register_browser_preferences.py:104 -msgid "" -"The maximum number of history rows to show on the Statistics tab for pgAgent " -"jobs" -msgstr "" -"Nombre maximum de lignes à afficher dans le tableau de statistiques des " -"tâches pgAgent" +msgid "The maximum number of history rows to show on the Statistics tab for pgAgent jobs" +msgstr "Nombre maximum de lignes à afficher dans le tableau de statistiques des tâches pgAgent" #: pgadmin/browser/register_browser_preferences.py:111 #: pgadmin/utils/__init__.py:307 pgadmin/utils/__init__.py:316 @@ -480,7 +444,7 @@ msgstr "Les caractériqtiques requises sont manquantes." #: pgadmin/browser/utils.py:386 #: pgadmin/static/js/alertify.pgadmin.defaults.js:102 #: pgadmin/static/js/alertify.pgadmin.defaults.js:163 -#: pgadmin/static/js/alertify.pgadmin.defaults.js:305 +#: pgadmin/static/js/alertify.pgadmin.defaults.js:303 #: pgadmin/tools/grant_wizard/__init__.py:129 pgadmin/utils/exception.py:35 msgid "Connection to the server has been lost." msgstr "La connexion au serveur a été perdue." @@ -521,11 +485,9 @@ msgid "Could not find the server with id# {0}." msgstr "Impossible de trouver le serveur avec id# {0}." #: pgadmin/browser/server_groups/servers/__init__.py:466 -msgid "" -"The specified server could not be found.\n" +msgid "The specified server could not be found.\n" "Does the user have permission to access the server?" -msgstr "" -"Le groupe de serveur spécifié ne peut pas être trouvé.\n" +msgstr "Le groupe de serveur spécifié ne peut pas être trouvé.\n" "L'utilisateur a-t-il les autorisations nécessaires pour accéder à ce serveur?" #: pgadmin/browser/server_groups/servers/__init__.py:488 @@ -599,7 +561,7 @@ msgid "No parameters were changed." msgstr "Aucun paramètre n'a été modifié." #: pgadmin/browser/server_groups/servers/__init__.py:767 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:567 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:562 #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:370 #: pgadmin/browser/server_groups/servers/databases/extensions/__init__.py:264 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py:395 @@ -621,7 +583,7 @@ msgstr "Aucun paramètre n'a été modifié." #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:365 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:569 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py:436 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:888 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:922 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:393 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py:484 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py:478 @@ -639,20 +601,16 @@ msgstr "Impossible de trouver le paramètre (%s)." #: pgadmin/browser/server_groups/servers/__init__.py:865 #, python-format -msgid "" -"Unable to connect to server:\n" +msgid "Unable to connect to server:\n" "\n" "%s" -msgstr "" -"Impossible de se connecter au serveur:\n" +msgstr "Impossible de se connecter au serveur:\n" "\n" "%s" #: pgadmin/browser/server_groups/servers/__init__.py:938 msgid "Server has no active connection for generating statistics." -msgstr "" -"Le serveur ne dispose pas d'une connexion active pour générer les " -"statistiques." +msgstr "Le serveur ne dispose pas d'une connexion active pour générer les statistiques." #: pgadmin/browser/server_groups/servers/__init__.py:1018 #: pgadmin/browser/server_groups/servers/__init__.py:1187 @@ -696,10 +654,8 @@ msgstr "Configuration du serveur rechargée." #: pgadmin/static/js/sqleditor/execute_query.js:307 #: pgadmin/static/js/sqleditor/query_tool_http_error_handler.js:51 #: pgadmin/static/js/sqleditor_utils.js:167 -msgid "" -"Not connected to the server or the connection to the server has been closed." -msgstr "" -"Absence de connexion au serveur ou la connexion au serveur a été fermée." +msgid "Not connected to the server or the connection to the server has been closed." +msgstr "Absence de connexion au serveur ou la connexion au serveur a été fermée." #: pgadmin/browser/server_groups/servers/__init__.py:1268 msgid "Named restore point created: {0}" @@ -743,12 +699,8 @@ msgid "Greenplum Database Binary Path" msgstr "Chemin des binaires Greenplum" #: pgadmin/browser/server_groups/servers/gpdb.py:16 -msgid "" -"Path to the directory containing the Greenplum Database utility programs " -"(pg_dump, pg_restore etc)." -msgstr "" -"Chemin du dossier contenant les binaires des utilitaires de bases de données " -"Greenplum (pg_dump, pg_restore etc)." +msgid "Path to the directory containing the Greenplum Database utility programs (pg_dump, pg_restore etc)." +msgstr "Chemin du dossier contenant les binaires des utilitaires de bases de données Greenplum (pg_dump, pg_restore etc)." #: pgadmin/browser/server_groups/servers/gpdb.py:30 msgid "Greenplum Database" @@ -759,12 +711,8 @@ msgid "EDB Advanced Server Binary Path" msgstr "Chemin des binaire EDB Advanced Server" #: pgadmin/browser/server_groups/servers/ppas.py:16 -msgid "" -"Path to the directory containing the EDB Advanced Server utility programs " -"(pg_dump, pg_restore etc)." -msgstr "" -"Chemin du dossier contenant les binaires des utilitaires de bases de données " -"EDB Advanced Server (pg_dump, pg_restore etc)." +msgid "Path to the directory containing the EDB Advanced Server utility programs (pg_dump, pg_restore etc)." +msgstr "Chemin du dossier contenant les binaires des utilitaires de bases de données EDB Advanced Server (pg_dump, pg_restore etc)." #: pgadmin/browser/server_groups/servers/ppas.py:26 msgid "EDB Advanced Server" @@ -775,12 +723,8 @@ msgid "PostgreSQL Binary Path" msgstr "Chemin des binaires PostgreSQL" #: pgadmin/browser/server_groups/servers/types.py:31 -msgid "" -"Path to the directory containing the PostgreSQL utility programs (pg_dump, " -"pg_restore etc)." -msgstr "" -"Chemin du dossier contenant les binaires des utilitaires PostgreSQL " -"(pg_dump, pg_restore etc)." +msgid "Path to the directory containing the PostgreSQL utility programs (pg_dump, pg_restore etc)." +msgstr "Chemin du dossier contenant les binaires des utilitaires PostgreSQL (pg_dump, pg_restore etc)." #: pgadmin/browser/server_groups/servers/types.py:59 #: pgadmin/help/__init__.py:53 @@ -800,33 +744,33 @@ msgstr "Impossible de trouver l'utilitaire pour cette opération '%s'" msgid "PostgreSQL" msgstr "PostgreSQL" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:38 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:37 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:21 msgid "Databases" msgstr "Bases de données" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:375 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:391 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:654 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:724 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:849 -#: pgadmin/browser/server_groups/servers/databases/__init__.py:1021 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:374 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:390 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:649 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:719 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:844 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:1016 msgid "Could not find the database on the server." msgstr "Impossible de trouver la base de données sur le serveur." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:469 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:468 msgid "Database connected." msgstr "Base de données connectée." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:488 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:485 msgid "Database could not be disconnected." msgstr "Impossible de déconnecter la base de données." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:492 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:489 msgid "Database disconnected." msgstr "Base de données déconnectée." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:777 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:772 #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:483 #: pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py:522 #: pgadmin/browser/server_groups/servers/databases/extensions/__init__.py:357 @@ -841,10 +785,10 @@ msgstr "Base de données déconnectée." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:548 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:488 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py:453 -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:830 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:829 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py:441 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:462 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1051 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1085 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:474 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py:565 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py:591 @@ -862,11 +806,11 @@ msgstr "Base de données déconnectée." msgid "Error: Object not found." msgstr "Erreur: Objet non trouvé." -#: pgadmin/browser/server_groups/servers/databases/__init__.py:780 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:775 msgid "The specified database could not be found.\n" msgstr "La base de données ne peut pas être trouvée\n" -#: pgadmin/browser/server_groups/servers/databases/__init__.py:876 +#: pgadmin/browser/server_groups/servers/databases/__init__.py:871 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:728 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1561 msgid " -- definition incomplete" @@ -893,12 +837,10 @@ msgid "Could not find the specified cast on the server." msgstr "Impossible de trouver le transtypage sur le serveur." #: pgadmin/browser/server_groups/servers/databases/casts/__init__.py:666 -msgid "" -"Could not generate reversed engineered SQL for the cast.\n" +msgid "Could not generate reversed engineered SQL for the cast.\n" "\n" "{0}" -msgstr "" -"Impossible de générer le code SQL pour le transtypage.\n" +msgstr "Impossible de générer le code SQL pour le transtypage.\n" "\n" "{0}" @@ -962,19 +904,19 @@ msgstr "Conversion..." #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:93 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:39 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:210 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:182 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:107 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:670 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:712 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:119 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:105 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:53 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:292 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:181 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:106 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:669 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:710 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:118 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:104 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:52 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:289 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:358 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:131 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:130 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:265 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:324 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:184 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:183 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:324 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:148 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:112 @@ -1026,22 +968,22 @@ msgstr "Nom" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:114 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js:65 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:393 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:185 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:110 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:673 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:716 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:123 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:109 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:295 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:184 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:109 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:672 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:714 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:122 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:108 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:292 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:361 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:146 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:145 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:254 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:327 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:187 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:186 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:328 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:151 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:115 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:312 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:309 #: pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js:87 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:391 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:344 @@ -1156,56 +1098,56 @@ msgstr "Type source" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:654 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:658 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:662 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:137 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:158 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:692 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:702 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:747 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:750 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:758 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:781 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:735 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:748 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:772 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:789 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:805 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:853 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:144 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:416 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:513 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:538 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:561 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:576 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:604 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:130 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:402 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:499 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:523 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:550 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:565 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:593 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:315 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:346 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:349 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:136 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:157 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:691 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:701 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:746 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:749 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:757 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:780 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:733 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:746 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:770 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:787 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:803 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:851 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:143 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:415 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:512 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:537 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:560 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:575 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:603 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:129 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:401 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:498 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:522 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:549 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:564 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:592 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:311 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:342 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:345 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:384 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:388 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:392 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:396 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:400 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:404 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:407 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:411 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:415 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:418 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:440 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:166 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:179 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:191 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:207 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:250 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:268 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:292 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:318 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:323 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:414 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:436 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:165 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:190 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:249 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:267 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:291 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:317 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:322 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:350 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:375 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:385 @@ -1217,14 +1159,14 @@ msgstr "Type source" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:173 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:136 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:140 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:338 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:343 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:367 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:376 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:381 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:335 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:340 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:364 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:373 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:378 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:383 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:386 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:389 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:393 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:390 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:395 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:408 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:412 @@ -1279,22 +1221,22 @@ msgstr "Transtypage système?" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js:74 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:403 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:674 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:306 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:113 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:676 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:719 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:127 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:113 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:59 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:477 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:305 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:112 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:675 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:717 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:126 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:112 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:58 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:473 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:411 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:203 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:202 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:397 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:515 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:514 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:762 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:169 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:132 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:334 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:331 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:465 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:140 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:206 @@ -1321,8 +1263,7 @@ msgstr "Impossible de trouver le trigger sur évènement." #: pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py:336 #: pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py:610 msgid "Could not find the event trigger information." -msgstr "" -"Impossible de trouver l'information concernant le trigger sur évènement." +msgstr "Impossible de trouver l'information concernant le trigger sur évènement." #: pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py:380 #: pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py:639 @@ -1378,7 +1319,7 @@ msgstr "Trigger sur évènement..." #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:331 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:154 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:118 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:315 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:312 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:355 #: pgadmin/dashboard/static/js/dashboard.js:1129 #: pgadmin/dashboard/static/js/dashboard.js:1387 @@ -1390,7 +1331,7 @@ msgstr "Propriétaire" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:111 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:155 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:242 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:199 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:198 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:286 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:103 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:144 @@ -1399,28 +1340,28 @@ msgstr "Activé ?" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:120 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:39 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:316 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:315 msgid "Trigger function" msgstr "Fonction déclencheur" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:124 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:205 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:267 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:272 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:347 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:387 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:391 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:404 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:417 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:429 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:459 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:464 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:204 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:266 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:271 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:346 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:386 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:390 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:403 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:416 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:428 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:458 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:463 msgid "Events" msgstr "Événements" #: pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js:132 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:264 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:456 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:263 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:455 msgid "When" msgstr "Quand" @@ -1439,7 +1380,7 @@ msgstr "Quand" #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:784 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:222 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:169 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:409 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:406 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:514 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:378 msgid "Security labels" @@ -1472,14 +1413,14 @@ msgstr "Label de sécurité" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1124 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:167 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:130 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:317 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:320 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:323 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:326 #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:329 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:332 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:400 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:412 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:467 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:397 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:409 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:464 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:516 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:360 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:372 @@ -1586,11 +1527,11 @@ msgstr "Déplaçable ?" #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:189 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:479 #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:195 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:321 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:495 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:530 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:320 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:491 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:529 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:811 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:455 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:452 #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:473 #: pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js:163 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:221 @@ -1627,8 +1568,7 @@ msgstr "Impossible de trouver le wrapper de données distantes." #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py:344 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py:609 msgid "Could not find the foreign data wrapper information." -msgstr "" -"Impossible de trouver l'information sur le wrapper de données distantes." +msgstr "Impossible de trouver l'information sur le wrapper de données distantes." #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py:520 msgid "The specified foreign data wrapper could not be found.\n" @@ -1791,8 +1731,8 @@ msgstr "Type" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:214 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:129 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:161 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:319 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:396 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:316 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:393 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:420 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:427 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:440 @@ -1821,8 +1761,7 @@ msgstr "Impossible de trouver la correspondance d'utilisateurs." #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py:633 #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py:726 msgid "Could not find the user mapping information." -msgstr "" -"Impossible de trouver l'information sur la correspondance d'utilisateurs." +msgstr "Impossible de trouver l'information sur la correspondance d'utilisateurs." #: pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py:548 msgid "The specified user mapping could not be found.\n" @@ -1949,23 +1888,17 @@ msgstr "Catalogues" #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:487 #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:894 #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:996 -msgid "" -"\n" +msgid "\n" "Could not find the schema in the database.\n" "It may have been removed by another user.\n" -msgstr "" -"\n" +msgstr "\n" "Impossible de trouver le schéma dans la base de données.\n" "Il a pu être supprimé par un autre utilisateur.\n" #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:534 #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:815 -msgid "" -"Could not find the schema in the database. It may have been removed by " -"another user." -msgstr "" -"Impossible de trouver le schéma dans la base de données. Il a pu être " -"supprimé par un autre utilisateur." +msgid "Could not find the schema in the database. It may have been removed by another user." +msgstr "Impossible de trouver le schéma dans la base de données. Il a pu être supprimé par un autre utilisateur." #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:687 msgid "The specified schema could not be found.\n" @@ -1976,7 +1909,7 @@ msgid "Schema dropped" msgstr "Schéma supprimé" #: pgadmin/browser/server_groups/servers/databases/schemas/__init__.py:781 -#: pgadmin/static/js/backform.pgadmin.js:1837 +#: pgadmin/static/js/backform.pgadmin.js:1833 msgid "Definition incomplete." msgstr "Définition incomplète." @@ -1995,23 +1928,23 @@ msgstr "Impossible de trouver l'objet catalogue." #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:594 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:60 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:23 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:269 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:268 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:786 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:787 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:788 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:909 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:898 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:899 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:143 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:344 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:417 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:908 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:896 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:897 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:142 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:340 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:413 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:421 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:427 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:428 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:401 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:495 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:496 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:461 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:460 #: pgadmin/tools/import_export/static/js/import_export.js:179 #: pgadmin/tools/import_export/static/js/import_export.js:199 #: pgadmin/tools/import_export/static/js/import_export.js:237 @@ -2060,7 +1993,7 @@ msgstr "Type de données" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:85 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:171 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:449 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:375 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:372 msgid "Collation" msgstr "Collationnement" @@ -2086,12 +2019,8 @@ msgstr "Impossible de trouver le collationnement dans la base de données." #: pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py:447 #: pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js:178 -msgid "" -"Definition incomplete. Please provide Locale OR Copy Collation OR LC_TYPE/" -"LC_COLLATE." -msgstr "" -"Définition incomplète!. Merci de fournir soit une Locale soit un LC_TYPE/" -"LC_COLLATE soit copier un collationnement." +msgid "Definition incomplete. Please provide Locale OR Copy Collation OR LC_TYPE/LC_COLLATE." +msgstr "Définition incomplète!. Merci de fournir soit une Locale soit un LC_TYPE/LC_COLLATE soit copier un collationnement." #: pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py:537 msgid "Collation dropped" @@ -2131,15 +2060,12 @@ msgid "Could not find the specified domain." msgstr "Impossible de trouver le domaine." #: pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py:380 -msgid "" -"\n" +msgid "\n" "Could not find the domain in the database.\n" "It may have been removed by another user or moved to another schema.\n" -msgstr "" -"\n" +msgstr "\n" "Impossible de trouver le domaine dans la base de données.\n" -"Il a pu être supprimé par un autre utilisateur ou déplacé dans un autre " -"schéma.\n" +"Il a pu être supprimé par un autre utilisateur ou déplacé dans un autre schéma.\n" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py:606 msgid "The specified domain could not be found.\n" @@ -2180,7 +2106,7 @@ msgstr "Contrainte du domaine..." #: pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js:65 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:415 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:21 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:128 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:127 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:614 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:679 msgid "Check" @@ -2188,7 +2114,7 @@ msgstr "Vérification" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js:97 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:419 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:136 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:135 msgid "No inherit?" msgstr "Pas d'héritage ?" @@ -2199,7 +2125,7 @@ msgid "Validate?" msgstr "Valider ?" #: pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js:129 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:177 msgid "Check cannot be empty." msgstr "La vérification ne peut pas être vide." @@ -2304,8 +2230,8 @@ msgstr "Table distante supprimée" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py:1285 #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py:1330 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1367 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1417 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1401 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1451 #: pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py:1356 msgid "-- Please create column(s) first..." msgstr "-- Merci de créer d'abord la/les colonne/s..." @@ -2314,8 +2240,6 @@ msgstr "-- Merci de créer d'abord la/les colonne/s..." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:487 #: pgadmin/browser/static/js/browser.js:213 #: pgadmin/misc/static/explain/js/explain.js:1219 -#: pgadmin/misc/static/explain/js/explain.js:1348 -#: pgadmin/misc/static/explain/js/explain.js:1349 #: pgadmin/misc/statistics/static/js/statistics.js:129 msgid "Statistics" msgstr "Statistiques" @@ -2325,7 +2249,7 @@ msgid "Inherited From" msgstr "Hérité de" #: pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js:259 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:178 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:176 msgid "Column Name cannot be empty." msgstr "Le nom de colonne ne peut pas être vide." @@ -2380,14 +2304,11 @@ msgstr "Configurations de recherche plein texte" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py:320 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py:643 msgid "Could not find the FTS Configuration node." -msgstr "" -"Impossible de trouver le noeud de configuration de recherche plein texte." +msgstr "Impossible de trouver le noeud de configuration de recherche plein texte." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py:359 msgid "Could not find the FTS Configuration node in the database node." -msgstr "" -"Impossible de trouver le noeud de configuration de recherche plein texte " -"dans le noeud de la base de données." +msgstr "Impossible de trouver le noeud de configuration de recherche plein texte dans le noeud de la base de données." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py:416 msgid "Provide at least copy config or parser." @@ -2395,9 +2316,7 @@ msgstr "Renseigner soit 'Copier la configuration' soit 'Analyseur'." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py:504 msgid "Could not find the FTS Configuration node to update." -msgstr "" -"Impossible de trouver le noeud de configuration de recherche plein texte à " -"mettre à jour." +msgstr "Impossible de trouver le noeud de configuration de recherche plein texte à mettre à jour." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py:557 msgid "The specified FTS configuration could not be found.\n" @@ -2408,20 +2327,14 @@ msgid "FTS Configuration dropped" msgstr "Configuration de recherche plein texte supprimée" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py:873 -msgid "" -"Could not generate reversed engineered query for the FTS Configuration.\n" +msgid "Could not generate reversed engineered query for the FTS Configuration.\n" "{0}" -msgstr "" -"Impossible de générer la requête pour la configuration de la recherche plein " -"texte.\n" +msgstr "Impossible de générer la requête pour la configuration de la recherche plein texte.\n" "{0}" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py:881 -msgid "" -"Could not generate reversed engineered query for FTS Configuration node." -msgstr "" -"Impossible de générer la requête pour la configuration du noeud de recherche " -"plein texte.\n" +msgid "Could not generate reversed engineered query for FTS Configuration node." +msgstr "Impossible de générer la requête pour la configuration du noeud de recherche plein texte.\n" "{0}" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js:29 @@ -2496,21 +2409,16 @@ msgstr "Dictionnaires de recherche plein texte" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:331 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:639 msgid "Could not find the FTS Dictionary node." -msgstr "" -"Impossible de trouver le noeud du dictionnaire de recherche plein texte." +msgstr "Impossible de trouver le noeud du dictionnaire de recherche plein texte." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:368 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:772 msgid "Could not find the FTS Dictionary node in the database node." -msgstr "" -"Impossible de trouver le noeud du dictionnaire de recherche plein texte " -"dans la base de données." +msgstr "Impossible de trouver le noeud du dictionnaire de recherche plein texte dans la base de données." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:499 msgid "Could not find the FTS Dictionary node to update." -msgstr "" -"Impossible de trouver le noeud du dictionnaire de recherche plein texte à " -"mettre à jour." +msgstr "Impossible de trouver le noeud du dictionnaire de recherche plein texte à mettre à jour." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py:551 msgid "The specified FTS dictionary could not be found.\n" @@ -2539,7 +2447,7 @@ msgid "FTS Dictionary..." msgstr "Dictionnaire de recherche plein texte ..." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js:153 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:342 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:339 msgid "Template" msgstr "Modèle" @@ -2555,20 +2463,15 @@ msgstr "Analyseurs de recherche plein texte" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:291 #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:577 msgid "Could not find the FTS Parser node." -msgstr "" -"Impossible de trouver le noeud de l'analyseur de recherche plein texte ." +msgstr "Impossible de trouver le noeud de l'analyseur de recherche plein texte ." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:318 msgid "Could not find the FTS Parser node in the database node." -msgstr "" -"Impossible de trouver le noeud de l'analyseur de recherche plein texte dans " -"la base de données." +msgstr "Impossible de trouver le noeud de l'analyseur de recherche plein texte dans la base de données." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:438 msgid "Could not find the FTS Parser node to update." -msgstr "" -"Impossible de trouver le noeud de l'analyseur de recherche plein texte à " -"mettre à jour." +msgstr "Impossible de trouver le noeud de l'analyseur de recherche plein texte à mettre à jour." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:491 msgid "The specified FTS parser could not be found.\n" @@ -2579,18 +2482,14 @@ msgid "FTS Parser dropped" msgstr "Analyseur de recherche plein texte supprimé" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:807 -msgid "" -"Could not generate reversed engineered query for the FTS Parser.\n" +msgid "Could not generate reversed engineered query for the FTS Parser.\n" "{0}" -msgstr "" -"Impossible de générer la requête pour l'analyseur de recherche plein texte.\n" +msgstr "Impossible de générer la requête pour l'analyseur de recherche plein texte.\n" "{0}" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py:815 msgid "Could not generate reversed engineered query for FTS Parser node" -msgstr "" -"Impossible de générer la requête pour le noeud de l'analyseur de recherche " -"plein texte" +msgstr "Impossible de générer la requête pour le noeud de l'analyseur de recherche plein texte" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js:36 msgid "FTS Parser" @@ -2658,18 +2557,14 @@ msgid "FTS Template dropped" msgstr "Modèle de recherche plein texte supprimé" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py:685 -msgid "" -"Could not generate reversed engineered query for the FTS Template.\n" +msgid "Could not generate reversed engineered query for the FTS Template.\n" "{0}" -msgstr "" -"Impossible de générer la requête pour le modèle de recherche plein texte.\n" +msgstr "Impossible de générer la requête pour le modèle de recherche plein texte.\n" "{0}" #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py:692 msgid "Could not generate reversed engineered query for FTS Template node." -msgstr "" -"Impossible de générer la requête pour le noeud du modèle de recherche plein " -"texte." +msgstr "Impossible de générer la requête pour le noeud du modèle de recherche plein texte." #: pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js:36 msgid "FTS Template" @@ -2698,7 +2593,7 @@ msgstr "LA fonction lexize doit être sélectionnée." #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:59 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:21 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:457 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:434 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:431 msgid "Functions" msgstr "Fonctions" @@ -2711,29 +2606,29 @@ msgstr "Impossible de trouver %s." msgid "Could not find the function node in the database." msgstr "Impossible de trouver le noeud de fonction dans la base de donnée." -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:833 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:832 msgid "The specified function could not be found.\n" msgstr "Impossible de trouver la fonction.\n" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:850 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:849 msgid "Function dropped." msgstr "Fonction supprimée." -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1141 -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1320 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1140 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1319 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:334 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:511 msgid "Could not find the function in the database." msgstr "Impossible de trouver la fonction dans la base de données." -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1628 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1627 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js:24 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py:621 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js:24 msgid "Procedures" msgstr "Procédures" -#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1728 +#: pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py:1727 msgid "Trigger Functions" msgstr "Fonctions déclencheurs" @@ -2773,7 +2668,7 @@ msgstr "Nombre d'arguments" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:327 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:150 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:79 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:322 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:321 msgid "Arguments" msgstr "Arguments" @@ -2797,8 +2692,8 @@ msgstr "Type renvoyé" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:182 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:98 #: pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js:100 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:289 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:493 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:288 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:492 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:154 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:155 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:209 @@ -2866,7 +2761,7 @@ msgstr "Fonction support" #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:338 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:245 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1119 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:405 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:402 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:508 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:366 #: pgadmin/tools/debugger/static/js/direct.js:1707 @@ -2906,7 +2801,7 @@ msgstr "Le symbole de lien ne peut pas être vide." #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js:406 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js:200 #: pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js:314 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:338 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:337 msgid "Code cannot be empty." msgstr "Le code ne peut pas être vide." @@ -3096,7 +2991,7 @@ msgstr "L'en-tête ne peut pas être vide." #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py:56 #: pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js:25 #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:450 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:428 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:425 msgid "Sequences" msgstr "Séquences" @@ -3259,22 +3154,22 @@ msgid "System schema?" msgstr "Schéma système ?" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:409 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:322 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:319 msgid "Default TABLE privileges" msgstr "Droits par défaut de la table" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:412 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:325 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:322 msgid "Default SEQUENCE privileges" msgstr "Droits par défaut de la séquence" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:415 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:328 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:325 msgid "Default FUNCTION privileges" msgstr "Droits par défaut de la fonction" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:418 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:331 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:328 msgid "Default TYPE privileges" msgstr "Droits par défaut du type" @@ -3283,9 +3178,9 @@ msgid "Default privileges" msgstr "Privilèges par défaut" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:443 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:53 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:29 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:422 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:419 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:130 msgid "Tables" msgstr "Tables" @@ -3293,7 +3188,7 @@ msgstr "Tables" #: pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js:464 #: pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py:58 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:24 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:445 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:442 msgid "Types" msgstr "Types" @@ -3354,8 +3249,8 @@ msgstr "Synonyme public ?" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:185 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:221 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:527 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:791 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:808 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:789 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:806 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:275 #: pgadmin/browser/static/js/browser.js:630 #: pgadmin/browser/static/js/node.js:1283 @@ -3364,17 +3259,17 @@ msgstr "Synonyme public ?" #: pgadmin/misc/file_manager/templates/file_manager/index.html:78 #: pgadmin/static/js/backform.pgadmin.js:538 #: pgadmin/static/js/backgrid.pgadmin.js:621 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1741 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1786 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2385 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1735 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1780 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2379 msgid "Yes" msgstr "Oui" #: pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js:185 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:221 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:527 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:792 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:809 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:790 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:807 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:275 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:147 #: pgadmin/browser/static/js/browser.js:631 @@ -3384,9 +3279,9 @@ msgstr "Oui" #: pgadmin/misc/file_manager/templates/file_manager/index.html:77 #: pgadmin/static/js/backform.pgadmin.js:539 #: pgadmin/static/js/backgrid.pgadmin.js:622 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1742 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1787 -#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2386 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1736 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:1781 +#: pgadmin/tools/sqleditor/static/js/sqleditor.js:2380 msgid "No" msgstr "No" @@ -3398,32 +3293,32 @@ msgstr "Le schéma cible ne peut pas être vide." msgid "Target object cannot be empty." msgstr "L'objet cible ne peut pas être vide." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:359 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:357 msgid "Could not find the table." msgstr "Impossible de trouver la table." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:596 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1271 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:630 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1305 msgid "The specified table could not be found." msgstr "Impossible de trouver la table." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1054 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1088 msgid "The specified table could not be found.\n" msgstr "Impossible de trouver la table.\n" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1067 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1101 msgid "Table dropped" msgstr "Table supprimée" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1145 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1179 msgid "Trigger(s) have been disabled" msgstr "Déclencheurs(s) désactivé(s)" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1147 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1181 msgid "Trigger(s) have been enabled" msgstr "Déclencheur(s) activé(s)" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1501 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py:1535 #, python-format msgid "Table rows counted: %s" msgstr "Nombre de lignes du tableau : %s" @@ -3476,7 +3371,7 @@ msgstr "Colonne supprimée" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:608 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:704 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:856 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py:853 msgid "Could not find the column on the server." msgstr "Impossible de trouver la colonne sur le serveur." @@ -3503,7 +3398,7 @@ msgstr "Hérité de la table" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:353 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:114 msgid "Length/Precision" -msgstr "Longueur/ précision" +msgstr "Longueur/ Précision" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:409 #: pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js:144 @@ -3579,11 +3474,11 @@ msgstr "Le type de la colonne doit être renseigné." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:728 msgid "Length/Precision should not be less than: " -msgstr "La longueur/précision ne doit pas être inférieure à : " +msgstr "Longueur / précision ne doit pas être inférieur à : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:730 msgid "Length/Precision should not be greater than: " -msgstr "La longueur/précision ne doit pas être supérieure à : " +msgstr "Longueur / précision ne doit pas être supérieur à : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js:744 msgid "Scale should not be less than: " @@ -3623,73 +3518,72 @@ msgstr "Le déclencheur composé est supprimé" msgid "Compound Trigger" msgstr "Déclencheur composé" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:56 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:62 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:68 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:74 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:90 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:61 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:67 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:73 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:89 msgid "Compound Trigger..." msgstr "Déclencheur composé..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:80 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:79 msgid "Enable compound trigger" msgstr "Activer le déclencheur composé" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:85 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:84 msgid "Disable compound trigger" msgstr "Désactiver le déclencheur composé" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:169 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:168 msgid "Disable compound trigger failed" msgstr "La désactivation du déclencheur composé a échoué" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:188 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:190 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:187 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:189 msgid "Trigger enabled?" msgstr "Déclencheur activé ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:205 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:209 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:222 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:235 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:248 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:204 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:208 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:221 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:234 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:247 msgid "FOR Events" msgstr "Événement FOR" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:207 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:389 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:388 msgid "INSERT" msgstr "INSERT" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:220 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:402 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:219 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:401 msgid "UPDATE" msgstr "UPDATE" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:233 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:415 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:232 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:414 msgid "DELETE" msgstr "DELETE" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:246 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:428 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:245 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:427 msgid "TRUNCATE" msgstr "TRUNCATE" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:303 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:512 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:302 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:511 msgid "System trigger?" msgstr "Déclencheur système ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:328 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:543 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:327 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:542 msgid "Specify at least one event." msgstr "Au moins un événement doit être renseigné." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:347 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js:346 #, fuzzy -msgid "" -"-- Enter any global declarations below:\n" +msgid "-- Enter any global declarations below:\n" "\n" "-- BEFORE STATEMENT block. Delete if not required.\n" "BEFORE STATEMENT IS\n" @@ -3725,8 +3619,7 @@ msgid "" "BEGIN\n" " -- Enter any required code here\n" "END;" -msgstr "" -"-- Enter any global declarations below:\n" +msgstr "-- Enter any global declarations below:\n" "\n" "-- BEFORE STATEMENT block. Delete if not required.\n" "BEFORE STATEMENT IS\n" @@ -3793,15 +3686,15 @@ msgstr "Impossible de trouver l'objet sur le serveur!." msgid "Check constraint updated." msgstr "Contrainte de vérification mise à jour." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:40 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:39 msgid "Check..." msgstr "Vérification..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:46 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:45 msgid "Validate check constraint" msgstr "Valider la contrainte de vérification" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:157 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js:156 msgid "Don't validate?" msgstr "Ne pas valider ?" @@ -3837,7 +3730,7 @@ msgid "Exclusion constraint dropped." msgstr "Contrainte d'exclusion supprimée." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:38 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:97 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:96 msgid "Operator class" msgstr "Classe d'opérateur" @@ -3865,10 +3758,10 @@ msgstr "Merci de renseigner l'opérateur pour la colonne : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:453 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:381 #: pgadmin/browser/server_groups/servers/static/js/variable.js:341 -#: pgadmin/static/js/backform.pgadmin.js:1260 -#: pgadmin/static/js/backform.pgadmin.js:1370 -#: pgadmin/static/js/backform.pgadmin.js:1550 -#: pgadmin/static/js/backform.pgadmin.js:1669 +#: pgadmin/static/js/backform.pgadmin.js:1259 +#: pgadmin/static/js/backform.pgadmin.js:1366 +#: pgadmin/static/js/backform.pgadmin.js:1546 +#: pgadmin/static/js/backform.pgadmin.js:1665 msgid "Add new row" msgstr "Ajouter une nouvelle ligne" @@ -3880,7 +3773,7 @@ msgstr "Contrainte d'exclusion" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:28 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:28 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:29 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:236 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:234 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/stats.sql:7 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/stats.sql:12 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/stats.sql:7 @@ -3890,87 +3783,87 @@ msgstr "Contrainte d'exclusion" msgid "Index size" msgstr "Taille index" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:642 msgid "Exclusion constraint..." msgstr "Contrainte d'exclusion..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:691 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:512 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:498 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:298 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:690 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:511 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:497 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:295 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:378 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:344 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:196 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:366 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:363 #: pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js:40 #: pgadmin/tools/backup/static/js/backup.js:366 #: pgadmin/tools/restore/static/js/restore.js:255 msgid "Tablespace" msgstr "Tablespace" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:701 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:700 msgid "Access method" msgstr "Méthode d'accès" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:716 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:326 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:715 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:322 msgid "Changing access method will clear columns collection" msgstr "Modifier la méthode d'accès videra les colonnes de la collection" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:746 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:560 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:549 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:386 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:745 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:559 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:548 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:382 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:716 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:790 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:204 msgid "Fill factor" msgstr "Facteur de remplissage" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:749 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:734 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:575 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:564 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:267 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:748 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:732 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:574 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:563 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:266 msgid "Deferrable?" msgstr "Différable ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:757 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:747 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:603 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:592 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:291 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:756 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:745 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:602 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:591 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:290 msgid "Deferred?" msgstr "Différable ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:779 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:413 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:778 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:409 msgid "Constraint" msgstr "Contrainte" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:908 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:415 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:401 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:348 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:439 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:907 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:414 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:400 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:344 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:435 msgid "Include columns" msgstr "Inclure les colonnes" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:931 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:242 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:438 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:228 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:424 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:370 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:461 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:930 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:241 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:437 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:227 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:423 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:366 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:457 msgid "Select the column(s)" msgstr "Sélectionner la (les) colonne(s)" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1012 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1011 msgid "Please specify name for exclusion constraint." msgstr "Merci de renseigner un nom pour la contrainte d'exclusion." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1018 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js:1017 msgid "Please specify columns for exclusion constraint." msgstr "Merci de renseigner les colonnes pour la contrainte d'exclusion." @@ -4028,53 +3921,53 @@ msgstr "Références" msgid "Referencing" msgstr "Références vers" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:616 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:615 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:585 msgid "Foreign key" msgstr "Clé étrangère" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:637 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:635 msgid "Foreign key..." msgstr "Clé étrangère..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:641 msgid "Validate foreign key" msgstr "Valider la clé étrangère" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:771 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:769 msgid "Match type" msgstr "Type de correspondance" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:788 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:786 msgid "Validated?" msgstr "Validé ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:804 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:802 msgid "Auto FK index?" msgstr "Index FK auto ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:852 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:850 msgid "Covering index" msgstr "Couverture de l'index" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1002 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1000 msgid "On update" msgstr "Lors d'une mise à jour" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1003 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1023 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1001 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1021 msgid "Action" msgstr "Action" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1022 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1020 msgid "On delete" msgstr "Lors d'une suppression" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1050 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1048 msgid "Please specify columns for Foreign key." msgstr "Merci de préciser les colonnes pour la clé étrangère." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1059 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js:1057 msgid "Please specify covering index name." msgstr "Merci de renseigner un nom pour la couverture d'index." @@ -4119,7 +4012,7 @@ msgstr "{0} supprimé." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py:996 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:20 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:43 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:42 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:557 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:729 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:811 @@ -4128,7 +4021,7 @@ msgstr "Clé primaire" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py:1006 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:20 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:43 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:42 msgid "Unique constraint" msgstr "Contrainte d'unicité" @@ -4136,19 +4029,19 @@ msgstr "Contrainte d'unicité" msgid "Could not find the constraint in the table." msgstr "Impossible de trouver la contrainte dans la table." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:536 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:522 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:231 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:535 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:521 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:229 msgid "Index" msgstr "Index" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:644 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:633 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js:643 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js:632 #, python-format msgid "Please specify columns for %s" msgstr "Merci de préciser les colonnes pour les %s" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:56 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js:55 msgid "Oid" msgstr "Oid" @@ -4175,7 +4068,7 @@ msgid "Index is dropped" msgstr "Index supprimé" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:29 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:236 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:234 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:45 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:33 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:49 @@ -4192,59 +4085,63 @@ msgstr "Index supprimé" msgid "Size" msgstr "Taille" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:130 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:128 msgid "Sort order" msgstr "Ordre de tri" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:151 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:149 msgid "NULLs" msgstr "NULLs" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:248 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:254 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:260 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:266 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:272 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:245 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:251 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:257 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:263 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:269 msgid "Index..." msgstr "Index..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:311 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:308 msgid "Access Method" msgstr "Méthode d'accès" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:390 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:386 msgid "Unique?" msgstr "Unique ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:394 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:390 msgid "Clustered?" msgstr "Appartient à un cluster ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:398 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:394 msgid "Valid?" msgstr "Valide ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:402 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:398 msgid "Primary?" msgstr "Primaire ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:406 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:402 msgid "System index?" msgstr "Index système ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:409 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:405 msgid "Concurrent build?" msgstr "Sans verrouillage ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:501 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:497 +msgid "Tablespace cannot be empty." +msgstr "Tablespace ne peut pas être vide." + +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:503 msgid "Access method cannot be empty." msgstr "La méthode d'accès ne peut pas être vide." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:509 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:511 msgid "You must specify column name." msgstr "Un nom de colonne doit être renseigné." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:514 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js:516 msgid "You must specify at least one column." msgstr "Au moins une colonne doit être renseignée." @@ -4384,9 +4281,7 @@ msgstr "Réinitialiser les statistiques" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:213 #, python-format msgid "Are you sure you want to reset the statistics for table \"%s\"?" -msgstr "" -"Êtes vous sûr de vouloir réinitialiser les statistiques pour la table \"%s" -"\" ?" +msgstr "Êtes vous sûr de vouloir réinitialiser les statistiques pour la table \"%s\" ?" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:276 #, python-format @@ -4573,19 +4468,8 @@ msgid "Error fetching tables to be attached" msgstr "Erreur lors de la récupération des tables à détacher" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:933 -msgid "" -"The control above is used to Create/Attach/Detach partitions." -"

" -msgstr "" -"Le contrôle ci-dessus est utilisé pour Créer/Attacher/Détacher des " -"partitions.
  • Mode Création : L'utilisateur sera capable de créer " -"un nombre N de partitions. Le mode \"switch control\" est désactivé dans ce " -"scenario.
  • Mode Édition : L'utilisateur sera capable de créer/" -"attacher/detacher un nombre N de partitions. Dans le mode \"attach\" il y a " -"aura une liste de tables appropriées à attacher.
" +msgid "The control above is used to Create/Attach/Detach partitions.
  • Create Mode: User will be able to create N number of partitions. Mode switch control is disabled in this scenario.
  • Edit Mode: User will be able to create/attach/detach N number of partitions. In attach mode there will be list of suitable tables to be attached.
" +msgstr "Le contrôle ci-dessus est utilisé pour Créer/Attacher/Détacher des partitions.
  • Mode Création : L'utilisateur sera capable de créer un nombre N de partitions. Le mode \"switch control\" est désactivé dans ce scenario.
  • Mode Édition : L'utilisateur sera capable de créer/attacher/detacher un nombre N de partitions. Dans le mode \"attach\" il y a aura une liste de tables appropriées à attacher.
" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js:948 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:209 @@ -4642,39 +4526,39 @@ msgstr "Règle supprimée" msgid "rule" msgstr "règle" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:93 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:99 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:105 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:111 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:117 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:92 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:98 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:104 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:110 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:116 msgid "Rule..." msgstr "Règle..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:165 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:164 #: pgadmin/static/js/sqleditor/query_tool_notifications.js:32 #: pgadmin/static/js/sqleditor/query_tool_notifications.js:80 msgid "Event" msgstr "Événement" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:179 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:178 msgid "Do instead?" msgstr "Faire à la place ?" +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:182 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:183 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:184 msgid "Condition" msgstr "Condition" +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:188 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:189 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:190 msgid "Commands" msgstr "Commandes" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:195 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:194 msgid "System rule?" msgstr "Règle système ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:215 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js:214 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:241 #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js:183 msgid "Please specify name." @@ -4739,30 +4623,23 @@ msgstr "Le nom de partition doit être renseigné." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:371 msgid "For range partition From field cannot be empty." -msgstr "" -"Pour le partitionnement par intervalles, le champ \"A partir de\" doit être " -"renseigné." +msgstr "Pour le partitionnement par intervalles, le champ \"A partir de\" doit être renseigné." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:376 msgid "For range partition To field cannot be empty." -msgstr "" -"Pour le partitionnement par intervalles, le champ \"Jusqu'à doit être " -"renseigné." +msgstr "Pour le partitionnement par intervalles, le champ \"Jusqu'à doit être renseigné." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:383 msgid "For list partition In field cannot be empty." -msgstr "" -"Pou le partitionnement par liste, le champ \"Dans\" doit être renseigné." +msgstr "Pou le partitionnement par liste, le champ \"Dans\" doit être renseigné." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:390 msgid "For hash partition Modulus field cannot be empty." -msgstr "" -"Pour le partitionnement par hachage, le champ 'Modulo' doit être renseigné." +msgstr "Pour le partitionnement par hachage, le champ 'Modulo' doit être renseigné." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js:395 msgid "For hash partition Remainder field cannot be empty." -msgstr "" -"Pour le partitionnement par hachage, le champ 'Reste' doit être renseigné." +msgstr "Pour le partitionnement par hachage, le champ 'Reste' doit être renseigné." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:67 #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:73 @@ -4812,9 +4689,7 @@ msgstr "Colonne : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:995 msgid "User can select any column from the list of available columns." -msgstr "" -"L'utilisateur peut choisir n'importe quelle colonne dans la liste des " -"colonnes disponibles." +msgstr "L'utilisateur peut choisir n'importe quelle colonne dans la liste des colonnes disponibles." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:997 msgid "Expression: " @@ -4822,99 +4697,63 @@ msgstr "Expression : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:998 msgid "User can specify expression to create partition key." -msgstr "" -"L'utilisateur peux renseigner l'expression pour créer la clé de partition." +msgstr "L'utilisateur peux renseigner l'expression pour créer la clé de partition." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1000 msgid "Example: " msgstr "Exemple : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1001 -msgid "" -"Let's say, we want to create a partition table based per year for the column " -"'saledate', having datatype 'date/timestamp', then we need to specify the " -"expression as 'extract(YEAR from saledate)' as partition key." -msgstr "" -"Dans le cas où nous voudrions créer une table de partition par année basée " -"sur une colonne 'saledate', avec pour type de données 'date/timestamp'. Il " -"faut alors renseigner l'expression 'extract(YEAR from saledate)' comme clé " -"de partition." +msgid "Let's say, we want to create a partition table based per year for the column 'saledate', having datatype 'date/timestamp', then we need to specify the expression as 'extract(YEAR from saledate)' as partition key." +msgstr "Dans le cas où nous voudrions créer une table de partition par année basée sur une colonne 'saledate', avec pour type de données 'date/timestamp'. Il faut alors renseigner l'expression 'extract(YEAR from saledate)' comme clé de partition." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1086 msgid "Create a table: " msgstr "Créer une table : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1087 -msgid "" -"User can create multiple partitions while creating new partitioned table. " -"Operation switch is disabled in this scenario." -msgstr "" -"L'utilisateur peut créer plusieurs partitions en créant une nouvelle table " -"de partition. \"Operation switch\" est désactivé dans ce scénario." +msgid "User can create multiple partitions while creating new partitioned table. Operation switch is disabled in this scenario." +msgstr "L'utilisateur peut créer plusieurs partitions en créant une nouvelle table de partition. \"Operation switch\" est désactivé dans ce scénario." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1089 msgid "Edit existing table: " msgstr "Modifier une table existante : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1090 -msgid "" -"User can create/attach/detach multiple partitions. In attach operation user " -"can select table from the list of suitable tables to be attached." -msgstr "" -"L'utilisateur peut créer/attacher/détacher plusieurs partitions. Dans le cas " -"de l'attache, l'utilisateur peut sélectionner une table dans la liste de " -"tables disponibles pour l'attache." +msgid "User can create/attach/detach multiple partitions. In attach operation user can select table from the list of suitable tables to be attached." +msgstr "L'utilisateur peut créer/attacher/détacher plusieurs partitions. Dans le cas de l'attache, l'utilisateur peut sélectionner une table dans la liste de tables disponibles pour l'attache." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1092 msgid "Default: " msgstr "Par défaut : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1093 -msgid "" -"The default partition can store rows that do not fall into any existing " -"partition’s range or list." -msgstr "" -"La partition par défaut peut stocker des lignes qui ne font pas partie d'une " -"plage ou liste de partitions existantes." +msgid "The default partition can store rows that do not fall into any existing partition’s range or list." +msgstr "La partition par défaut peut stocker des lignes qui ne font pas partie d'une plage ou liste de partitions existantes." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1095 msgid "From/To/In input: " msgstr "Entrées De /Jusqu'à /Dans : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1096 -msgid "" -"From/To/In input: Values for these fields must be quoted with single quote. " -"For more than one partition key values must be comma(,) separated." -msgstr "" -"Entrées De/Jusqu'à/Dans : Les valeurs pour ces champs doivent être " -"mentionnés entre guillemets simples. Pour définir plusieurs valeurs de clés " -"de partitions, ces dernières doivent être listées séparées par une " -"virgule(,)." +msgid "From/To/In input: Values for these fields must be quoted with single quote. For more than one partition key values must be comma(,) separated." +msgstr "Entrées De/Jusqu'à/Dans : Les valeurs pour ces champs doivent être mentionnés entre guillemets simples. Pour définir plusieurs valeurs de clés de partitions, ces dernières doivent être listées séparées par une virgule(,)." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1098 msgid "Example: From/To: " msgstr "Exemple : De / Jusqu'à : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1099 -msgid "" -"Enabled for range partition. Consider partitioned table with multiple keys " -"of type Integer, then values should be specified like '100','200'." -msgstr "" -"Disponible pour les partitions par intervalles. Si la table partitionnée " -"présente plusieurs clés de type entier, les valeurs doivent être renseignées " -"de cette façon : '100','200'." +msgid "Enabled for range partition. Consider partitioned table with multiple keys of type Integer, then values should be specified like '100','200'." +msgstr "Disponible pour les partitions par intervalles. Si la table partitionnée présente plusieurs clés de type entier, les valeurs doivent être renseignées de cette façon : '100','200'." #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1101 msgid "In: " msgstr "Dans : " #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1102 -msgid "" -"Enabled for list partition. Values must be comma(,) separated and quoted " -"with single quote." -msgstr "" -"Disponible pour le partitionnement par liste. Les valeurs doivent être " -"séparées par des virgules (,) et encadrées par des guillemets simples (')" +msgid "Enabled for list partition. Values must be comma(,) separated and quoted with single quote." +msgstr "Disponible pour le partitionnement par liste. Les valeurs doivent être séparées par des virgules (,) et encadrées par des guillemets simples (')" #: pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js:1104 msgid "Modulus/Remainder: " @@ -5268,56 +5107,56 @@ msgstr "Déclencheur supprimé" msgid "Trigger" msgstr "Déclencheur" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:56 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:62 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:68 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:74 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:90 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:55 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:61 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:67 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:73 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:89 msgid "Trigger..." msgstr "Déclencheur..." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:80 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:79 msgid "Enable trigger" msgstr "Activer le délencheur" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:85 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:84 msgid "Disable trigger" msgstr "Désactiver le déclencheur" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:169 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:168 msgid "Disable trigger failed" msgstr "La désactivation du déclencheur a échoué" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:206 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:205 msgid "Row trigger?" msgstr "Déclencheur niveau ligne ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:247 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:246 msgid "Constraint trigger?" msgstr "Déclencheur contrainte ?" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:346 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:345 msgid "Fires" msgstr "Déclenchement" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:481 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:480 msgid "Old table" msgstr "Ancienne table" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:482 -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:488 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:481 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:487 msgid "Transition" msgstr "Transition" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:487 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:486 msgid "New table" msgstr "Nouvelle table" -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:536 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:535 msgid "Trigger function cannot be empty." msgstr "La fonction trigger ne peut pas être vide." -#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:556 +#: pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js:555 msgid "Trigger code cannot be empty." msgstr "Le code du trigger ne peut pas être vide." @@ -5351,9 +5190,7 @@ msgstr "Le sous-type doit être défini pour un type intervalle de valeurs." #: pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py:954 msgid "External types require both input and output conversion functions." -msgstr "" -"Les types externes nécessitent des fonctions de conversion d'entrée et de " -"sortie." +msgstr "Les types externes nécessitent des fonctions de conversion d'entrée et de sortie." #: pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py:1099 msgid "The specified type could not be found.\n" @@ -5651,14 +5488,8 @@ msgid "System view?" msgstr "Vus système ?" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:180 -msgid "" -"Updating the definition will drop and re-create the materialized view. It " -"may result in loss of information about its dependent objects. Do you want " -"to continue?" -msgstr "" -"La mise à jour de la définition de la vue matérialisée supprimera et " -"recréera celle-ci. Elle peut entraîner la perte d'informations sur ses " -"objets dépendants. Voulez-vous continuer ?" +msgid "Updating the definition will drop and re-create the materialized view. It may result in loss of information about its dependent objects. Do you want to continue?" +msgstr "La mise à jour de la définition de la vue matérialisée supprimera et recréera lcelle-ci. Elle peut entraîner la perte d'informations sur ses objets dépendants. Voulez-vous continuer ?" #: pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js:192 msgid "With data?" @@ -5706,7 +5537,7 @@ msgid "Size of temporary files" msgstr "Taille des fichiers temporaires" #: pgadmin/browser/server_groups/servers/databases/static/js/database.js:45 -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:309 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:306 #: pgadmin/browser/server_groups/servers/databases/templates/databases/sql/9.2_plus/stats.sql:2 #: pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/stats.sql:2 #: pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js:176 @@ -5760,35 +5591,35 @@ msgstr "Déconnecter la base de donnée" msgid "Are you sure you want to disconnect the database - %s?" msgstr "Êtes vous sûr de vouloir déconnecter la base de donnée - %s ?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:337 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:334 #: pgadmin/static/js/browser/server_groups/servers/databases/external_tables/external_tables.js:52 #: pgadmin/tools/backup/static/js/backup.js:192 #: pgadmin/tools/import_export/static/js/import_export.js:108 msgid "Encoding" msgstr "Encodage" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:380 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:377 msgid "Character type" msgstr "Type caractère" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:385 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:382 #: pgadmin/browser/server_groups/servers/roles/static/js/role.js:413 msgid "Connection limit" msgstr "Limite de connexion" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:388 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:385 msgid "Template?" msgstr "Modèle ?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:392 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:389 msgid "Allow connections?" msgstr "Autoriser les connexions ?" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:417 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:414 msgid "Default Privileges" msgstr "Droits par défaut" -#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:499 +#: pgadmin/browser/server_groups/servers/databases/static/js/database.js:496 msgid "Connect to database" msgstr "Connecter la base de donnée" @@ -5894,8 +5725,7 @@ msgstr "Échec de la mise à jour de la tâche planifiée." #: pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py:504 #: pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py:612 msgid "-- No SQL could be generated for the selected object." -msgstr "" -"-- Il n'est pas possible de générer un code SQL pour l'objet sélectionné." +msgstr "-- Il n'est pas possible de générer un code SQL pour l'objet sélectionné." #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:34 msgid "Sunday" @@ -6444,28 +6274,8 @@ msgid "Repeat" msgstr "Répéter" #: pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js:359 -msgid "" -"Schedules are specified using a cron-style format.