Skip to content

Commit 4099939

Browse files
authored
[PECO-1803] Splitting the PySql connector into the core and the non core part (#417)
* Implemented ColumnQueue to test the fetchall without pyarrow Removed token removed token * order of fields in row corrected * Changed the folder structure and tested the basic setup to work * Refractored the code to make connector to work * Basic Setup of connector, core and sqlalchemy is working * Basic integration of core, connect and sqlalchemy is working * Setup working dynamic change from ColumnQueue to ArrowQueue * Refractored the test code and moved to respective folders * Added the unit test for column_queue Fixed __version__ Fix * venv_main added to git ignore * Added code for merging columnar table * Merging code for columnar * Fixed the retry_close sesssion test issue with logging * Fixed the databricks_sqlalchemy tests and introduced pytest.ini for the sqla_testing * Added pyarrow_test mark on pytest * Fixed databricks.sqlalchemy to databricks_sqlalchemy imports * Added poetry.lock * Added dist folder * Changed the pyproject.toml * Minor Fix * Added the pyarrow skip tag on unit tests and tested their working * Fixed the Decimal and timestamp conversion issue in non arrow pipeline * Removed not required files and reformatted * Fixed test_retry error * Changed the folder structure to src / databricks * Removed the columnar non arrow flow to another PR * Moved the README to the root * removed columnQueue instance * Revmoved databricks_sqlalchemy dependency in core * Changed the pysql_supports_arrow predicate, introduced changes in the pyproject.toml * Ran the black formatter with the original version * Extra .py removed from all the __init__.py files names * Undo formatting check * Check * Check * Check * Check * Check * Check * Check * Check * Check * Check * Check * Check * Check * Check * BIG UPDATE * Refeactor code * Refractor * Fixed versioning * Minor refractoring * Minor refractoring
1 parent 9cb1ea3 commit 4099939

File tree

89 files changed

+162
-4232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+162
-4232
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[tool.poetry]
2+
name = "databricks-sql-connector"
3+
version = "3.5.0"
4+
description = "Databricks SQL Connector for Python"
5+
authors = ["Databricks <[email protected]>"]
6+
license = "Apache-2.0"
7+
8+
9+
[tool.poetry.dependencies]
10+
databricks_sql_connector_core = { version = ">=1.0.0", extras=["all"]}
11+
databricks_sqlalchemy = { version = ">=1.0.0", optional = true }
12+
13+
[tool.poetry.extras]
14+
databricks_sqlalchemy = ["databricks_sqlalchemy"]
15+
16+
[tool.poetry.urls]
17+
"Homepage" = "https://github.com/databricks/databricks-sql-python"
18+
"Bug Tracker" = "https://github.com/databricks/databricks-sql-python/issues"
19+
20+
[build-system]
21+
requires = ["poetry-core>=1.0.0"]
22+
build-backend = "poetry.core.masonry.api"
23+
File renamed without changes.
Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,26 @@
11
[tool.poetry]
2-
name = "databricks-sql-connector"
3-
version = "3.3.0"
4-
description = "Databricks SQL Connector for Python"
2+
name = "databricks-sql-connector-core"
3+
version = "1.0.0"
4+
description = "Databricks SQL Connector core for Python"
55
authors = ["Databricks <[email protected]>"]
6-
license = "Apache-2.0"
7-
readme = "README.md"
86
packages = [{ include = "databricks", from = "src" }]
9-
include = ["CHANGELOG.md"]
107

118
[tool.poetry.dependencies]
129
python = "^3.8.0"
1310
thrift = ">=0.16.0,<0.21.0"
1411
pandas = [
1512
{ version = ">=1.2.5,<2.3.0", python = ">=3.8" }
1613
]
17-
pyarrow = ">=14.0.1,<17"
18-
1914
lz4 = "^4.0.2"
2015
requests = "^2.18.1"
2116
oauthlib = "^3.1.0"
22-
numpy = [
23-
{ version = "^1.16.6", python = ">=3.8,<3.11" },
24-
{ version = "^1.23.4", python = ">=3.11" },
25-
]
26-
sqlalchemy = { version = ">=2.0.21", optional = true }
2717
openpyxl = "^3.0.10"
2818
alembic = { version = "^1.0.11", optional = true }
2919
urllib3 = ">=1.26"
20+
pyarrow = {version = ">=14.0.1,<17", optional = true}
3021

3122
[tool.poetry.extras]
32-
sqlalchemy = ["sqlalchemy"]
33-
alembic = ["sqlalchemy", "alembic"]
23+
pyarrow = ["pyarrow"]
3424

3525
[tool.poetry.dev-dependencies]
3626
pytest = "^7.1.2"
@@ -43,8 +33,6 @@ pytest-dotenv = "^0.5.2"
4333
"Homepage" = "https://github.com/databricks/databricks-sql-python"
4434
"Bug Tracker" = "https://github.com/databricks/databricks-sql-python/issues"
4535

46-
[tool.poetry.plugins."sqlalchemy.dialects"]
47-
"databricks" = "databricks.sqlalchemy:DatabricksDialect"
4836

4937
[build-system]
5038
requires = ["poetry-core>=1.0.0"]
@@ -62,5 +50,5 @@ markers = {"reviewed" = "Test case has been reviewed by Databricks"}
6250
minversion = "6.0"
6351
log_cli = "false"
6452
log_cli_level = "INFO"
65-
testpaths = ["tests", "src/databricks/sqlalchemy/test_local"]
53+
testpaths = ["tests", "databricks_sql_connector_core/tests"]
6654
env_files = ["test.env"]

0 commit comments

Comments
 (0)