public inbox for [email protected]  
help / color / mirror / Atom feed
RE-SQL tests patch for FTS parsers node
4+ messages / 3 participants
[nested] [flat]

* RE-SQL tests patch for FTS parsers node
@ 2019-07-15 10:42  Shubham Agarwal <[email protected]>
  0 siblings, 1 reply; 4+ messages in thread

From: Shubham Agarwal @ 2019-07-15 10:42 UTC (permalink / raw)
  To: pgadmin-hackers

Hi Team,

PFA patch for RE-SQL tests cases for FTS parsers node.

-- 
Thanks & Regards,
Shubham Agarwal
EnterpriseDB Corporation

The Postgres Database Company


Attachments:

  [application/octet-stream] resql_fts_parser.patch (4.3K, 3-resql_fts_parser.patch)
  download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser.sql
new file mode 100644
index 00000000..a2527802
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser.sql
@@ -0,0 +1,13 @@
+-- Text Search Parser: public."test_fts_parser_updated_$%{}[]()&*^!@""'`\/#"
+
+-- DROP TEXT SEARCH PARSER public."test_fts_parser_updated_$%{}[]()&*^!@""'`\/#"
+
+CREATE TEXT SEARCH PARSER public."test_fts_parser_updated_$%{}[]()&*^!@""'`\/#" (
+    START = prsd_start,
+    GETTOKEN = prsd_nexttoken,
+    END = void_recv,
+    LEXTYPES = dispell_init,
+    HEADLINE = prsd_headline
+);
+
+COMMENT ON TEXT SEARCH PARSER public."test_fts_parser_updated_$%{}[]()&*^!@""'`\/#" IS 'Updating test fts parser';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser.sql
new file mode 100644
index 00000000..47c6f6e9
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser.sql
@@ -0,0 +1,13 @@
+-- Text Search Parser: public."test_fts_parser_$%{}[]()&*^!@""'`\/#"
+
+-- DROP TEXT SEARCH PARSER public."test_fts_parser_$%{}[]()&*^!@""'`\/#"
+
+CREATE TEXT SEARCH PARSER public."test_fts_parser_$%{}[]()&*^!@""'`\/#" (
+    START = prsd_start,
+    GETTOKEN = prsd_nexttoken,
+    END = void_recv,
+    LEXTYPES = dispell_init,
+    HEADLINE = prsd_headline
+);
+
+COMMENT ON TEXT SEARCH PARSER public."test_fts_parser_$%{}[]()&*^!@""'`\/#" IS 'Creating test fts parser';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/test.json
new file mode 100644
index 00000000..4cce6846
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/test.json
@@ -0,0 +1,40 @@
+{
+  "scenarios": [
+    {
+      "type": "create",
+      "name": "Create FTS parser",
+      "endpoint": "NODE-fts_parser.obj",
+      "sql_endpoint": "NODE-fts_parser.sql_id",
+      "data": {
+        "name": "test_fts_parser_$%{}[]()&*^!@\"'`\\/#",
+        "description": "Creating test fts parser",
+        "schema": "public",
+        "schema_id": "<SCHEMA_ID>",
+        "prsstart": "prsd_start",
+        "prstoken": "prsd_nexttoken",
+        "prsend": "void_recv",
+        "prslextype": "dispell_init",
+        "prsheadline": "prsd_headline"
+      },
+      "expected_sql_file": "create_fts_parser.sql"
+    },
+    {
+      "type": "alter",
+      "name": "Alter FTS parser",
+      "endpoint": "NODE-fts_parser.obj_id",
+      "sql_endpoint": "NODE-fts_parser.sql_id",
+      "data":{
+        "name": "test_fts_parser_updated_$%{}[]()&*^!@\"'`\\/#",
+        "description":"Updating test fts parser"},
+      "expected_sql_file": "alter_fts_parser.sql"
+    },
+    {
+      "type": "delete",
+      "name": "Drop FTS Parser",
+      "endpoint": "NODE-fts_parser.delete_id",
+      "data": {
+        "name": "test_fts_configuration_def2"
+      }
+    }
+  ]
+}
diff --git a/web/regression/re_sql/tests/test_resql.py b/web/regression/re_sql/tests/test_resql.py
index 6b87f030..e3490598 100644
--- a/web/regression/re_sql/tests/test_resql.py
+++ b/web/regression/re_sql/tests/test_resql.py
@@ -329,9 +329,15 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator):
             self.final_test_status = False
             print(scenario['name'] + "... FAIL")
             traceback.print_exc()
