diff --git a/fda-units-service/requirements.txt b/fda-units-service/requirements.txt index f02b36dbab54b8a979ba54f0f743ef52ea0ea952..e714c83cacf434ac0848cdb6ee8406fe1a568045 100644 --- a/fda-units-service/requirements.txt +++ b/fda-units-service/requirements.txt @@ -4,3 +4,4 @@ py-eureka-client==0.9.1 docker==5.0.0 gevent==21.8.0 rdflib==6.0.2 +psycopg2-binary==2.8.6 diff --git a/fda-units-service/save.py b/fda-units-service/save.py index bf3193783157232779a8be61a82111e31bd4eac1..a3d90249d058c34892572abd592203fc082a21cb 100644 --- a/fda-units-service/save.py +++ b/fda-units-service/save.py @@ -1,6 +1,5 @@ from psycopg2 import connect import psycopg2.extras -import requests import json def insert_mdb_concepts(uri, c_name): @@ -16,11 +15,7 @@ def insert_mdb_concepts(uri, c_name): cursor = conn.cursor() # Insert tblnames into table mdb_TABLES - cursor.execute("PREPARE stmt AS INSERT INTO mdb_concepts (URI,name,created) VALUES ($1,$2,current_timestamp) ON CONFLICT (URI) DO NOTHING") - psycopg2.extras.execute_batch(cursor, - """EXECUTE stmt (%s,%s)""" - , (uri,c_name)) - cursor.execute("DEALLOCATE stmt") + cursor.execute("INSERT INTO mdb_concepts (URI,name,created) VALUES (%s,%s,current_timestamp) ON CONFLICT (URI) DO NOTHING", (uri,c_name)) r = cursor.statusmessage conn.commit() conn.close() @@ -40,12 +35,8 @@ def insert_mdb_columns_concepts(cdbid,tid, cid, uri): cursor = conn.cursor() - # Insert tblnames into table mdb_TABLES - cursor.execute("PREPARE stmt AS INSERT INTO mdb_columns_concepts (cDBID,tID, cID,URI,created) VALUES ($1,$2,$3,$4,current_timestamp) ON CONFLICT (cDBID, tID, cID, URI) DO NOTHING") - psycopg2.extras.execute_batch(cursor, - """EXECUTE stmt (%s,%s,%s,%s)""" - , (cdbid,tid,cid,uri)) - cursor.execute("DEALLOCATE stmt") + # Insert tblnames into table mdb_TABLES + cursor.execute("INSERT INTO mdb_columns_concepts (cDBID,tID, cID,URI,created) VALUES (%s,%s,%s,%s,current_timestamp) ON CONFLICT (cDBID, tID, cID, URI) DO NOTHING", (cdbid,tid,cid,uri)) r = cursor.statusmessage conn.commit() conn.close() diff --git a/fda-units-service/us-yml/saveconcept.yml b/fda-units-service/us-yml/saveconcept.yml index 3d3aabadd4d84e83ce6b3ae29c5c06745637ff96..22144651f10048e2c2b8b440ce888735764f19ea 100644 --- a/fda-units-service/us-yml/saveconcept.yml +++ b/fda-units-service/us-yml/saveconcept.yml @@ -15,7 +15,7 @@ parameters: uri: type: "string" example: "http://www.ontology-of-units-of-measure.org/resource/om-2/metre" - conceptname: + name: type: "string" example: "metre" responses: