ucampostgresvro 0.1.2__py3-none-any.whl → 0.2.1__py3-none-any.whl

ucampostgresvro/__init__.py

@@ -1 +1 @@
-VERSION = "0.1.2"
+VERSION = "0.2.0"

ucampostgresvro/__main__.py

@@ -1,6 +1,7 @@
 import logging
 import sys
 
+# from datetime import datetime
 from ucampostgresvro import VERSION, utils
 from ucampostgresvro.DBA import DB
 from ucampostgresvro.exceptions import DbException
@@ -36,47 +37,76 @@ def main():
     if not utils.pre_setupconfig(db_params):
         raise DbException("ERROR: Tables are not created successfully")
 
-    # db.insert_vrauser("ll220", "len")
+    print(db.insert_vrauser("ll221", "leny"))
     # print(db.get_vrauser("ll220"))
+    # print(db.get_vrauser_primary_key("ll220"))
     # db.update_vrauser("ll220", "bda20", 'Ben Argyle')
     # print(db.get_vrauser())
     # db.remove_vrauser('bda20')
+    # print(db.get_vrauser_by_id(2))
     # print(db.get_vrauser())
 
     # db.insert_deployment_id("1231ee112ad11212")
+    # print(db.get_deployment_id("1231ee112ad11212"))
+    # print(db.get_deployment_id_primary_key("1231ee112ad11212"))
     # db.update_deployment_id("1231ee112ad11212", "1231a")
     # print(db.get_deployment_id("1231a"))
     # db.remove_deployment_id('1231a')
+    # print(db.get_deployment_id())
     # db.insert_deployment_id("123")
     # print(db.get_deployment_id())
+    # print(db.get_deployment_id_by_id(2))
+    # print(db.get_deployment_id_primary_key("123"))
 
-    # print(db.get_project())
-    # db.insert_project("0001",1,100.0)
     # db.insert_project("0101",2,100.0)
-    # db.update_project("0001", "0002", 1, 200)
-    # db.remove_project("0002")
-    # db.insert_project("0001",1,100.0)
-    # db.insert_project("0002",1,200.0)
-    # print(db.get_project("0002",1,200))
+    # db.insert_project("0001",2,100.0)
+    # print(db.get_project())
+    # db.update_project(2, "0002", 2, 200)
+    # print(db.get_project())
+    # db.remove_project(1)
+    # print(db.get_project())
+    # db.insert_project("2001",2,100.0)
+    # db.insert_project("2003",2,200.0)
+    # db.insert_project("2001",2,100.0)
+    # print(db.get_project("2001"))
+    # print(db.get_project_by_id(6))
+    # print(db.get_project_primary_key("2001"))
+    # print(db.get_project_primary_key("2001",  datetime(2025, 1, 22, 15, 55, 25, 95698)))
+    # print(db.get_project())
 
     # print(db.get_grant())
-    # db.insert_grant("0001",1,100.0)
-    # db.update_grant("0001", "0002", 1, 200)
+    # db.insert_grant("0001",2,100.0)
+    # print(db.get_grant())
+    # db.update_grant(2, "0002", 2, 200)
     # print(db.get_grant())
-    # db.remove_grant("0002")
+    # db.insert_grant("2001",2,100.0)
+    # db.insert_grant("2003",2,200.0)
+    # db.insert_grant("2001",2,100.0)
     # print(db.get_grant())
-    # db.insert_grant("0001",1,100.0)
-    # db.insert_grant("0002",1,200.0)
-    # print(db.get_grant("0002",1,200))
+    # print(db.get_grant())
+    # print(db.get_grant("2001"))
+    # print(db.get_grant_primary_key("2001"))
+    # print(db.get_grant_by_id(5))
+    # print(db.get_grant_primary_key("2001",
+    #                                datetime(2025, 1, 22, 18, 17, 25, 95698)
+    #                                )
+    #       )
+    # print(db.get_project())
+    # db.remove_grant(1)
 
+    # db.insert_costing(2, "Initial Resource", project_id=2, grant_id=None)
+    # db.insert_costing(2, "Initial Resource", project_id=None, grant_id=2)
     # print(db.get_costing())
-    # db.insert_costing(1, "Initial Resource", project_id=2, grant_id=None)
-    # db.insert_costing(1, "Initial Resource", project_id=None, grant_id=1)
-    # db.update_costing(1, "Duration Expansion", old_grant_id=None,
-    #                 old_project_id=2, grant_id=None, project_id=2)
     # print(db.get_costing())