-
-        resp = json.loads(response.data)
-        resp_sql = resp['data']
+        try:
+            if type(response.data) == bytes:
+                response_data = response.data.decode('utf8')
+                resp = json.loads(response_data)
+            else:
+                resp = json.loads(response.data)
+            resp_sql = resp['data']
+        except Exception:
+            print("Unable to decode the reponse data from url: ", url)
 
         # Remove first and last double quotes
         if resp_sql.startswith('"') and resp_sql.endswith('"'):


^ permalink  raw  reply  [nested|flat] 4+ messages in thread

* Re: RE-SQL tests patch for FTS parsers node
@ 2019-07-15 11:02  Dave Page <[email protected]>
  parent: Shubham Agarwal <[email protected]>
  0 siblings, 1 reply; 4+ messages in thread

From: Dave Page @ 2019-07-15 11:02 UTC (permalink / raw)
  To: Shubham Agarwal <[email protected]>; +Cc: pgadmin-hackers

Thanks, applied.

On Mon, Jul 15, 2019 at 11:42 AM Shubham Agarwal <
[email protected]> wrote:

> Hi Team,
>
> PFA patch for RE-SQL tests cases for FTS parsers node.
>
> --
> Thanks & Regards,
> Shubham Agarwal
> EnterpriseDB Corporation
>
> The Postgres Database Company
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


^ permalink  raw  reply  [nested|flat] 4+ messages in thread

* Re: RE-SQL tests patch for FTS parsers node
@ 2019-09-02 12:00  Shubham Agarwal <[email protected]>
  parent: Dave Page <[email protected]>
  0 siblings, 1 reply; 4+ messages in thread

From: Shubham Agarwal @ 2019-09-02 12:00 UTC (permalink / raw)
  To: pgadmin-hackers

Hi Team,
PFA patch for  M-SQL test cases for FTS parsers.

Thanks & Regards,
Shubham Agarwal

On Mon, Jul 15, 2019 at 4:33 PM Dave Page <[email protected]> wrote:

> Thanks, applied.
>
> On Mon, Jul 15, 2019 at 11:42 AM Shubham Agarwal <
> [email protected]> wrote:
>
>> Hi Team,
>>
>> PFA patch for RE-SQL tests cases for FTS parsers node.
>>
>> --
>> Thanks & Regards,
>> Shubham Agarwal
>> EnterpriseDB Corporation
>>
>> The Postgres Database Company
>>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>


-- 
Thanks & Regards,
Shubham Agarwal
EnterpriseDB Corporation

The Postgres Database Company


Attachments:

  [application/octet-stream] fts_parser_msql.patch (3.0K, 3-fts_parser_msql.patch)
  download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser_msql.sql
