From bcb8cba14d4f8f335332c268b8efad5fdad522ff Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 5 Sep 2022 10:57:59 +0200
Subject: [PATCH] refactor schemas package
---
dev_scripts/__init__.py | 0
{utils => dev_scripts}/convert_alta_to_adex_cache.py | 11 ++++++++---
requirements.txt | 1 -
schemas/__init__.py | 0
{utils => schemas}/sql_scripts.py | 4 ++--
5 files changed, 10 insertions(+), 6 deletions(-)
create mode 100644 dev_scripts/__init__.py
rename {utils => dev_scripts}/convert_alta_to_adex_cache.py (89%)
create mode 100644 schemas/__init__.py
rename {utils => schemas}/sql_scripts.py (94%)
diff --git a/dev_scripts/__init__.py b/dev_scripts/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/utils/convert_alta_to_adex_cache.py b/dev_scripts/convert_alta_to_adex_cache.py
similarity index 89%
rename from utils/convert_alta_to_adex_cache.py
rename to dev_scripts/convert_alta_to_adex_cache.py
index 4fcd49b..eaf709a 100644
--- a/utils/convert_alta_to_adex_cache.py
+++ b/dev_scripts/convert_alta_to_adex_cache.py
@@ -4,7 +4,8 @@
import psycopg2
from psycopg2 import Error
import argparse
-from utils.sql_scripts import select_from_alta, insert_into_skyview
+
+from schemas import sql_scripts
def parse_database_url(url):
# parse database url like: postgres:postgres@localhost/altadb_1sept2022:5432
@@ -47,16 +48,20 @@ def do_convert(source, target):
)
source_cursor = source_connection.cursor()
- source_cursor.execute(select_from_alta)
+ source_cursor.execute(sql_scripts.select_from_alta)
target_cursor = target_connection.cursor()
+
+ print('fetching records from ALTA...')
rows = source_cursor.fetchall()
+ count = len(rows)
+ print(str(count) + ' records fetched')
for row in rows:
print(row)
access_url,ra,dec,dt,dst,observation = row
record_to_insert = (observation, observation, ra, dec, "alta",0, dt,dst, access_url)
- target_cursor.execute(insert_into_skyview,record_to_insert)
+ target_cursor.execute(sql_scripts.insert_into_skyviews,record_to_insert)
target_connection.commit()
except Error as e:
diff --git a/requirements.txt b/requirements.txt
index 0722f0f..b1201c4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,6 @@ colorama==0.4.5
databases==0.6.1
fastapi==0.79.0
greenlet==1.1.2
-gunicorn==20.1.0
h11==0.13.0
idna==3.3
pydantic==1.9.2
diff --git a/schemas/__init__.py b/schemas/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/utils/sql_scripts.py b/schemas/sql_scripts.py
similarity index 94%
rename from utils/sql_scripts.py
rename to schemas/sql_scripts.py
index ef4ee16..1e553c1 100644
--- a/utils/sql_scripts.py
+++ b/schemas/sql_scripts.py
@@ -6,7 +6,7 @@ CREATE DATABASE adex_cache
CONNECTION LIMIT = -1;
"""
-create_table = """
+create_table_skyviews = """
CREATE TABLE public.skyviews
(
"id" SERIAL,
@@ -24,7 +24,7 @@ CREATE TABLE public.skyviews
"""
-insert_into_skyview = """
+insert_into_skyviews = """
INSERT INTO public.skyviews
(
title,
--
GitLab