+    # print(db.get_costing(2, "Initial Resource", 2)) # project
+    # print(db.get_costing(2, "Initial Resource", None, 2)) # Grant
+    # print(db.get_costing(3, "Duration Expansion", None, 2)) # Grant
+    # # print(db.get_costing_primary_key(2, "Initial Resource", 2)) # project
+    # print(db.get_costing_primary_key(2, "Initial Resource", None, 2)) #Grant
+    # db.update_costing(3, 2, "Duration Expansion", new_grant_id=None, new_project_id=2)
     # print(db.get_costing())
-    # db.remove_costing(1, "Duration Expansion", 4, None)
+    # print(db.get_costing_by_id(3))
+    # db.remove_costing(4)
     # print(db.get_costing())
 
     db.closedb()

ucampostgresvro/tests/dbconnect.py

@@ -2,9 +2,9 @@ import os
 
 
 db_params = {
-    "dbname": os.environ['POSTGRES_DB'],
-    "user": os.environ['POSTGRES_USER'],
-    "password": os.environ['POSTGRES_PASSWORD'],
-    "host": os.environ['POSTGRES_HOST'],
-    "port": os.environ['POSTGRES_PORT']
+    "dbname": os.environ["POSTGRES_DB"],
+    "user": os.environ["POSTGRES_USER"],
+    "password": os.environ["POSTGRES_PASSWORD"],
+    "host": os.environ["POSTGRES_HOST"],
+    "port": os.environ["POSTGRES_PORT"],
 }

ucampostgresvro/tests/test_DB.py

@@ -38,6 +38,14 @@ def test_user_fetchall(user_db_fixture):
     assert info[1][1] == "im532"
 
 
+def test_user_fetch_by_id(user_db_fixture):
+    db = user_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    db.insert_vrauser("im532", "Ishan", tables.get("user"))
+    info = db.get_vrauser_by_id(2, tables.get("user"))
+    assert info[1] == "im532"
+
+
 def test_user_fetch_one(user_db_fixture):
     db = user_db_fixture
     db.insert_vrauser("im530", "Ishan", tables.get("user"))
@@ -47,6 +55,14 @@ def test_user_fetch_one(user_db_fixture):
     assert info[0][1] == "im530"
 
 
+def test_user_fetch_primary_key_crsid(user_db_fixture):
+    db = user_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    db.insert_vrauser("im532", "Ishan", tables.get("user"))
+    info = db.get_vrauser_primary_key("im532", tables.get("user"))
+    assert info == 2
+
+
 def test_deployment_insertion(deploymentid_db_fixture):
     db = deploymentid_db_fixture
     result = db.insert_deployment_id("121212", tables.get("deploymentid"))
@@ -84,6 +100,14 @@ def test_deployment_fetchall(deploymentid_db_fixture):
     assert info[1][1] == "1256"
 
 
+def test_deployment_fetch_by_id(deploymentid_db_fixture):
+    db = deploymentid_db_fixture
+    db.insert_deployment_id("1212", tables.get("deploymentid"))
+    db.insert_deployment_id("1256", tables.get("deploymentid"))
+    info = db.get_deployment_id_by_id(2, tables.get("deploymentid"))
+    assert info[1] == "1256"
+
+
 def test_deployment_fetch_one(deploymentid_db_fixture):
     db = deploymentid_db_fixture
     db.insert_deployment_id("1212", tables.get("deploymentid"))
@@ -93,6 +117,14 @@ def test_deployment_fetch_one(deploymentid_db_fixture):
     assert info[0][1] == "1256"
 
 
+def test_deployment_fetch_primary_key_deployment(deploymentid_db_fixture):
+    db = deploymentid_db_fixture
+    db.insert_deployment_id("1212", tables.get("deploymentid"))
+    db.insert_deployment_id("1256", tables.get("deploymentid"))
+    info = db.get_deployment_id_primary_key("1256", tables.get("deploymentid"))
+    assert info == 2
+
+
 def test_proj_insertion(project_db_fixture):
     db = project_db_fixture
     db.insert_vrauser("im530", "Ishan", tables.get("user"))
