Hi Akshay,
Please find the updated patch below for your reference. I have added an
extra check for verifying the database rename.
Sorry for the inconvenience caused.
On Tue, Jun 1, 2021 at 8:50 PM Akshay Joshi <akshay.jo...@enterprisedb.com>
wrote:
> Thanks, the patch applied.
>
> On Sun, May 30, 2021 at 12:03 AM Rahul Shirsat <
> rahul.shir...@enterprisedb.com> wrote:
>
>> Hi Akshay,
>>
>> On Thu, May 27, 2021 at 12:19 PM Akshay Joshi <
>> akshay.jo...@enterprisedb.com> wrote:
>>
>>> Hi Rahul
>>>
>>> Following are the review comments:
>>>
>>> - Why you have changed the order of the toolbar button on the
>>> browser tree? It should not.
>>>
>>> Changes were related to the wcDocker issue showing
>> reverse order buttons, so had to change in the pgAdmin app to reflect it
>> correctly.
>>
>>>
>>> - *sqleditor.js (check_db_name_change function)*
>>> - var declaration should be comma-separated instead of writing var,
>>> again and again.
>>>
>>> Done.
>>
>>>
>>> - Add proper comments.
>>>
>>> This too is taken care of.
>>
>>>
>>> - Remove dots from the string "Database moved/renamed.."
>>>
>>> Done.
>>
>>>
>>> - "Please note that the database you are working on has been moved
>>> or renamed to ${data.actual_db_name}. Refresh databases in browser
>>> panel or
>>> click OK to continue.." should be changed to "Current database has
>>> been
>>> moved or renamed to ${data.actual_db_name}. Click on the OK button to
>>> refresh the database name."
>>>
>>> Done.
>> Also have done some code refactoring.
>>
>>>
>>>
>>> On Wed, May 26, 2021 at 2:07 PM Rahul Shirsat <
>>> rahul.shir...@enterprisedb.com> wrote:
>>>
>>>> Hi Hackers,
>>>>
>>>> Please find the attached patch which resolves the issue of renaming the
>>>> database by another user.
>>>>
>>>> A minor issue of navigation button alignment is also fixed in this
>>>> patch.
>>>>
>>>> --
>>>> *Rahul Shirsat*
>>>> Senior Software Engineer | EnterpriseDB Corporation.
>>>>
>>>
>>>
>>> --
>>> *Thanks & Regards*
>>> *Akshay Joshi*
>>> *pgAdmin Hacker | Principal Software Architect*
>>> *EDB Postgres <http://edbpostgres.com>*
>>>
>>> *Mobile: +91 976-788-8246*
>>>
>>
>>
>> --
>> *Rahul Shirsat*
>> Senior Software Engineer | EnterpriseDB Corporation.
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
> *pgAdmin Hacker | Principal Software Architect*
> *EDB Postgres <http://edbpostgres.com>*
>
> *Mobile: +91 976-788-8246*
>
--
*Rahul Shirsat*
Senior Software Engineer | EnterpriseDB Corporation.
diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py
index 884cc8be0..780c0243f 100644
--- a/web/pgadmin/tools/sqleditor/__init__.py
+++ b/web/pgadmin/tools/sqleditor/__init__.py
@@ -505,6 +505,8 @@ def poll(trans_id):
transaction_status = conn.transaction_status()
data_obj['db_name'] = conn.db
+ data_obj['db_id'] = trans_obj.did \
+ if trans_obj is not None and hasattr(trans_obj, 'did') else 0
return make_json_response(
data={
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 33547223e..3e91f424a 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -5125,9 +5125,10 @@ define('tools.querytool', [
tree_data = pgWindow.default.pgAdmin.Browser.treeMenu.translateTreeNodeIdFromACITree(selected_item),
server_data = pgWindow.default.pgAdmin.Browser.treeMenu.findNode(tree_data.slice(0,2)),
database_data = pgWindow.default.pgAdmin.Browser.treeMenu.findNode(tree_data.slice(0,4)),
- db_name = database_data.data.label;
+ db_name = database_data.data.label,
+ db_did = database_data.data._id;
- if(!_.isEqual(db_name, data.data_obj.db_name)) {
+ if(data.data_obj.db_id == db_did && !_.isEqual(db_name, data.data_obj.db_name)) {
var message = `Current database has been moved or renamed to ${data.data_obj.db_name}. Click on the OK button to refresh the database name.`,
title = self.url_params.title;
