From e1853664989e19cdb4f414abed0045b426145063 Mon Sep 17 00:00:00 2001 From: Minh-Hoang DANG Date: Sat, 1 Dec 2018 23:12:16 +0100 Subject: [PATCH 1/6] Update for the last commit - When the exception is thrown, the database rollbacks to the previous state, but no longer block users from executing the next queries. - If user performs queries other than SELECT, the transaction will be committed if no error thrown. --- postgres_kernel/kernel.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/postgres_kernel/kernel.py b/postgres_kernel/kernel.py index 916a46f..c4cd98e 100644 --- a/postgres_kernel/kernel.py +++ b/postgres_kernel/kernel.py @@ -176,15 +176,16 @@ def do_execute(self, code, silent, store_history=True, self.send_response(self.iopub_socket, 'stream', {'name': 'stderr', 'text': str(e)}) self._conn.rollback() - return {'status': 'error', 'execution_count': self.execution_count, - 'ename': 'ProgrammingError', 'evalue': str(e), - 'traceback': []} + return {'status': 'abort', 'execution_count': self.execution_count} + else: - self.send_response( - self.iopub_socket, 'stream', { - 'name': 'stdout', - 'text': str(len(rows)) + " row(s) returned.\n" - }) + + if(rows != None): + self.send_response( + self.iopub_socket, 'stream', { + 'name': 'stdout', + 'text': str(len(rows)) + " row(s) returned.\n" + }) for notice in self._conn.notices: self.send_response( @@ -197,6 +198,8 @@ def do_execute(self, code, silent, store_history=True, if header is not None and len(rows) > 0: self.send_response(self.iopub_socket, 'display_data', display_data(header, rows)) + self._conn.commit() + return {'status': 'ok', 'execution_count': self.execution_count, 'payload': [], 'user_expressions': {}} From d064eb25e3f4556968598a4cc0b9c29c1aa55f9a Mon Sep 17 00:00:00 2001 From: Minh-Hoang DANG Date: Wed, 5 Dec 2018 00:04:31 +0100 Subject: [PATCH 2/6] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9511185..e3390f8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # A simple Jupyter kernel for PostgreSQL -Install with `pip install postgres_kernel` +Install the official version with `pip install postgres_kernel` +Install from git repo (experimental) with: `pip install git+https://github.com/mhoangvslev/postgres_kernel/` To use, run one of: From ed05cf7b460a4b4b4473b2006647f19c5e107396 Mon Sep 17 00:00:00 2001 From: Minh-Hoang DANG Date: Wed, 5 Dec 2018 00:04:56 +0100 Subject: [PATCH 3/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e3390f8..4b8cd26 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # A simple Jupyter kernel for PostgreSQL Install the official version with `pip install postgres_kernel` + Install from git repo (experimental) with: `pip install git+https://github.com/mhoangvslev/postgres_kernel/` To use, run one of: From ad94425d29415eb75c1b0e7e9852b4c2574914a8 Mon Sep 17 00:00:00 2001 From: Minh-Hoang DANG Date: Thu, 27 Dec 2018 12:25:44 +0100 Subject: [PATCH 4/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4b8cd26..5fa108e 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,8 @@ This is heavily based on [takluyver/bash_kernel](https://github.com/takluyver/ba ![](images/notebook.png) +## Demonstration: +- [LoiretPhotographsArchive](https://github.com/mhoangvslev/PhotographiesArchiveSQL) Related ------- From 82585c0e89d5712c8b0c75872f2ace9f17e41285 Mon Sep 17 00:00:00 2001 From: Minh-Hoang DANG Date: Sat, 29 Dec 2018 16:06:09 +0100 Subject: [PATCH 5/6] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5fa108e..3fce534 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,8 @@ This is heavily based on [takluyver/bash_kernel](https://github.com/takluyver/ba ![](images/notebook.png) ## Demonstration: -- [LoiretPhotographsArchive](https://github.com/mhoangvslev/PhotographiesArchiveSQL) +- [Loiret Photographs Archive](https://github.com/mhoangvslev/PhotographiesArchiveSQL) +- [PostgreSQL Basics](https://github.com/mhoangvslev/JupyterPostgreSQLBasics) Related ------- From 8b6e6d1b3d906861c77c1e5cdb4a4f8854ee1721 Mon Sep 17 00:00:00 2001 From: Minh-Hoang DANG Date: Mon, 31 Dec 2018 17:53:18 +0100 Subject: [PATCH 6/6] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 3fce534..1f29230 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,9 @@ This is heavily based on [takluyver/bash_kernel](https://github.com/takluyver/ba - [Loiret Photographs Archive](https://github.com/mhoangvslev/PhotographiesArchiveSQL) - [PostgreSQL Basics](https://github.com/mhoangvslev/JupyterPostgreSQLBasics) +## Progress: +[![Waffle.io - Issues in progress](https://badge.waffle.io/mhoangvslev/postgres_kernel.png?label=in%20progress&title=In%20Progress)](http://waffle.io/mhoangvslev/postgres_kernel) + Related -------