@@ -109,13 +141,13 @@ def test_proj_update(project_db_fixture):
     users = db.get_vrauser(None, None, tables.get("user"))
     db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
     result = db.update_project(
-        "123abc", "9876xyz", users[0][0], 220.0, tables.get("proj")
+        1, "9876xyz", users[0][0], 220.0, tables.get("proj")
     )
     info = db.get_project(None, tables.get("proj"))
     assert len(info) == 1
     assert result
-    assert info[0][1] == "9876xyz"
-    assert info[0][3] == 220.0
+    assert info[0][2] == "9876xyz"
+    assert info[0][4] == 220.0
 
 
 def test_proj_remove(project_db_fixture):
@@ -123,8 +155,8 @@ def test_proj_remove(project_db_fixture):
     db.insert_vrauser("im530", "Ishan", tables.get("user"))
     users = db.get_vrauser(None, None, tables.get("user"))
     db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
-    info = db.get_project(None, tables.get("proj"))
-    result = db.remove_project("123abc", tables.get("proj"))
+    prj = db.get_project(None, tables.get("proj"))
+    result = db.remove_project(prj[0][0], tables.get("proj"))
     info = db.get_project(None, tables.get("proj"))
     assert result
     assert len(info) == 0
@@ -138,8 +170,8 @@ def test_proj_fetchall(project_db_fixture):
     db.insert_project("123xyz", users[0][0], 200.0, tables.get("proj"))
     info = db.get_project(None, tables.get("proj"))
     assert len(info) == 2
-    assert info[0][1] == "123abc"
-    assert info[1][1] == "123xyz"
+    assert info[0][2] == "123abc"
+    assert info[1][2] == "123xyz"
 
 
 def test_proj_fetch_one(project_db_fixture):
@@ -150,7 +182,27 @@ def test_proj_fetch_one(project_db_fixture):
     db.insert_project("123xyz", users[0][0], 200.0, tables.get("proj"))
     info = db.get_project("123xyz", tables.get("proj"))
     assert len(info) == 1
-    assert info[0][1] == "123xyz"
+    assert info[0][2] == "123xyz"
+
+
+def test_proj_fetch_by_id(project_db_fixture):
+    db = project_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    users = db.get_vrauser(None, None, tables.get("user"))
+    db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
+    db.insert_project("123xyz", users[0][0], 200.0, tables.get("proj"))
+    info = db.get_project_by_id(2, tables.get("proj"))
+    assert info[2] == "123xyz"
+
+
+def test_proj_fetch_primary_key(project_db_fixture):
+    db = project_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    users = db.get_vrauser(None, None, tables.get("user"))
+    db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
+    db.insert_project("123xyz", users[0][0], 200.0, tables.get("proj"))
+    info = db.get_project_primary_key("123xyz", None, tables.get("proj"))
+    assert info == 2
 
 
 def test_grant_insertion(grant_db_fixture):
@@ -169,13 +221,13 @@ def test_grant_update(grant_db_fixture):
     users = db.get_vrauser(None, None, tables.get("user"))
     db.insert_grant("123abc", users[0][0], 100.0, tables.get("grant"))
     result = db.update_grant(
-        "123abc", "9876xyz", users[0][0], 220.0, tables.get("grant")
+        1, "9876xyz", users[0][0], 220.0, tables.get("grant")
     )
     info = db.get_grant(None, tables.get("grant"))
     assert len(info) == 1
     assert result
-    assert info[0][1] == "9876xyz"
-    assert info[0][3] == 220.0
+    assert info[0][2] == "9876xyz"
+    assert info[0][4] == 220.0
 
 
 def test_grant_remove(grant_db_fixture):
@@ -183,7 +235,7 @@ def test_grant_remove(grant_db_fixture):
     db.insert_vrauser("im530", "Ishan", tables.get("user"))
     users = db.get_vrauser(None, None, tables.get("user"))
     db.insert_grant("123abc", users[0][0], 100.0, tables.get("grant"))
-    result = db.remove_grant("123abc", tables.get("grant"))
+    result = db.remove_grant(1, tables.get("grant"))
     info = db.get_grant(None, tables.get("grant"))
     assert len(info) == 0
     assert result
@@ -197,8 +249,8 @@ def test_grant_fetchall(grant_db_fixture):
     db.insert_grant("123xyz", users[0][0], 200.0, tables.get("grant"))
     info = db.get_grant(None, tables.get("grant"))
     assert len(info) == 2