new file mode 100644
index 000000000..28dc5a225
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser_msql.sql
@@ -0,0 +1,5 @@
+ALTER TEXT SEARCH PARSER public."test_fts_parser_$%{}[]()&*^!@""'`\/#"
+    RENAME TO "test_fts_parser_updated_$%{}[]()&*^!@""'`\/#";
+
+COMMENT ON TEXT SEARCH PARSER public."test_fts_parser_updated_$%{}[]()&*^!@""'`\/#"
+    IS 'Updating test fts parser';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser_msql.sql
new file mode 100644
index 000000000..292d71d76
--- /dev/null
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser_msql.sql
@@ -0,0 +1,9 @@
+CREATE TEXT SEARCH PARSER public."test_fts_parser_$%{}[]()&*^!@""'`\/#" (
+    START = prsd_start,
+    GETTOKEN = prsd_nexttoken,
+    END = void_recv,
+    LEXTYPES = dispell_init,
+    HEADLINE = prsd_headline);
+
+COMMENT ON TEXT SEARCH PARSER public."test_fts_parser_$%{}[]()&*^!@""'`\/#"
+      IS 'Creating test fts parser';
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/test.json
index d4de910de..fd8be86c6 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/test.json
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/test.json
@@ -5,6 +5,7 @@
       "name": "Create FTS parser",
       "endpoint": "NODE-fts_parser.obj",
       "sql_endpoint": "NODE-fts_parser.sql_id",
+      "msql_endpoint": "NODE-fts_parser.msql",
       "data": {
         "name": "test_fts_parser_$%{}[]()&*^!@\"'`\\/#",
         "description": "Creating test fts parser",
@@ -16,17 +17,20 @@
         "prslextype": "dispell_init",
         "prsheadline": "prsd_headline"
       },
-      "expected_sql_file": "create_fts_parser.sql"
+      "expected_sql_file": "create_fts_parser.sql",
+      "expected_msql_file": "create_fts_parser_msql.sql"
     },
     {
       "type": "alter",
       "name": "Alter FTS parser",
       "endpoint": "NODE-fts_parser.obj_id",
       "sql_endpoint": "NODE-fts_parser.sql_id",
+      "msql_endpoint": "NODE-fts_parser.msql_id",
       "data":{
         "name": "test_fts_parser_updated_$%{}[]()&*^!@\"'`\\/#",
         "description":"Updating test fts parser"},
-      "expected_sql_file": "alter_fts_parser.sql"
+      "expected_sql_file": "alter_fts_parser.sql",
+      "expected_msql_file": "alter_fts_parser_msql.sql"
     },
     {
       "type": "delete",


^ permalink  raw  reply  [nested|flat] 4+ messages in thread

* Re: RE-SQL tests patch for FTS parsers node
@ 2019-09-03 05:00  Akshay Joshi <[email protected]>
  parent: Shubham Agarwal <[email protected]>
  0 siblings, 0 replies; 4+ messages in thread

From: Akshay Joshi @ 2019-09-03 05:00 UTC (permalink / raw)
  To: Shubham Agarwal <[email protected]>; +Cc: pgadmin-hackers

Thanks patch applied.

On Mon, Sep 2, 2019 at 6:35 PM Shubham Agarwal <
[email protected]> wrote:

> Hi Team,
> PFA patch for  M-SQL test cases for FTS parsers.
>
> Thanks & Regards,
> Shubham Agarwal
>
> On Mon, Jul 15, 2019 at 4:33 PM Dave Page <[email protected]> wrote:
>
>> Thanks, applied.
>>
>> On Mon, Jul 15, 2019 at 11:42 AM Shubham Agarwal <
>> [email protected]> wrote:
>>
>>> Hi Team,
>>>
>>> PFA patch for RE-SQL tests cases for FTS parsers node.
>>>
>>> --
>>> Thanks & Regards,
>>> Shubham Agarwal
>>> EnterpriseDB Corporation
>>>
>>> The Postgres Database Company
>>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>
> --
> Thanks & Regards,
> Shubham Agarwal
> EnterpriseDB Corporation
>
> The Postgres Database Company
>


-- 
*Thanks & Regards*
*Akshay Joshi*

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


^ permalink  raw  reply  [nested|flat] 4+ messages in thread


end of thread, other threads:[~2019-09-03 05:00 UTC | newest]

Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2019-07-15 10:42 RE-SQL tests patch for FTS parsers node Shubham Agarwal <[email protected]>
2019-07-15 11:02 ` Dave Page <[email protected]>
2019-09-02 12:00   ` Shubham Agarwal <[email protected]>
2019-09-03 05:00     ` Akshay Joshi <[email protected]>

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox