From 39132595ad0e67d0275c249d421c21857fbb2712 Mon Sep 17 00:00:00 2001 From: mahmoud Date: Wed, 6 Jul 2022 11:35:13 +0100 Subject: [PATCH 1/4] update sqlalchemy url (#211) --- docs/source/jupyter/multiple_wrappers.ipynb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/source/jupyter/multiple_wrappers.ipynb b/docs/source/jupyter/multiple_wrappers.ipynb index 40ae201..30bbcec 100644 --- a/docs/source/jupyter/multiple_wrappers.ipynb +++ b/docs/source/jupyter/multiple_wrappers.ipynb @@ -151,13 +151,14 @@ } ], "source": [ + "from sqlalchemy.engine import URL", "print(\"Input data to connect to Postgres table!\")\n", "user = input(\"User: \")\n", "pwd = getpass(\"Password: \")\n", "db_name = input(\"Database name: \")\n", "host = input(\"Host: \")\n", "port = int(input(\"Port [5432]: \") or 5432)\n", - "postgres_url = 'postgres://%s:%s@%s:%s/%s' % (user, pwd, host, port, db_name)" + "postgres_url = URL.create(\"postgresql\", user, pwd, host=host, database=db_name)" ] }, { @@ -356,4 +357,4 @@ "metadata": {}, "nbformat": 4, "nbformat_minor": 2 -} \ No newline at end of file +} From d0f2d4292c817244e24dabb15440ce315a366a6e Mon Sep 17 00:00:00 2001 From: mahmoud Date: Wed, 6 Jul 2022 12:23:03 +0100 Subject: [PATCH 2/4] convert URL to str (#211) --- docs/source/jupyter/multiple_wrappers.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/jupyter/multiple_wrappers.ipynb b/docs/source/jupyter/multiple_wrappers.ipynb index 30bbcec..f30eddd 100644 --- a/docs/source/jupyter/multiple_wrappers.ipynb +++ b/docs/source/jupyter/multiple_wrappers.ipynb @@ -264,7 +264,7 @@ "metadata": {}, "outputs": [], "source": [ - "with SqlAlchemySession(postgres_url) as session:\n", + "with SqlAlchemySession(str(postgres_url)) as session:\n", " wrapper = city.CityWrapper(session=session)\n", " wrapper.add(emmo_town)\n", " session.commit()" From ea959c18eb2c6fe94643eae037b35c8d6c7e2adb Mon Sep 17 00:00:00 2001 From: mahmoud Date: Wed, 6 Jul 2022 12:31:04 +0100 Subject: [PATCH 3/4] move url-to-str to url creation (#211) --- docs/source/jupyter/multiple_wrappers.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/jupyter/multiple_wrappers.ipynb b/docs/source/jupyter/multiple_wrappers.ipynb index f30eddd..c587e4b 100644 --- a/docs/source/jupyter/multiple_wrappers.ipynb +++ b/docs/source/jupyter/multiple_wrappers.ipynb @@ -158,7 +158,7 @@ "db_name = input(\"Database name: \")\n", "host = input(\"Host: \")\n", "port = int(input(\"Port [5432]: \") or 5432)\n", - "postgres_url = URL.create(\"postgresql\", user, pwd, host=host, database=db_name)" + "postgres_url = str(URL.create(\"postgresql\", user, pwd, host=host, database=db_name))" ] }, { @@ -264,7 +264,7 @@ "metadata": {}, "outputs": [], "source": [ - "with SqlAlchemySession(str(postgres_url)) as session:\n", + "with SqlAlchemySession(postgres_url) as session:\n", " wrapper = city.CityWrapper(session=session)\n", " wrapper.add(emmo_town)\n", " session.commit()" From a62043dd132f822b42fd51d9237a4a9469311354 Mon Sep 17 00:00:00 2001 From: mahmoud Date: Wed, 6 Jul 2022 12:34:56 +0100 Subject: [PATCH 4/4] add port attribute to url (#211) --- docs/source/jupyter/multiple_wrappers.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/jupyter/multiple_wrappers.ipynb b/docs/source/jupyter/multiple_wrappers.ipynb index c587e4b..5d094cd 100644 --- a/docs/source/jupyter/multiple_wrappers.ipynb +++ b/docs/source/jupyter/multiple_wrappers.ipynb @@ -158,7 +158,7 @@ "db_name = input(\"Database name: \")\n", "host = input(\"Host: \")\n", "port = int(input(\"Port [5432]: \") or 5432)\n", - "postgres_url = str(URL.create(\"postgresql\", user, pwd, host=host, database=db_name))" + "postgres_url = str(URL.create(\"postgresql\", user, pwd, host=host, port=port, database=db_name))" ] }, {