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.

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

#1267 #1272

Merged
merged 1 commit into from
Nov 19, 2023
Merged

#1267 #1272

Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions testdata/sql_scripts/mysql,sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
CREATE TABLE planets (
id INT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(20),
mass DECIMAL(8, 4),
diameter INT,
density DECIMAL(5, 1),
gravity DECIMAL(5, 1),
escapeVelocity DECIMAL(5, 1),
rotationPeriod DECIMAL(5, 1),
lengthOfDay DECIMAL(5, 1),
distanceFromSun DECIMAL(5, 1),
perihelion DECIMAL(5, 1),
aphelion DECIMAL(5, 1),
orbitalPeriod DECIMAL(7, 1),
orbitalVelocity DECIMAL(5, 1),
orbitalInclination DECIMAL(5, 1),
orbitalEccentricity DECIMAL(5, 3),
obliquityToOrbit DECIMAL(5, 1),
meanTemperature INT,
surfacePressure DECIMAL(7, 5),
numberOfMoons INT
);

INSERT INTO planets (name, mass, diameter, density, gravity, escapeVelocity, rotationPeriod, lengthOfDay, distanceFromSun, perihelion, aphelion, orbitalPeriod, orbitalVelocity, orbitalInclination, orbitalEccentricity, obliquityToOrbit, meanTemperature, surfacePressure, numberOfMoons)
VALUES
('Mercury', 0.33, 4879, 5427, 3.7, 4.3, 1407.6, 4222.6, 57.9, 46, 69.8, 88, 47.4, 7, 0.205, 0.034, 167, 0, 0),
('Venus', 4.87, 12104, 5243, 8.9, 10.4, -5832.5, 2802, 108.2, 107.5, 108.9, 224.7, 35, 3.4, 0.007, 177.4, 464, 92, 0),
('Earth', 5.97, 12756, 5514, 9.8, 11.2, 23.9, 24, 149.6, 147.1, 152.1, 365.2, 29.8, 0, 0.017, 23.4, 15, 1, 1),
('Mars', 0.642, 6792, 3933, 3.7, 5, 24.6, 24.7, 227.9, 206.6, 249.2, 687, 24.1, 1.9, 0.094, 25.2, -65, 0.01, 2),
('Jupiter', 1898, 142984, 1326, 23.1, 59.5, 9.9, 9.9, 778.6, 740.5, 816.6, 4331, 13.1, 1.3, 0.049, 3.1, -110, NULL, 79),
('Saturn', 568, 120536, 687, 9, 35.5, 10.7, 10.7, 1433.5, 1352.6, 1514.5, 10747, 9.7, 2.5, 0.057, 26.7, -140, NULL, 62),
('Uranus', 86.8, 51118, 1271, 8.7, 21.3, -17.2, 17.2, 2872.5, 2741.3, 3003.6, 30589, 6.8, 0.8, 0.046, 97.8, -195, NULL, 27),
('Neptune', 102, 49528, 1638, 11, 23.5, 16.1, 16.1, 4495.1, 4444.5, 4545.7, 59800, 5.4, 1.8, 0.011, 28.3, -200, NULL, 14),
('Pluto', 0.0146, 2370, 2095, 0.7, 1.3, -153.3, 153.3, 5906.4, 4436.8, 7375.9, 90560, 4.7, 17.2, 0.244, 122.5, -225, 0.00001, 5);
10 changes: 4 additions & 6 deletions tests/storage/test_sql_mysql.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,11 @@

MYSQL_PASSWORD = os.environ.get("MYSQL_PASSWORD")
MYSQL_USER = os.environ.get("MYSQL_USER")
CONNECTION = f"mysql+pymysql://{MYSQL_USER}:{MYSQL_PASSWORD}@mysql-3c28af34-joocer-9765.a.aivencloud.com:10067/defaultdb?charset=utf8mb4"


def test_mysql_storage():
opteryx.register_store(
"mysql",
SqlConnector,
remove_prefix=True,
connection=f"mysql+pymysql://{MYSQL_USER}:{MYSQL_PASSWORD}@mysql.ci.opteryx.info/opteryx?charset=utf8mb4",
)
opteryx.register_store("mysql", SqlConnector, remove_prefix=True, connection=CONNECTION)

results = opteryx.query("SELECT * FROM mysql.planets")
assert results.rowcount == 9, results.rowcount
Expand All @@ -39,4 +35,6 @@ def test_mysql_storage():
if __name__ == "__main__": # pragma: no cover
from tests.tools import run_tests

_mysql_create_tables()

run_tests()
42 changes: 42 additions & 0 deletions tests/storage/test_sql_postgres.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
"""
Test we can read from Sqlite - this is a basic exercise of the SQL Connector
"""
import os
import sys

sys.path.insert(1, os.path.join(sys.path[0], "../.."))

import opteryx
from opteryx.connectors import SqlConnector

POSTGRES_PASSWORD = os.environ.get("POSTGRES_PASSWORD")
POSTGRES_USER = os.environ.get("POSTGRES_USER")


def test_postgres_storage():
opteryx.register_store(
"pg",
SqlConnector,
remove_prefix=True,
connection=f"postgresql+psycopg2://{POSTGRES_USER}:{POSTGRES_PASSWORD}@trumpet.db.elephantsql.com/{POSTGRES_USER}",
)

results = opteryx.query("SELECT * FROM pg.planets")
assert results.rowcount == 9, results.rowcount
assert results.columncount == 20

# PROCESS THE DATA IN SOME WAY
results = opteryx.query("SELECT COUNT(*) FROM pg.planets;")
assert results.rowcount == 1, results.rowcount
assert results.columncount == 1

# PUSH A PROJECTION
results = opteryx.query("SELECT name FROM pg.planets;")
assert results.rowcount == 9, results.rowcount
assert results.columncount == 1


if __name__ == "__main__": # pragma: no cover
from tests.tools import run_tests

run_tests()
Loading