Skip to content

Commit 8de8c8f

Browse files
committed
backout oracle updates
1 parent be5fee4 commit 8de8c8f

File tree

3 files changed

+1
-51
lines changed

3 files changed

+1
-51
lines changed

dataframely/_compat.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def __getattr__(self, name: str) -> Any:
1818
try:
1919
import sqlalchemy as sa
2020
import sqlalchemy.dialects.mssql as sa_mssql
21-
import sqlalchemy.dialects.oracle as sa_oracle
2221
import sqlalchemy.dialects.postgresql as sa_postgresql
2322
from sqlalchemy.sql.type_api import TypeEngine as sa_TypeEngine
2423
except ImportError: # pragma: no cover
@@ -38,4 +37,4 @@ class sa_TypeEngine: # type: ignore # noqa: N801
3837

3938
# ------------------------------------------------------------------------------------ #
4039

41-
__all__ = ["sa", "sa_mssql", "sa_oracle", "sa_postgresql", "sa_TypeEngine", "pa"]
40+
__all__ = ["sa", "sa_mssql", "sa_postgresql", "sa_TypeEngine", "pa"]

dataframely/columns/datetime.py

-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
pa,
1515
sa,
1616
sa_mssql,
17-
sa_oracle,
1817
sa_postgresql,
1918
sa_TypeEngine,
2019
)
@@ -349,8 +348,6 @@ def sqlalchemy_dtype(self, dialect: sa.Dialect) -> sa_TypeEngine:
349348
return sa_mssql.DATETIME2(6, timezone=timezone_enabled)
350349
case "postgresql":
351350
return sa_postgresql.TIMESTAMP(timezone=timezone_enabled)
352-
case "oracle":
353-
return sa_oracle.TIMESTAMP(timezone=timezone_enabled)
354351
case _:
355352
return sa.DateTime(timezone=timezone_enabled)
356353

tests/columns/test_sql_schema.py

-46
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import pytest
55
import sqlalchemy as sa
66
from sqlalchemy.dialects.mssql.pyodbc import MSDialect_pyodbc
7-
from sqlalchemy.dialects.oracle.oracledb import OracleDialect_oracledb
87
from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2
98

109
import dataframely as dy
@@ -103,51 +102,6 @@ def test_postgres_datatype(column: Column, datatype: str) -> None:
103102
assert columns[0].type.compile(dialect) == datatype
104103

105104

106-
@pytest.mark.parametrize(
107-
("column", "datatype"),
108-
[
109-
(dy.Bool(), "SMALLINT"),
110-
(dy.Date(), "DATE"),
111-
(dy.Datetime(), "TIMESTAMP"),
112-
(dy.Datetime(time_zone="Etc/UTC"), "TIMESTAMP WITH TIME ZONE"),
113-
(dy.Time(), "TIME"),
114-
(dy.Duration(), "INTERVAL DAY TO SECOND"),
115-
(dy.Decimal(), "NUMERIC"),
116-
(dy.Decimal(12), "NUMERIC(12, 0)"),
117-
(dy.Decimal(None, 8), "NUMERIC(38, 8)"),
118-
(dy.Decimal(6, 2), "NUMERIC(6, 2)"),
119-
(dy.Float(), "FLOAT"),
120-
(dy.Float32(), "REAL"),
121-
(dy.Float64(), "FLOAT"),
122-
(dy.Integer(), "INTEGER"),
123-
(dy.Int8(), "SMALLINT"),
124-
(dy.Int16(), "SMALLINT"),
125-
(dy.Int32(), "INTEGER"),
126-
(dy.Int64(), "NUMBER(19)"),
127-
(dy.UInt8(), "SMALLINT"),
128-
(dy.UInt16(), "INTEGER"),
129-
(dy.UInt32(), "NUMBER(19)"),
130-
(dy.UInt64(), "NUMBER(19)"),
131-
(dy.String(), "VARCHAR2"),
132-
(dy.String(min_length=3), "VARCHAR2"),
133-
(dy.String(max_length=5), "VARCHAR2(5 CHAR)"),
134-
(dy.String(min_length=3, max_length=5), "VARCHAR2(5 CHAR)"),
135-
(dy.String(min_length=5, max_length=5), "CHAR(5)"),
136-
(dy.String(regex="[abc]de"), "VARCHAR2"),
137-
(dy.String(regex="^[abc]d$"), "CHAR(2)"),
138-
(dy.String(regex="^[abc]{1,3}d$"), "VARCHAR2(4 CHAR)"),
139-
(dy.Enum(["foo", "bar"]), "CHAR(3)"),
140-
(dy.Enum(["a", "abc"]), "VARCHAR2(3 CHAR)"),
141-
],
142-
)
143-
def test_oracle_datatype(column: Column, datatype: str) -> None:
144-
dialect = OracleDialect_oracledb()
145-
schema = create_schema("test", {"a": column})
146-
columns = schema.sql_schema(dialect)
147-
assert len(columns) == 1
148-
assert columns[0].type.compile(dialect) == datatype
149-
150-
151105
@pytest.mark.parametrize("column_type", COLUMN_TYPES)
152106
@pytest.mark.parametrize("nullable", [True, False])
153107
@pytest.mark.parametrize("dialect", [MSDialect_pyodbc()])

0 commit comments

Comments
 (0)