-    assert info[0][1] == "123abc"
-    assert info[1][1] == "123xyz"
+    assert info[0][2] == "123abc"
+    assert info[1][2] == "123xyz"
 
 
 def test_grant_fetch_one(grant_db_fixture):
@@ -209,7 +261,27 @@ def test_grant_fetch_one(grant_db_fixture):
     db.insert_grant("123xyz", users[0][0], 200.0, tables.get("grant"))
     info = db.get_grant("123xyz", tables.get("grant"))
     assert len(info) == 1
-    assert info[0][1] == "123xyz"
+    assert info[0][2] == "123xyz"
+
+
+def test_grant_fetch_by_id(grant_db_fixture):
+    db = grant_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    users = db.get_vrauser(None, None, tables.get("user"))
+    db.insert_grant("123abc", users[0][0], 100.0, tables.get("grant"))
+    db.insert_grant("123xyz", users[0][0], 200.0, tables.get("grant"))
+    info = db.get_grant_by_id(2, tables.get("grant"))
+    assert info[2] == "123xyz"
+
+
+def test_grant_primary_key(grant_db_fixture):
+    db = grant_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    users = db.get_vrauser(None, None, tables.get("user"))
+    db.insert_grant("123abc", users[0][0], 100.0, tables.get("grant"))
+    db.insert_grant("123xyz", users[0][0], 200.0, tables.get("grant"))
+    info = db.get_grant_primary_key("123xyz", None, tables.get("grant"))
+    assert info == 2
 
 
 def test_costing_insertion(costing_db_fixture):
@@ -249,12 +321,10 @@ def test_costing_update(costing_db_fixture):
         deploy[0][0], "Resource Expansion", proj[0][0], None, tables.get("costing")
     )
 
-    info = db.get_costing(None, None, None, None, tables.get("costing"))
     result = db.update_costing(
+        1,
         deploy[0][0],
         "Resource Expansion",
-        None,
-        proj[0][0],
         grant[0][0],
         None,
         tables.get("costing"),
@@ -281,9 +351,7 @@ def test_costing_remove(costing_db_fixture):
         deploy[0][0], "Resource Expansion", proj[0][0], None, tables.get("costing")
     )
 
-    result = db.remove_costing(
-        deploy[0][0], "Resource Expansion", proj[0][0], None, tables.get("costing")
-    )
+    result = db.remove_costing(1, tables.get("costing"))
 
     info = db.get_costing(None, None, None, None, tables.get("costing"))
     assert len(info) == 0
@@ -337,3 +405,43 @@ def test_costing_fetch_one(costing_db_fixture):
     )
     assert len(info) == 1
     assert info[0][2] == "Duration Expansion"
+
+
+def test_costing_fetch_by_id(costing_db_fixture):
+    db = costing_db_fixture
+    db.insert_vrauser("im530", "Ishan", "test_user")
+    users = db.get_vrauser(None, None, tables.get("user"))
+
+    db.insert_deployment_id("121212", tables.get("deploymentid"))
+    deploy = db.get_deployment_id(None, tables.get("deploymentid"))
+
+    db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
+    proj = db.get_project(None, tables.get("proj"))
+
+    db.insert_costing(
+        deploy[0][0], "Duration Expansion", proj[0][0], None, tables.get("costing")
+    )
+
+    info = db.get_costing_by_id(1, tables.get("costing"))
+    assert info[1] == deploy[0][0]
+    assert info[2] == "Duration Expansion"
+    assert info[3] == proj[0][0]
+
+
+def test_costing_fetch_primary_key(costing_db_fixture):
+    db = costing_db_fixture
+    db.insert_vrauser("im530", "Ishan", "test_user")
+    users = db.get_vrauser(None, None, tables.get("user"))
+
+    db.insert_deployment_id("121212", tables.get("deploymentid"))
+    deploy = db.get_deployment_id(None, tables.get("deploymentid"))
+
+    db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
+    proj = db.get_project(None, tables.get("proj"))
+
+    db.insert_costing(
+        deploy[0][0], "Duration Expansion", proj[0][0], None, tables.get("costing")
+    )
+
+    info = db.get_costing_primary_key(deploy[0][0], "Duration Expansion", proj[0][0], None, tables.get("costing"))
+    assert info == 1

ucampostgresvro/utils.py

