pgAdmin 4 commit: Ensure compound triggers for event should be updated

2019-08-17 Thread Akshay Joshi
Ensure compound triggers for event should be updated properly. Fixes #4635

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=24f9f65b1ba36e6bb0fddef6bde9cdf9f917b366

Modified Files
--
docs/en_US/release_notes_4_12.rst  | 3 ++-
.../tables/templates/compound_triggers/sql/ppas/12_plus/update.sql | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)



Japanese translation (September 2019)

2019-08-17 Thread fn ln
Hello.
Updated translation for upcoming version 4.12 is in attachment.
messages.pot was taken from git 177def1e.


pgadmin4-ja-sep2019.7z
Description: Binary data


pgAdmin 4 commit: Update Japanese translation.

2019-08-17 Thread Akshay Joshi
Update Japanese translation.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=659d0b84361af8f06a5f50565aea6ecd9c8adcf1
Author: Identifier Anonymous 

Modified Files
--
.../translations/ja/LC_MESSAGES/messages.mo| Bin 170370 -> 170992 bytes
.../translations/ja/LC_MESSAGES/messages.po| 117 +
2 files changed, 73 insertions(+), 44 deletions(-)



Re: Japanese translation (September 2019)

2019-08-17 Thread Akshay Joshi
Thanks patch applied.

On Sat, Aug 17, 2019 at 4:07 PM fn ln  wrote:

> Hello.
> Updated translation for upcoming version 4.12 is in attachment.
> messages.pot was taken from git 177def1e.
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


Transaction Status Python Tests

2019-08-17 Thread Yosry Muhammad
Hi Hackers,

Please find attached a patch including new python test that checks the
transaction status after executing queries and saving data when auto-commit
is on/off. It also includes some refactoring of previously written python
tests.

Please review !
Thanks. Regards.

-- 
*Yosry Muhammad Yosry*

Computer Engineering student,
The Faculty of Engineering,
Cairo University (2021).
Class representative of CMP 2021.
https://www.linkedin.com/in/yosrym93/
diff --git a/web/pgadmin/tools/sqleditor/tests/execute_query_utils.py b/web/pgadmin/tools/sqleditor/tests/execute_query_test_utils.py
similarity index 100%
rename from web/pgadmin/tools/sqleditor/tests/execute_query_utils.py
rename to web/pgadmin/tools/sqleditor/tests/execute_query_test_utils.py
diff --git a/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py
new file mode 100644
index 0..b18dcdc62
--- /dev/null
+++ b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py
@@ -0,0 +1,336 @@
+##
+#
+# pgAdmin 4 - PostgreSQL Tools
+#
+# Copyright (C) 2013 - 2019, The pgAdmin Development Team
+# This software is released under the PostgreSQL Licence
+#
+##
+
+import json
+import random
+
+from pgadmin.browser.server_groups.servers.databases.tests import utils as \
+database_utils
+from pgadmin.utils.route import BaseTestGenerator
+from regression import parent_node_dict
+from regression.python_test_utils import test_utils as utils
+from pgadmin.tools.sqleditor.tests.execute_query_test_utils import execute_query
+
+from pgadmin.tools.sqleditor.utils.constant_definition \
+import TX_STATUS_IDLE, TX_STATUS_INTRANS
+
+
+class TestTransactionControl(BaseTestGenerator):
+""" This class will test the transaction status after various operations """
+scenarios = [
+('When auto-commit is enabled, and save is successful', dict(
+is_auto_commit_enabled=True,
+transaction_status=TX_STATUS_IDLE,
+save_payload={
+"updated": {},
+"added": {
+"2": {
+"err": False,
+"data": {
+"pk_col": "3",
+"__temp_PK": "2",
+"normal_col": "three"
+}
+}
+},
+"staged_rows": {},
+"deleted": {},
+"updated_index": {},
+"added_index": {"2": "2"},
+"columns": [
+{
+"name": "pk_col",
+"display_name": "pk_col",
+"column_type": "[PK] integer",
+"column_type_internal": "integer",
+"pos": 0,
+"label": "pk_col[PK] integer",
+"cell": "number",
+"can_edit": True,
+"type": "integer",
+"not_null": True,
+"has_default_val": False,
+"is_array": False},
+{"name": "normal_col",
+ "display_name": "normal_col",
+ "column_type": "character varying",
+ "column_type_internal": "character varying",
+ "pos": 1,
+ "label": "normal_colcharacter varying",
+ "cell": "string",
+ "can_edit": True,
+ "type": "character varying",
+ "not_null": False,
+ "has_default_val": False,
+ "is_array": False}
+]
+}
+)),
+('When auto-commit is disabled and save is successful', dict(
+is_auto_commit_enabled=False,
+transaction_status=TX_STATUS_INTRANS,
+save_payload={
+"updated": {},
+"added": {
+"2": {
+"err": False,
+"data": {
+"pk_col": "3",
+"__temp_PK": "2",
+"normal_col": "three"
+}
+}
+},
+"staged_rows": {},
+"deleted": {},
+"updated_index": {},
+"added_index": {"2": "2"},
+"columns": [
+{
+"name": "pk_col",
+"display_name": "pk_col",
+"column_type": "[PK] integer",
+"column_type_internal": "integer",
+"pos": 0,
+"label": "pk_col[PK] in