Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: deflake system test #866

Merged
merged 6 commits into from
Dec 13, 2022
Merged

test: deflake system test #866

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12699ca
test: deflake system test
parthea Dec 9, 2022
b682549
lint
parthea Dec 12, 2022
b92fc9f
Merge branch 'main' into deflake-system-test
parthea Dec 12, 2022
7922aa4
Merge branch 'main' into deflake-system-test
asthamohta Dec 13, 2022
aab5199
Merge branch 'main' into deflake-system-test
asthamohta Dec 13, 2022
4bd582c
Merge branch 'main' into deflake-system-test
asthamohta Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
288 changes: 163 additions & 125 deletions tests/system/test_dbapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,27 +314,35 @@ def test_execute_many(shared_instance, dbapi_database):

def test_DDL_autocommit(shared_instance, dbapi_database):
"""Check that DDLs in autocommit mode are immediately executed."""
conn = Connection(shared_instance, dbapi_database)
conn.autocommit = True

cur = conn.cursor()
cur.execute(
try:
conn = Connection(shared_instance, dbapi_database)
conn.autocommit = True

cur = conn.cursor()
cur.execute(
"""
CREATE TABLE Singers (
SingerId INT64 NOT NULL,
Name STRING(1024),
) PRIMARY KEY (SingerId)
"""
CREATE TABLE Singers (
SingerId INT64 NOT NULL,
Name STRING(1024),
) PRIMARY KEY (SingerId)
"""
)
conn.close()
)
conn.close()

# if previous DDL wasn't committed, the next DROP TABLE
# statement will fail with a ProgrammingError
conn = Connection(shared_instance, dbapi_database)
cur = conn.cursor()
# if previous DDL wasn't committed, the next DROP TABLE
# statement will fail with a ProgrammingError
conn = Connection(shared_instance, dbapi_database)
cur = conn.cursor()

cur.execute("DROP TABLE Singers")
conn.commit()
cur.execute("DROP TABLE Singers")
conn.commit()
finally:
# Delete table
table = dbapi_database.table("Singers")
if table.exists():
op = dbapi_database.update_ddl(["DROP TABLE Singers"])
op.result()


@pytest.mark.skipif(_helpers.USE_EMULATOR, reason="Emulator does not support json.")
Expand All @@ -343,93 +351,114 @@ def test_autocommit_with_json_data(shared_instance, dbapi_database):
Check that DDLs in autocommit mode are immediately
executed for json fields.
"""
# Create table
conn = Connection(shared_instance, dbapi_database)
conn.autocommit = True
try:
# Create table
conn = Connection(shared_instance, dbapi_database)
conn.autocommit = True

cur = conn.cursor()
cur.execute(
cur = conn.cursor()
cur.execute(
"""
CREATE TABLE JsonDetails (
DataId INT64 NOT NULL,
Details JSON,
) PRIMARY KEY (DataId)
"""
CREATE TABLE JsonDetails (
DataId INT64 NOT NULL,
Details JSON,
) PRIMARY KEY (DataId)
"""
)
)

# Insert data to table
cur.execute(
sql="INSERT INTO JsonDetails (DataId, Details) VALUES (%s, %s)",
args=(123, JsonObject({"name": "Jakob", "age": "26"})),
)
# Insert data to table
cur.execute(
sql="INSERT INTO JsonDetails (DataId, Details) VALUES (%s, %s)",
args=(123, JsonObject({"name": "Jakob", "age": "26"})),
)

# Read back the data.
cur.execute("""select * from JsonDetails;""")
got_rows = cur.fetchall()
# Read back the data.
cur.execute("""select * from JsonDetails;""")
got_rows = cur.fetchall()

# Assert the response
assert len(got_rows) == 1
assert got_rows[0][0] == 123
assert got_rows[0][1] == {"age": "26", "name": "Jakob"}
# Assert the response
assert len(got_rows) == 1
assert got_rows[0][0] == 123
assert got_rows[0][1] == {"age": "26", "name": "Jakob"}

# Drop the table
cur.execute("DROP TABLE JsonDetails")
conn.commit()
conn.close()
# Drop the table
cur.execute("DROP TABLE JsonDetails")
conn.commit()
conn.close()
finally:
# Delete table
table = dbapi_database.table("JsonDetails")
if table.exists():
op = dbapi_database.update_ddl(["DROP TABLE JsonDetails"])
op.result()


@pytest.mark.skipif(_helpers.USE_EMULATOR, reason="Emulator does not support json.")
def test_json_array(shared_instance, dbapi_database):
# Create table
conn = Connection(shared_instance, dbapi_database)
conn.autocommit = True
try:
# Create table
conn = Connection(shared_instance, dbapi_database)
conn.autocommit = True

cur = conn.cursor()
cur.execute(
cur = conn.cursor()
cur.execute(
"""
CREATE TABLE JsonDetails (
DataId INT64 NOT NULL,
Details JSON,
) PRIMARY KEY (DataId)
"""
CREATE TABLE JsonDetails (
DataId INT64 NOT NULL,
Details JSON,
) PRIMARY KEY (DataId)
"""
)
cur.execute(
"INSERT INTO JsonDetails (DataId, Details) VALUES (%s, %s)",
[1, JsonObject([1, 2, 3])],
)
)
cur.execute(
"INSERT INTO JsonDetails (DataId, Details) VALUES (%s, %s)",
[1, JsonObject([1, 2, 3])],
)

cur.execute("SELECT * FROM JsonDetails WHERE DataId = 1")
row = cur.fetchone()
assert isinstance(row[1], JsonObject)
assert row[1].serialize() == "[1,2,3]"
cur.execute("SELECT * FROM JsonDetails WHERE DataId = 1")
row = cur.fetchone()
assert isinstance(row[1], JsonObject)
assert row[1].serialize() == "[1,2,3]"

cur.execute("DROP TABLE JsonDetails")
conn.close()
cur.execute("DROP TABLE JsonDetails")
conn.close()
finally:
# Delete table
table = dbapi_database.table("JsonDetails")
if table.exists():
op = dbapi_database.update_ddl(["DROP TABLE JsonDetails"])
op.result()


def test_DDL_commit(shared_instance, dbapi_database):
"""Check that DDLs in commit mode are executed on calling `commit()`."""
conn = Connection(shared_instance, dbapi_database)
cur = conn.cursor()
try:
conn = Connection(shared_instance, dbapi_database)
cur = conn.cursor()

cur.execute(
cur.execute(
"""
CREATE TABLE Singers (
SingerId INT64 NOT NULL,
Name STRING(1024),
) PRIMARY KEY (SingerId)
"""
CREATE TABLE Singers (
SingerId INT64 NOT NULL,
Name STRING(1024),
) PRIMARY KEY (SingerId)
"""
)
conn.commit()
conn.close()
)
conn.commit()
conn.close()

# if previous DDL wasn't committed, the next DROP TABLE
# statement will fail with a ProgrammingError
conn = Connection(shared_instance, dbapi_database)
cur = conn.cursor()
# if previous DDL wasn't committed, the next DROP TABLE
# statement will fail with a ProgrammingError
conn = Connection(shared_instance, dbapi_database)
cur = conn.cursor()

cur.execute("DROP TABLE Singers")
conn.commit()
cur.execute("DROP TABLE Singers")
conn.commit()
finally:
# Delete table
table = dbapi_database.table("Singers")
if table.exists():
op = dbapi_database.update_ddl(["DROP TABLE Singers"])
op.result()


def test_ping(shared_instance, dbapi_database):
Expand Down Expand Up @@ -505,53 +534,62 @@ def test_staleness(shared_instance, dbapi_database):

@pytest.mark.parametrize("autocommit", [False, True])
def test_rowcount(shared_instance, dbapi_database, autocommit):
conn = Connection(shared_instance, dbapi_database)
conn.autocommit = autocommit
cur = conn.cursor()
try:
conn = Connection(shared_instance, dbapi_database)
conn.autocommit = autocommit
cur = conn.cursor()

cur.execute(
cur.execute(
"""
CREATE TABLE Singers (
SingerId INT64 NOT NULL,
Name STRING(1024),
) PRIMARY KEY (SingerId)
"""
CREATE TABLE Singers (
SingerId INT64 NOT NULL,
Name STRING(1024),
) PRIMARY KEY (SingerId)
"""
)
conn.commit()

# executemany sets rowcount to the total modified rows
rows = [(i, f"Singer {i}") for i in range(100)]
cur.executemany("INSERT INTO Singers (SingerId, Name) VALUES (%s, %s)", rows[:98])
assert cur.rowcount == 98

# execute with INSERT
cur.execute(
"INSERT INTO Singers (SingerId, Name) VALUES (%s, %s), (%s, %s)",
[x for row in rows[98:] for x in row],
)
assert cur.rowcount == 2

# execute with UPDATE
cur.execute("UPDATE Singers SET Name = 'Cher' WHERE SingerId < 25")
assert cur.rowcount == 25

# execute with SELECT
cur.execute("SELECT Name FROM Singers WHERE SingerId < 75")
assert len(cur.fetchall()) == 75
# rowcount is not available for SELECT
assert cur.rowcount == -1

# execute with DELETE
cur.execute("DELETE FROM Singers")
assert cur.rowcount == 100
)
conn.commit()

# execute with UPDATE matching 0 rows
cur.execute("UPDATE Singers SET Name = 'Cher' WHERE SingerId < 25")
assert cur.rowcount == 0
# executemany sets rowcount to the total modified rows
rows = [(i, f"Singer {i}") for i in range(100)]
cur.executemany(
"INSERT INTO Singers (SingerId, Name) VALUES (%s, %s)", rows[:98]
)
assert cur.rowcount == 98

conn.commit()
cur.execute("DROP TABLE Singers")
conn.commit()
# execute with INSERT
cur.execute(
"INSERT INTO Singers (SingerId, Name) VALUES (%s, %s), (%s, %s)",
[x for row in rows[98:] for x in row],
)
assert cur.rowcount == 2

# execute with UPDATE
cur.execute("UPDATE Singers SET Name = 'Cher' WHERE SingerId < 25")
assert cur.rowcount == 25

# execute with SELECT
cur.execute("SELECT Name FROM Singers WHERE SingerId < 75")
assert len(cur.fetchall()) == 75
# rowcount is not available for SELECT
assert cur.rowcount == -1

# execute with DELETE
cur.execute("DELETE FROM Singers")
assert cur.rowcount == 100

# execute with UPDATE matching 0 rows
cur.execute("UPDATE Singers SET Name = 'Cher' WHERE SingerId < 25")
assert cur.rowcount == 0

conn.commit()
cur.execute("DROP TABLE Singers")
conn.commit()
finally:
# Delete table
table = dbapi_database.table("Singers")
if table.exists():
op = dbapi_database.update_ddl(["DROP TABLE Singers"])
op.result()


@pytest.mark.parametrize("autocommit", [False, True])
Expand Down