diff --git a/AGENTS.md b/AGENTS.md index 67e60029..94092a85 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -41,8 +41,8 @@ A command line client for MySQL with auto-completion and syntax highlighting. ├── mycli/packages/completion/schema_prefetcher.py # background prefetcher for multi-schema auto-completion ├── mycli/packages/completion/sql_completer.py # finds SQL completion candidates ├── mycli/packages/credentials/password_sources.py # password sources and precedence - ├── mycli/packages/datafrane/completion.py # completions for `.|` transforms - ├── mycli/packages/datafrane/transform.py # implements `.|` transforms + ├── mycli/packages/dataframes/completion.py # completions for `.|` transforms + ├── mycli/packages/dataframes/transform.py # implements `.|` transforms ├── mycli/packages/execution/background_runner.py # run queries in the background, with query state and timing updates ├── mycli/packages/execution/sql_execute.py # `SQLExecute` class and friends ├── mycli/packages/integrations/ # integrations with fzf, Boundary, Kubernetes, macOS, OpenSSH, and Vault diff --git a/changelog.md b/changelog.md index f60d063f..3a279b65 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,7 @@ Upcoming (TBD) Internal -------- * Add Python 3.15 trove classifier. -* Move Polars files to `dataframe` package directory. +* Move Polars files to `dataframes` package directory. * Move various utility files to a `utils` directory. * Move various completion files to a `completion` directory. * Move `fzf.py` inside a package directory. diff --git a/mycli/main_modes/repl.py b/mycli/main_modes/repl.py index a8baca1d..d0c11733 100644 --- a/mycli/main_modes/repl.py +++ b/mycli/main_modes/repl.py @@ -58,7 +58,7 @@ QueryState, ) from mycli.packages import special_commands -from mycli.packages.datafrane.transform import ( +from mycli.packages.dataframes.transform import ( PolarsTransform, PolarsTransformError, parse_polars_transform, diff --git a/mycli/packages/completion/sql_completer.py b/mycli/packages/completion/sql_completer.py index e8e78b2a..4d19f4fa 100644 --- a/mycli/packages/completion/sql_completer.py +++ b/mycli/packages/completion/sql_completer.py @@ -18,7 +18,7 @@ from mycli.compat import WIN from mycli.packages.completion.completion_engine import is_inside_quotes, suggest_type -from mycli.packages.datafrane.completion import complete_polars_transform +from mycli.packages.dataframes.completion import complete_polars_transform from mycli.packages.prompt_toolkit.history import frecency_score from mycli.packages.special_commands import llm from mycli.packages.special_commands.dsn_aliases import DsnAliases diff --git a/mycli/packages/datafrane/__init__.py b/mycli/packages/dataframes/__init__.py similarity index 100% rename from mycli/packages/datafrane/__init__.py rename to mycli/packages/dataframes/__init__.py diff --git a/mycli/packages/datafrane/completion.py b/mycli/packages/dataframes/completion.py similarity index 99% rename from mycli/packages/datafrane/completion.py rename to mycli/packages/dataframes/completion.py index eed2914a..997c0b82 100644 --- a/mycli/packages/datafrane/completion.py +++ b/mycli/packages/dataframes/completion.py @@ -14,7 +14,7 @@ import sqlglot -from mycli.packages.datafrane.transform import _pipeline_operator_indexes +from mycli.packages.dataframes.transform import _pipeline_operator_indexes from mycli.packages.redirection.hybrid_redirection import find_token_indices _ATTRIBUTE_PATTERN = re.compile(r'(?s)(.*)\.([A-Za-z_][A-Za-z0-9_]*)?\s*$') diff --git a/mycli/packages/datafrane/transform.py b/mycli/packages/dataframes/transform.py similarity index 100% rename from mycli/packages/datafrane/transform.py rename to mycli/packages/dataframes/transform.py diff --git a/mycli_test/pytests/test_polars_completion.py b/mycli_test/pytests/test_polars_completion.py index 5575f96e..ada07dc1 100644 --- a/mycli_test/pytests/test_polars_completion.py +++ b/mycli_test/pytests/test_polars_completion.py @@ -10,8 +10,8 @@ import sqlglot from mycli.packages.completion.sql_completer import SQLCompleter -from mycli.packages.datafrane import completion as polars_completion -from mycli.packages.datafrane.completion import PolarsCompletion, complete_polars_transform +from mycli.packages.dataframes import completion as polars_completion +from mycli.packages.dataframes.completion import PolarsCompletion, complete_polars_transform def completion(command: str, text: str) -> PolarsCompletion: diff --git a/mycli_test/pytests/test_polars_transform.py b/mycli_test/pytests/test_polars_transform.py index 6c59139f..94562a19 100644 --- a/mycli_test/pytests/test_polars_transform.py +++ b/mycli_test/pytests/test_polars_transform.py @@ -5,8 +5,8 @@ import pytest -from mycli.packages.datafrane import transform as polars_transform -from mycli.packages.datafrane.transform import ( +from mycli.packages.dataframes import transform as polars_transform +from mycli.packages.dataframes.transform import ( PolarsPipeline, PolarsTransform, PolarsTransformError, @@ -390,7 +390,7 @@ def test_parse_output_path_rejects_mismatched_quotes() -> None: def test_prepare_polars_transform_compiles_expression_and_loads_polars(monkeypatch: pytest.MonkeyPatch) -> None: - monkeypatch.setattr('mycli.packages.datafrane.transform._load_polars', lambda: FakePolars) + monkeypatch.setattr('mycli.packages.dataframes.transform._load_polars', lambda: FakePolars) transform = prepare_polars_transform('SELECT id FROM orders', 'df') @@ -408,7 +408,7 @@ def test_prepare_polars_transform_reports_missing_dependency(monkeypatch: pytest def missing_polars() -> Any: raise PolarsTransformError('Polars transforms require Polars.') - monkeypatch.setattr('mycli.packages.datafrane.transform._load_polars', missing_polars) + monkeypatch.setattr('mycli.packages.dataframes.transform._load_polars', missing_polars) with pytest.raises(PolarsTransformError, match='require Polars'): prepare_polars_transform('SELECT 1', 'df') @@ -956,7 +956,7 @@ def test_run_polars_transform_rejects_dataframe_and_series_plot_output( def test_prepare_polars_transform_supports_direct_parquet_output(monkeypatch: pytest.MonkeyPatch) -> None: - monkeypatch.setattr('mycli.packages.datafrane.transform._load_polars', lambda: FakePolars) + monkeypatch.setattr('mycli.packages.dataframes.transform._load_polars', lambda: FakePolars) transform = prepare_polars_transform('SELECT id FROM orders', None) diff --git a/mycli_test/pytests/test_sqlcompleter.py b/mycli_test/pytests/test_sqlcompleter.py index 13be3c38..7c381840 100644 --- a/mycli_test/pytests/test_sqlcompleter.py +++ b/mycli_test/pytests/test_sqlcompleter.py @@ -10,7 +10,7 @@ from mycli.packages.completion import sql_completer from mycli.packages.completion.sql_completer import Fuzziness, SQLCompleter -from mycli.packages.datafrane.completion import PolarsCompletion +from mycli.packages.dataframes.completion import PolarsCompletion def collect_matches(