From 0e03594e540763d242df88371685a0ffefe6351a Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Sun, 23 Apr 2023 00:42:27 +0700 Subject: [PATCH] Forgot to bump version in build config --- setup.cfg | 2 +- tests/db_test.py | 38 ++++++++++---------------------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/setup.cfg b/setup.cfg index 871fcc3..ac8dfe5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = based -version = 0.1.0 +version = 0.2.0 description = A simple, fast (maybe), and reliable (I hope) PostgreSQL ORM oriented for dynamic models. author = nuark author_email = me@nuark.xyz diff --git a/tests/db_test.py b/tests/db_test.py index bf98ac3..ddbfb04 100644 --- a/tests/db_test.py +++ b/tests/db_test.py @@ -1,5 +1,4 @@ import unittest -import uuid from based.db import DBConnector, ColumnUpdate, ColumnCondition from based.columns import * @@ -9,25 +8,20 @@ connector = DBConnector(conninfo) class TestDBConnector(unittest.TestCase): def test_connection(self): - with connector.connection() as conn: + with connector.connection as conn: one: dict = conn.execute('SELECT 1 as "ONE"').fetchone() # type: ignore self.assertIsNotNone(one) self.assertEqual(one["ONE"], 1) def test_columnDefinition(self): - with connector.connection() as conn: + with connector.connection as conn: cdef1 = PrimarySerialColumnDefinition("id") - cdef2 = PrimaryUUIDColumnDefinition("uid") - cdef3 = TextColumnDefinition("name") - cdef4 = TextColumnDefinition("name", "John Doe") + cdef2 = TextColumnDefinition("name") + cdef3 = TextColumnDefinition("name", "John Doe") self.assertEqual(cdef1.sql().as_string(conn), '"id" SERIAL PRIMARY KEY') + self.assertEqual(cdef2.sql().as_string(conn), '"name" TEXT') self.assertEqual( - cdef2.sql().as_string(conn), - '"uid" uuid DEFAULT gen_random_uuid() PRIMARY KEY', - ) - self.assertEqual(cdef3.sql().as_string(conn), '"name" TEXT') - self.assertEqual( - cdef4.sql().as_string(conn), "\"name\" TEXT DEFAULT 'John Doe'" + cdef3.sql().as_string(conn), "\"name\" TEXT DEFAULT 'John Doe'" ) def test_tableCreation(self): @@ -52,13 +46,10 @@ class TestDBConnector(unittest.TestCase): [ PrimarySerialColumnDefinition("id"), TextColumnDefinition("textcol", "John Doe"), - BigintColumnDefinition("bigintcol", 2**30), BooleanColumnDefinition("boolcol", True), - DateColumnDefinition("datecol", date.today()), TimestampColumnDefinition("tscol", date.today()), DoubleColumnDefinition("doublecol", 3.14), IntegerColumnDefinition("intcol", 100), - UUIDColumnDefinition("uuidcol", "00000000-0000-0000-0000-000000000000"), ], ) self.assertTrue(connector.tableExists("test_table")) @@ -67,35 +58,24 @@ class TestDBConnector(unittest.TestCase): "test_table", { "textcol": "Jane Doe", - "bigintcol": 3**30, "boolcol": False, - "datecol": date.today(), "tscol": date.today(), "doublecol": 3.14, "intcol": 100, - "uuidcol": uuid.uuid4(), }, ) res = connector.selectFromTable("test_table", ["*"]) self.assertEqual(len(res), 2) self.assertEqual(res[0]["textcol"], "John Doe") - self.assertEqual(res[0]["bigintcol"], 2**30) self.assertEqual(res[0]["boolcol"], True) - self.assertIsNotNone(res[0]["datecol"]) self.assertIsNotNone(res[0]["tscol"]) self.assertEqual(res[0]["doublecol"], 3.14) self.assertEqual(res[0]["intcol"], 100) - self.assertEqual( - res[0]["uuidcol"], uuid.UUID("00000000-0000-0000-0000-000000000000") - ) self.assertEqual(res[1]["textcol"], "Jane Doe") - self.assertEqual(res[1]["bigintcol"], 3**30) self.assertEqual(res[1]["boolcol"], False) - self.assertIsNotNone(res[1]["datecol"]) self.assertIsNotNone(res[1]["tscol"]) self.assertEqual(res[1]["doublecol"], 3.14) self.assertEqual(res[1]["intcol"], 100) - self.assertIsNotNone(res[1]["uuidcol"]) connector.dropTable("test_table") self.assertFalse(connector.tableExists("test_table")) @@ -138,7 +118,7 @@ class TestDBConnector(unittest.TestCase): ColumnUpdate("name", "John"), ], [ - ColumnCondition("name", "John Doe"), + ColumnCondition("name", "eq", "John Doe"), ], ) rows = connector.selectFromTable("test_table", ["name"]) @@ -162,7 +142,9 @@ class TestDBConnector(unittest.TestCase): self.assertEqual(rows[0]["name"], "John Doe") self.assertEqual(rows[1]["name"], "Jane Doe") self.assertEqual(rows[2]["name"], "Mikhail Prokopenko") - connector.deleteFromTable("test_table", [ColumnCondition("name", "John Doe")]) + connector.deleteFromTable( + "test_table", [ColumnCondition("name", "eq", "John Doe")] + ) rows = connector.selectFromTable("test_table", ["name"]) self.assertEqual(len(rows), 2) self.assertEqual(rows[0]["name"], "Jane Doe")