@@ -151,6 +151,7 @@ def create_project_table(
     """
     design = f"CREATE TABLE {proj_tablename} (\
         id SERIAL PRIMARY KEY, \
+        date TIMESTAMP DEFAULT CURRENT_TIMESTAMP, \
         project_number VARCHAR(255), \
         paid_by INTEGER REFERENCES {user_tablename}(id), \
         amount FLOAT NOT NULL \
@@ -173,6 +174,7 @@ def create_grant_table(
     """
     design = f"CREATE TABLE {grant_tablename} (\
         id SERIAL PRIMARY KEY,\
+        date TIMESTAMP DEFAULT CURRENT_TIMESTAMP, \
         grant_number VARCHAR(255),\
         paid_by INTEGER REFERENCES {user_tablename}(id),\
         amount FLOAT NOT NULL\

{ucampostgresvro-0.1.2.dist-info → ucampostgresvro-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ucampostgresvro
-Version: 0.1.2
+Version: 0.2.1
 Summary: To connect with postgresql for the billing report
 Author: Ishan Mahajan
 Author-email: mahanishanmahajan@gmail.com
@@ -55,6 +55,8 @@ pre_setupconfig(db_params)
 - To perform CRUD operation 
 ```
 from ucampostgresvro.DBA import DB
+from datetime import datetime
+
 db_params = {
     "dbname": "vrapricing",
     "user": "postgres",
@@ -74,6 +76,15 @@ db.insert_vrauser("ll220", "Ling-Yan Lau")
 # read user
 print(db.get_vrauser())
 
+# read user specific user by crsid
+print(db.get_vrauser("ll220"))
+
+# read user specific user by user id
+print(db.get_vrauser_by_id(1))
+
+# get the primary key of user using crsid
+print(db.get_vrauser_primary_key("ll220"))
+
 # update user
 db.update_vrauser("ll220", "bda20", 'Ben Argyle')
 
@@ -83,9 +94,18 @@ db.remove_vrauser('bda20')
 # create vra deploymentid 
 db.insert_deployment_id("1231ee112ad11212")
 
-# read vra deployment id
+# read all the vra deployment ids
+print(db.get_deployment_id())
+
+# read specific specific deploymentid by deploymentid
 print(db.get_deployment_id("1231a"))
 
+# read specific deploymentid by primary key
+print(db.get_deployment_id_by_id(1))
+
+# read primary key of specific deploymentid
+print(db.get_deployment_id_primary_key("1231a"))
+
 # update vra deployment id
 db.update_deployment_id("1231ee112ad1", "1231a")
 
@@ -95,38 +115,77 @@ db.remove_deployment_id('1231a')
 # create project 
 db.insert_project("0001",1,100.0)
 
-# read project 
+# read all the projects 
 print(db.get_project())
 
-# update project 
-db.update_project("0001", "0002", 4, 200)
+# read specific project
+print(db.get_project("0001"))
+
+# read project from the ID
+print(db.get_project_by_id(1))
+
+# get the primary key of the project
+print(db.get_project_primary_key("001"))
+
+# get the primary key of the project if more than 1 entites using date of insertion.
+print(db.get_project_primary_key("001", datetime(2025, 1, 22, 15, 55, 25, 95698)))
+
+# update project with new information 1 is the primary key
+db.update_project(1, "0002", 4, 200)
 
-# delete project
-# db.remove_project("0002")
+# delete project using primary key of project
+# db.remove_project(1)
 
 # create grant 
 db.insert_grant("0001",1,100.0)
 
-# read grant
+# read all the grants
 print(db.get_grant())
 
-# update grant 
-db.update_grant("0001", "0002", 4, 200)
+# read specific grant
+print(db.get_grant("0001"))
 
-# delete grant
-db.remove_grant("0002")
+# read grant from the ID
+print(db.get_grant_by_id(1))
+
+# get the primary key of the grant
+print(db.get_grant_primary_key("001"))
+
+# get the primary key of the grant if more than 1 entites using date of insertion.
+print(db.get_grant_primary_key("001", datetime(2025, 1, 22, 15, 55, 25, 95698)))
+
+# update grant with new information 1 is the primary key of grant
+db.update_grant(1, "2002", 4, 200)
+
+# delete grant 1 is the primary key of the grant
+db.remove_grant(1)
 
 # create costing 
 db.insert_costing(2, "Initial Resource", project_id=4, grant_id=None)
 
-# read costing 
+# read all the costing 
 print(db.get_costing())
 
-# update costing 
-db.update_costing(2, "Duration Expansion", old_grant_id=4, old_project_id=None, grant_id=4, project_id=None)
+# read specific costing using primary key of the costing
+print(db.get_costing_by_id(1))
+
+# read specific costing for the project 
+print(db.get_costing(2, "Initial Resource", 2))
 
-# delete costing 
-db.remove_costing(2, "Duration Expansion", 4, None)
+# read specific costing for the grant 
+print(db.get_costing(2, "Initial Resource", None, 2))
+
+# get primary key for the specific costing for the project
+print(db.get_costing_primary_key(2, "Initial Resource", 2))
+
+# get primary key for the specific costing for the grant
+print(db.get_costing_primary_key(2, "Initial Resource", None, 2))
+
+# update costing where 3 is the primary key of the costing.
+db.update_costing(3, 2, "Duration Expansion", new_grant_id=None, new_project_id=2)
+
+# delete costing where 3 is the primary key
+db.remove_costing(3)
 
 # to close db connection
 db.closedb()
@@ -173,39 +232,40 @@ Referenced by:
 
 ## - project table 
 ```
-vrapricing=# \d projects;
-                                        Table "public.projects"
-     Column     |          Type          | Collation | Nullable |               Default
-----------------+------------------------+-----------+----------+--------------------------------------
- id             | integer                |           | not null | nextval('projects_id_seq'::regclass)
- project_number | character varying(255) |           |          |
- paid_by        | integer                |           |          |
- amount         | double precision       |           | not null |
+vrapricing=# \d projects
+                                          Table "public.projects"
+     Column     |            Type             | Collation | Nullable |               Default
+----------------+-----------------------------+-----------+----------+--------------------------------------
+ id             | integer                     |           | not null | nextval('projects_id_seq'::regclass)
+ date           | timestamp without time zone |           |          | CURRENT_TIMESTAMP
+ project_number | character varying(255)      |           |          |
+ paid_by        | integer                     |           |          |
+ amount         | double precision            |           | not null |
 Indexes:
     "projects_pkey" PRIMARY KEY, btree (id)
 Foreign-key constraints:
     "projects_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
 Referenced by:
     TABLE "costing" CONSTRAINT "costing_project_id_fkey" FOREIGN KEY (project_id) REFERENCES projects(id)
-
 ```
 
 ## - grants table 
 ```
-vrapricing=# \d grant;
-                                        Table "public.grant"
-     Column     |          Type          | Collation | Nullable |               Default
-----------------+------------------------+-----------+----------+--------------------------------------
- id             | integer                |           | not null | nextval('grant_id_seq'::regclass)
- voucher_number | character varying(255) |           |          |
- paid_by        | integer                |           |          |
- amount         | double precision       |           | not null |
+vrapricing=# \d grants
+                                         Table "public.grants"
+    Column    |            Type             | Collation | Nullable |              Default
+--------------+-----------------------------+-----------+----------+------------------------------------
+ id           | integer                     |           | not null | nextval('grants_id_seq'::regclass)
+ date         | timestamp without time zone |           |          | CURRENT_TIMESTAMP
+ grant_number | character varying(255)      |           |          |
+ paid_by      | integer                     |           |          |
+ amount       | double precision            |           | not null |
 Indexes:
-    "grant_pkey" PRIMARY KEY, btree (id)
+    "grants_pkey" PRIMARY KEY, btree (id)
 Foreign-key constraints:
-    "grant_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
+    "grants_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
 Referenced by:
-    TABLE "costing" CONSTRAINT "costing_voucher_id_fkey" FOREIGN KEY (voucher_id) REFERENCES grant(id)
+    TABLE "costing" CONSTRAINT "costing_grant_id_fkey" FOREIGN KEY (grant_id) REFERENCES grants(id)
 ```
 
 ## - Costing table 

ucampostgresvro-0.2.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+ucampostgresvro/DBA.py,sha256=x795bE2kUOiDc1274bFXO1dMlQlvGQXZayirE0TGlZM,38597
+ucampostgresvro/__init__.py,sha256=w9Iw7QVvd8lme2wKwEbCo5IgetVjSfFBOOYAcA_Q0Ns,18
+ucampostgresvro/__main__.py,sha256=KzZTQ308dHN0OuvxObUhCdGJz2sbb8iFr-wOP6_iSMg,4128
+ucampostgresvro/ca.crt,sha256=pVDr3AsvwCqJ36JTifsAzIiS2ve_fWC1CBfVI0cnVmY,1135
+ucampostgresvro/exceptions.py,sha256=XVi8Sk_gg3VE4ryTtiYOnGbmCPIsfFt2AE5sOoqQDuI,39
+ucampostgresvro/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ucampostgresvro/tests/conftest.py,sha256=t89U_SOcWf2q0C_m4Vn89LSLwxnQC-_rUAvt6yNeOWA,1803
+ucampostgresvro/tests/dbconnect.py,sha256=pKU95buCUAUw0plBcaFqhCn7zPjW_PQreONasHlEh_Q,241
+ucampostgresvro/tests/test_DB.py,sha256=lye6NLUS2k7W7Kr083fQ5HDUD5hMMUqvIXL2xbNoRUk,16338
+ucampostgresvro/tests/utils.py,sha256=lpcvf6HPOOtxAwSwvoAUhil1zQ6Qfr0ZILa0qDVdES0,3722
+ucampostgresvro/tools.py,sha256=Y8MUK1lIG10A-724yrhve8LfjQUmFwpqi19UIO5DeuI,153
+ucampostgresvro/utils.py,sha256=QYhWaBaxGn-yKEGm___3-7RitbIWwICTplbz7LyKgLE,8543
+ucampostgresvro-0.2.1.dist-info/LICENSE,sha256=CVTj8C-BHEJjzYlYtHnfykxKkfmk-ImXOs5rcMgXebY,1094
+ucampostgresvro-0.2.1.dist-info/METADATA,sha256=xQeFtb89nyd4YJuY7SKQONgjZBhM-1WJ3i3HFbejw0c,9791
+ucampostgresvro-0.2.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+ucampostgresvro-0.2.1.dist-info/RECORD,,

ucampostgresvro-0.1.2.dist-info/RECORD

@@ -1,16 +0,0 @@
-ucampostgresvro/DBA.py,sha256=LGj2JpP2B-6z7CFV-zloLNmW8dPcIyuItVRi5x0KQT0,30876
-ucampostgresvro/__init__.py,sha256=3ITyQfKn-h4AMdaHk5rHJaliZbCnbLZ7O3QQnAJH8yI,18
-ucampostgresvro/__main__.py,sha256=oEX2F0_bl2Xrq6_l9YZb1ZBIhxRwzuSPpauqjCm0YjE,2780
-ucampostgresvro/ca.crt,sha256=pVDr3AsvwCqJ36JTifsAzIiS2ve_fWC1CBfVI0cnVmY,1135
-ucampostgresvro/exceptions.py,sha256=XVi8Sk_gg3VE4ryTtiYOnGbmCPIsfFt2AE5sOoqQDuI,39
-ucampostgresvro/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ucampostgresvro/tests/conftest.py,sha256=t89U_SOcWf2q0C_m4Vn89LSLwxnQC-_rUAvt6yNeOWA,1803
-ucampostgresvro/tests/dbconnect.py,sha256=T2rVoUmG6mHwS-i4h8R4O4GuEhuucCd3zyrFUMMhkE4,240
-ucampostgresvro/tests/test_DB.py,sha256=SLi5C0NO0dIeIQOfywkAPWKznfANopVEnHOxCD-EZpU,12134
-ucampostgresvro/tests/utils.py,sha256=lpcvf6HPOOtxAwSwvoAUhil1zQ6Qfr0ZILa0qDVdES0,3722
-ucampostgresvro/tools.py,sha256=Y8MUK1lIG10A-724yrhve8LfjQUmFwpqi19UIO5DeuI,153
-ucampostgresvro/utils.py,sha256=ZHS9D3Eplyk3Ck-AoVG_2YgVJJNmuO6J-FaZGsJKGs4,8439
-ucampostgresvro-0.1.2.dist-info/LICENSE,sha256=CVTj8C-BHEJjzYlYtHnfykxKkfmk-ImXOs5rcMgXebY,1094
-ucampostgresvro-0.1.2.dist-info/METADATA,sha256=ICcEjopmJAXYGhqzbGO-H3JSFO2dBV33vuV8qslIEAw,7649
-ucampostgresvro-0.1.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-ucampostgresvro-0.1.2.dist-info/RECORD,,