sqlty 0.2.1__tar.gz → 0.2.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {sqlty-0.2.1 → sqlty-0.2.2}/PKG-INFO +1 -1
- {sqlty-0.2.1 → sqlty-0.2.2}/pyproject.toml +3 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/Cargo.lock +25 -30
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/Cargo.toml +1 -1
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/checker.rs +106 -44
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/rewriter.rs +15 -7
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/rules.rs +9 -2
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/Cargo.toml +2 -2
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/compile.rs +25 -3
- sqlty-0.2.2/rust/crates/sqlty-sql/rules/sqlite/datetime.inference.toml +37 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/api.rs +91 -34
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/explain.rs +5 -3
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/expr.rs +9 -2
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/functions.rs +6 -3
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/inference.rs +48 -20
- sqlty-0.2.2/rust/crates/sqlty-sql/src/analyzer/input.rs +305 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/mod.rs +5 -2
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/narrowing.rs +111 -37
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/nullability.rs +39 -6
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/operators.rs +5 -5
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/params.rs +82 -46
- sqlty-0.2.2/rust/crates/sqlty-sql/src/analyzer/planner_hints.sql +527 -0
- sqlty-0.2.2/rust/crates/sqlty-sql/src/analyzer/preprocess.rs +334 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/query.rs +11 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/references.rs +36 -17
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/respell.rs +84 -144
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__expr__tests__casts.snap +11 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__expr__tests__misc_expressions.snap +3 -3
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/star_expand.rs +2 -5
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/tests.rs +123 -12
- sqlty-0.2.2/rust/crates/sqlty-sql/src/analyzer/tokens.rs +181 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/typed.rs +37 -5
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/catalog/builtin_catalog.sql +0 -38
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/catalog/loader.rs +53 -21
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/catalog/mod.rs +35 -0
- sqlty-0.2.2/rust/crates/sqlty-sql/src/catalog/pg_catalog_views.sql +124 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/catalog/read.rs +24 -11
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/catalog/resolve.rs +127 -92
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/diagnostics.rs +10 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/tests/inference_compiler.rs +19 -6
- {sqlty-0.2.1 → sqlty-0.2.2}/skills/sqlty-ci/SKILL.md +1 -1
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_breaking.py +10 -6
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_check.py +28 -8
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_cli.py +141 -79
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_helpers.py +118 -24
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_lint.py +7 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_snapshot.py +4 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/core.py +4 -3
- sqlty-0.2.2/src/sqlty/rules/dynamic-query.md +61 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/unknown-type.md +1 -1
- sqlty-0.2.1/rust/crates/sqlty-sql/rules/sqlite/datetime.inference.toml +0 -28
- sqlty-0.2.1/rust/crates/sqlty-sql/src/analyzer/preprocess.rs +0 -503
- {sqlty-0.2.1 → sqlty-0.2.2}/LICENSE +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/README.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-ext/Cargo.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-ext/build.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-ext/src/lib.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/Cargo.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/edit.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/fixer.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/lib.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/options.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/scan.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/template.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-python/src/tokens.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/build.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/README.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/aggregates.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/arithmetic.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/comparison.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/concat.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/conditional.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/datetime.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/json.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/math.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/strings.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/common/window.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/dialects.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/aggregates.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/arithmetic.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/bits.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/comparison.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/concat.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/conditional.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/datetime.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/encryption.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/json.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/math.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/misc.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/spatial.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/strings.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/mysql/system.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/admin.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/aggregates.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/arithmetic.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/arrays.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/binary.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/comparison.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/concat.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/conditional.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/datetime.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/enums.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/events.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/extensions.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/formatting.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/geometry.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/json.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/math.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/merge.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/network.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/ranges.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/rows.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/sequences.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/series.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/strings.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/system.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/textsearch.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/uuid.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/postgres/xml.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/sqlite/aggregates.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/sqlite/arithmetic.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/sqlite/bitwise.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/sqlite/fts.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/sqlite/json.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/sqlite/math.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/sqlite/scalar.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/rules/sqlite/strings.inference.toml +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/dialect.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/dml.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/grouping.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/hashing.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/json.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/literals.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/memo.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/merged_star.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/names.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/pg_record_functions.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/registry.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/resolve.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/scope.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__dml__tests__returning_columns_in_queries.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__expr__tests__arrays_and_subscripts.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__expr__tests__case_expressions.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__expr__tests__casts_without_a_schema_do_not_complain.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__expr__tests__composite_fields_and_json_access.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__expr__tests__literals_and_unary_operators.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__expr__tests__mysql_and_sqlite_expressions.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__functions__tests__aggregates_in_postgres.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__functions__tests__function_availability_differs_by_dialect.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__functions__tests__return_types_follow_the_argument.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__functions__tests__unknown_functions_are_untyped_and_explained.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__literals__tests__value_sets_flow_through_expressions.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__names__tests__column_names_follow_postgres_figure_colname.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__operators__tests__arithmetic_promotes_numbers_and_types_date_math.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__operators__tests__binary_operators_in_queries.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__operators__tests__common_type_follows_postgres_union_rules.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__operators__tests__division_differs_between_postgres_and_mysql.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__column_names_come_from_the_first_branch.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__ctes.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__dialects_name_and_type_the_same_query_differently.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__projection_forms.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__recursive_ctes_settle_nullability.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__set_operations_combine_nullability.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__set_operations_unify_types.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__statements_that_are_not_queries_have_no_columns.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__unsupported_query_forms_are_explained.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__query__tests__values_lists.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__ambiguous_names_are_reported_once_per_query.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__cte_columns_are_resolved_like_tables.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__names_are_not_judged_without_a_schema.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__nullability_comes_from_the_declaration.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__quoted_names_keep_their_case_in_postgres_only.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__star_over_unreadable_sources_names_the_reason.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__system_columns_exist_without_being_declared.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__unknown_names_say_what_is_missing.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__resolve__tests__unqualified_names_resolve_to_the_first_source_that_has_them.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__scope__tests__correlated_subqueries_see_the_outer_scope.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__scope__tests__derived_tables_ctes_and_views.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__scope__tests__nullability_follows_the_join_kind.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__scope__tests__opaque_sources_explain_themselves.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__scope__tests__star_expansion_over_joins.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/snapshots/sqlty_sql__analyzer__scope__tests__table_names_fold_by_dialect.snap +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/sql_type.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/table_functions.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/test_support.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/analyzer/text_names.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/catalog/alter.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/catalog/columns.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/catalog/names.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/ddl.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/json.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/lib.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/placeholders.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/src/values.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/rust/crates/sqlty-sql/tests/timing.rs +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/skills/sqlty/SKILL.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/skills/sqlty-adopt/SKILL.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/skills/sqlty-breaking/SKILL.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/skills/sqlty-check/SKILL.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/skills/sqlty-rewrite/SKILL.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/__init__.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/__main__.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_config.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_core.pyi +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_decode.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_drivers.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_gitignore.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_json_shape.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_json_types.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_params.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_psycopg.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_source.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_type_extractor/__init__.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_type_extractor/ast_fields.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_type_extractor/compat.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_type_extractor/extract.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_type_extractor/generic.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_type_extractor/info.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_type_extractor/sandbox.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/_type_extractor/subtype.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/drivers/psycopg.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/magic.py +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/py.typed +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/ambiguous-column.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/column-count-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/column-name-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/column-type-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/fstring-skipped.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/inline-sql-comment.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/insert-missing-column.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/insert-value-count.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/json-shape-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/literal-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/mysql-sql-marker.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/narrow-type.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/nullable-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/param-count-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/param-type-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/redundant-literal.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/redundant-optional.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/select-star-no-schema.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/select-star.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/stale-rewrite.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/stale-type.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/tstring-skipped.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/typeddict-inheritance.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/typeddict-key-mismatch.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/unchecked-query.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/ungrouped-column.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/unknown-column.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/unknown-function.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/unknown-table.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/unparsed-query.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/unsupported-syntax.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/untyped-query.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty/rules/unused-ignore.md +0 -0
- {sqlty-0.2.1 → sqlty-0.2.2}/src/sqlty_magic.pth +0 -0
|
@@ -571,11 +571,11 @@ dependencies = [
|
|
|
571
571
|
|
|
572
572
|
[[package]]
|
|
573
573
|
name = "serde_spanned"
|
|
574
|
-
version = "
|
|
574
|
+
version = "1.1.2"
|
|
575
575
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
576
|
-
checksum = "
|
|
576
|
+
checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c"
|
|
577
577
|
dependencies = [
|
|
578
|
-
"
|
|
578
|
+
"serde_core",
|
|
579
579
|
]
|
|
580
580
|
|
|
581
581
|
[[package]]
|
|
@@ -614,7 +614,7 @@ dependencies = [
|
|
|
614
614
|
|
|
615
615
|
[[package]]
|
|
616
616
|
name = "sqlty-bench"
|
|
617
|
-
version = "0.2.
|
|
617
|
+
version = "0.2.2"
|
|
618
618
|
dependencies = [
|
|
619
619
|
"criterion",
|
|
620
620
|
"sqlty-python",
|
|
@@ -623,7 +623,7 @@ dependencies = [
|
|
|
623
623
|
|
|
624
624
|
[[package]]
|
|
625
625
|
name = "sqlty-core"
|
|
626
|
-
version = "0.2.
|
|
626
|
+
version = "0.2.2"
|
|
627
627
|
dependencies = [
|
|
628
628
|
"pyo3",
|
|
629
629
|
"recursive",
|
|
@@ -635,7 +635,7 @@ dependencies = [
|
|
|
635
635
|
|
|
636
636
|
[[package]]
|
|
637
637
|
name = "sqlty-python"
|
|
638
|
-
version = "0.2.
|
|
638
|
+
version = "0.2.2"
|
|
639
639
|
dependencies = [
|
|
640
640
|
"regex",
|
|
641
641
|
"sqlty-sql",
|
|
@@ -644,7 +644,7 @@ dependencies = [
|
|
|
644
644
|
|
|
645
645
|
[[package]]
|
|
646
646
|
name = "sqlty-sql"
|
|
647
|
-
version = "0.2.
|
|
647
|
+
version = "0.2.2"
|
|
648
648
|
dependencies = [
|
|
649
649
|
"insta",
|
|
650
650
|
"recursive",
|
|
@@ -742,44 +742,42 @@ dependencies = [
|
|
|
742
742
|
|
|
743
743
|
[[package]]
|
|
744
744
|
name = "toml"
|
|
745
|
-
version = "
|
|
745
|
+
version = "1.1.8+spec-1.1.0"
|
|
746
746
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
747
|
-
checksum = "
|
|
747
|
+
checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d"
|
|
748
748
|
dependencies = [
|
|
749
|
-
"
|
|
749
|
+
"indexmap",
|
|
750
|
+
"serde_core",
|
|
750
751
|
"serde_spanned",
|
|
751
752
|
"toml_datetime",
|
|
752
|
-
"
|
|
753
|
+
"toml_parser",
|
|
754
|
+
"toml_writer",
|
|
755
|
+
"winnow",
|
|
753
756
|
]
|
|
754
757
|
|
|
755
758
|
[[package]]
|
|
756
759
|
name = "toml_datetime"
|
|
757
|
-
version = "
|
|
760
|
+
version = "1.1.2+spec-1.1.0"
|
|
758
761
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
759
|
-
checksum = "
|
|
762
|
+
checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"
|
|
760
763
|
dependencies = [
|
|
761
|
-
"
|
|
764
|
+
"serde_core",
|
|
762
765
|
]
|
|
763
766
|
|
|
764
767
|
[[package]]
|
|
765
|
-
name = "
|
|
766
|
-
version = "
|
|
768
|
+
name = "toml_parser"
|
|
769
|
+
version = "1.1.5+spec-1.1.0"
|
|
767
770
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
768
|
-
checksum = "
|
|
771
|
+
checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c"
|
|
769
772
|
dependencies = [
|
|
770
|
-
"indexmap",
|
|
771
|
-
"serde",
|
|
772
|
-
"serde_spanned",
|
|
773
|
-
"toml_datetime",
|
|
774
|
-
"toml_write",
|
|
775
773
|
"winnow",
|
|
776
774
|
]
|
|
777
775
|
|
|
778
776
|
[[package]]
|
|
779
|
-
name = "
|
|
780
|
-
version = "
|
|
777
|
+
name = "toml_writer"
|
|
778
|
+
version = "1.1.3+spec-1.1.0"
|
|
781
779
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
782
|
-
checksum = "
|
|
780
|
+
checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770"
|
|
783
781
|
|
|
784
782
|
[[package]]
|
|
785
783
|
name = "unicode-ident"
|
|
@@ -845,12 +843,9 @@ dependencies = [
|
|
|
845
843
|
|
|
846
844
|
[[package]]
|
|
847
845
|
name = "winnow"
|
|
848
|
-
version = "0.
|
|
846
|
+
version = "1.0.4"
|
|
849
847
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
850
|
-
checksum = "
|
|
851
|
-
dependencies = [
|
|
852
|
-
"memchr",
|
|
853
|
-
]
|
|
848
|
+
checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
|
|
854
849
|
|
|
855
850
|
[[package]]
|
|
856
851
|
name = "zerocopy"
|
|
@@ -12,12 +12,13 @@
|
|
|
12
12
|
//! unless the wrapper call is one of `any_calls`
|
|
13
13
|
|
|
14
14
|
use regex::Regex;
|
|
15
|
+
use std::cell::RefCell;
|
|
15
16
|
use std::collections::HashMap;
|
|
17
|
+
use std::rc::Rc;
|
|
16
18
|
use std::sync::LazyLock;
|
|
17
19
|
|
|
18
20
|
use crate::edit::Edit;
|
|
19
21
|
use crate::options::{Dialect, Options};
|
|
20
|
-
use crate::rewriter::infer_sql_content as infer_from_sql_content;
|
|
21
22
|
use crate::rewriter::{
|
|
22
23
|
after_marker, decode_escapes, ends_marker_line, extract_string_content, marked_query,
|
|
23
24
|
strip_line_break, wraps, ImportStyle, Spelling,
|
|
@@ -25,10 +26,8 @@ use crate::rewriter::{
|
|
|
25
26
|
use crate::rules::{Rule, RuleConfig, Severity};
|
|
26
27
|
use crate::scan::Scan;
|
|
27
28
|
use crate::tokens::{content, Call};
|
|
28
|
-
use sqlty_sql::analyzer::{
|
|
29
|
-
|
|
30
|
-
};
|
|
31
|
-
use sqlty_sql::diagnostics::NameRule;
|
|
29
|
+
use sqlty_sql::analyzer::{expand_star, parse, row_type, Column, Parsed, SchemaData};
|
|
30
|
+
use sqlty_sql::diagnostics::{NameDiagnostic, NameRule};
|
|
32
31
|
use std::ops::Range;
|
|
33
32
|
|
|
34
33
|
/// `--sql SELECT ...`: a space after the marker, then the start of a SQL statement,
|
|
@@ -120,7 +119,7 @@ pub fn check_source(
|
|
|
120
119
|
any_calls: sorted(any_calls),
|
|
121
120
|
diagnostics: Vec::new(),
|
|
122
121
|
spelling: Spelling::of(&scan),
|
|
123
|
-
|
|
122
|
+
analyses: RefCell::default(),
|
|
124
123
|
};
|
|
125
124
|
if options.dialect == Dialect::MySql {
|
|
126
125
|
checker.mysql_markers();
|
|
@@ -144,12 +143,48 @@ struct Checker<'a> {
|
|
|
144
143
|
diagnostics: Vec<Diagnostic>,
|
|
145
144
|
/// How the module can spell the row types it names.
|
|
146
145
|
spelling: Spelling,
|
|
147
|
-
///
|
|
148
|
-
|
|
149
|
-
|
|
146
|
+
/// Each marked query's analysis, by its text, so no step parses a query twice.
|
|
147
|
+
analyses: RefCell<HashMap<String, Rc<Analysis>>>,
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
/// What the steps of [`check_source`] ask of one marked query.
|
|
151
|
+
struct Analysis {
|
|
152
|
+
parsed: Parsed,
|
|
153
|
+
/// The result columns; `None` when the query returns no rows or does not parse.
|
|
154
|
+
columns: Option<Vec<Column>>,
|
|
155
|
+
/// Why columns are untyped.
|
|
156
|
+
diagnostics: Vec<NameDiagnostic>,
|
|
157
|
+
row_type: Option<String>,
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
#[cfg(test)]
|
|
161
|
+
thread_local! {
|
|
162
|
+
static ANALYZED: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
|
|
150
163
|
}
|
|
151
164
|
|
|
152
165
|
impl Checker<'_> {
|
|
166
|
+
/// The analysis of `query`, a [`marked_query`], computed the first time a step asks.
|
|
167
|
+
fn analysis(&self, query: &str) -> Rc<Analysis> {
|
|
168
|
+
if let Some(analysis) = self.analyses.borrow().get(query) {
|
|
169
|
+
return Rc::clone(analysis);
|
|
170
|
+
}
|
|
171
|
+
#[cfg(test)]
|
|
172
|
+
ANALYZED.with(|count| count.set(count.get() + 1));
|
|
173
|
+
let parsed = parse(query, self.options.dialect.name());
|
|
174
|
+
let (columns, diagnostics) = parsed.analyze_with_diagnostics(self.options.schema);
|
|
175
|
+
let columns = columns.ok().flatten();
|
|
176
|
+
let analysis = Rc::new(Analysis {
|
|
177
|
+
row_type: columns.as_deref().and_then(row_type),
|
|
178
|
+
parsed,
|
|
179
|
+
columns,
|
|
180
|
+
diagnostics,
|
|
181
|
+
});
|
|
182
|
+
self.analyses
|
|
183
|
+
.borrow_mut()
|
|
184
|
+
.insert(query.to_string(), Rc::clone(&analysis));
|
|
185
|
+
analysis
|
|
186
|
+
}
|
|
187
|
+
|
|
153
188
|
fn report(&mut self, rule: Rule, message: String, line: usize) {
|
|
154
189
|
self.report_fix(rule, message, line, Vec::new());
|
|
155
190
|
}
|
|
@@ -181,7 +216,10 @@ impl Checker<'_> {
|
|
|
181
216
|
/// `--sql` strings that `rewrite` would wrap.
|
|
182
217
|
fn stale_rewrites(&mut self) {
|
|
183
218
|
let scan = self.scan;
|
|
184
|
-
|
|
219
|
+
let edits = wraps(scan, self.options, &|_| false, &|content| {
|
|
220
|
+
self.infer(content)
|
|
221
|
+
});
|
|
222
|
+
for edit in edits {
|
|
185
223
|
self.report_fix(
|
|
186
224
|
Rule::StaleRewrite,
|
|
187
225
|
"Source has --sql strings that aren't wrapped in SQL[T]".to_string(),
|
|
@@ -274,8 +312,8 @@ impl Checker<'_> {
|
|
|
274
312
|
);
|
|
275
313
|
}
|
|
276
314
|
if self.rules.is_enabled(Rule::UnparsedQuery) && !template {
|
|
277
|
-
if let Some(error) =
|
|
278
|
-
.and_then(|sql|
|
|
315
|
+
if let Some(error) =
|
|
316
|
+
marked_query(sql_content).and_then(|sql| self.analysis(&sql).parsed.error())
|
|
279
317
|
{
|
|
280
318
|
self.report(Rule::UnparsedQuery, unparsed_message(&error), line);
|
|
281
319
|
}
|
|
@@ -313,15 +351,8 @@ impl Checker<'_> {
|
|
|
313
351
|
return;
|
|
314
352
|
}
|
|
315
353
|
if let Some(query) = marked_query(sql_content) {
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
let inferred = columns
|
|
319
|
-
.ok()
|
|
320
|
-
.flatten()
|
|
321
|
-
.and_then(|columns| row_type(&columns));
|
|
322
|
-
self.inferred.insert(query, inferred);
|
|
323
|
-
for found in found {
|
|
324
|
-
self.report(Rule::Name(found.rule), found.message, line);
|
|
354
|
+
for found in &self.analysis(&query).diagnostics {
|
|
355
|
+
self.report(Rule::Name(found.rule), found.message.clone(), line);
|
|
325
356
|
}
|
|
326
357
|
}
|
|
327
358
|
}
|
|
@@ -332,11 +363,9 @@ impl Checker<'_> {
|
|
|
332
363
|
let Some(query) = marked_query(sql_content) else {
|
|
333
364
|
return;
|
|
334
365
|
};
|
|
335
|
-
let
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
self.options.schema.is_some(),
|
|
339
|
-
) else {
|
|
366
|
+
let stars = self.analysis(&query).parsed.result_stars();
|
|
367
|
+
let Some((rule, message)) = star_finding(stars, &query, self.options.schema.is_some())
|
|
368
|
+
else {
|
|
340
369
|
return;
|
|
341
370
|
};
|
|
342
371
|
let fix = match (rule, call.strings.as_slice(), self.options.schema) {
|
|
@@ -355,16 +384,7 @@ impl Checker<'_> {
|
|
|
355
384
|
/// The row type of marked string content, from the name diagnostics' analysis when
|
|
356
385
|
/// it ran.
|
|
357
386
|
fn infer(&self, sql_content: &str) -> Option<String> {
|
|
358
|
-
|
|
359
|
-
if let Some(inferred) = marked_query(sql_content).and_then(|q| self.inferred.get(&q)) {
|
|
360
|
-
return inferred.clone();
|
|
361
|
-
}
|
|
362
|
-
}
|
|
363
|
-
infer_from_sql_content(
|
|
364
|
-
sql_content,
|
|
365
|
-
self.options.dialect.name(),
|
|
366
|
-
self.options.schema,
|
|
367
|
-
)
|
|
387
|
+
self.analysis(&marked_query(sql_content)?).row_type.clone()
|
|
368
388
|
}
|
|
369
389
|
|
|
370
390
|
/// Why a query has no row type, and what to do about it: the first name or construct
|
|
@@ -374,9 +394,8 @@ impl Checker<'_> {
|
|
|
374
394
|
let Some(query) = marked_query(sql_content) else {
|
|
375
395
|
return "add casts (for example id::INTEGER) or a schema".to_string();
|
|
376
396
|
};
|
|
377
|
-
let (
|
|
378
|
-
|
|
379
|
-
if let Some(diagnostic) = diagnostics.first() {
|
|
397
|
+
let analysis = self.analysis(&query);
|
|
398
|
+
if let Some(diagnostic) = analysis.diagnostics.first() {
|
|
380
399
|
let hint = match diagnostic.rule {
|
|
381
400
|
NameRule::UnknownFunction => {
|
|
382
401
|
"; cast its result, or declare the function in the schema"
|
|
@@ -387,11 +406,10 @@ impl Checker<'_> {
|
|
|
387
406
|
};
|
|
388
407
|
return format!("{}{hint}", diagnostic.message);
|
|
389
408
|
}
|
|
390
|
-
let untyped: Vec<String> =
|
|
391
|
-
.
|
|
392
|
-
.flatten()
|
|
393
|
-
.unwrap_or_default()
|
|
409
|
+
let untyped: Vec<String> = analysis
|
|
410
|
+
.columns
|
|
394
411
|
.iter()
|
|
412
|
+
.flatten()
|
|
395
413
|
.filter(|column| column.python_type.is_none())
|
|
396
414
|
.map(|column| format!("`{}`", column.name))
|
|
397
415
|
.collect();
|
|
@@ -604,7 +622,16 @@ impl SiteKind {
|
|
|
604
622
|
/// assert!(select_star_finding("SELECT count(*) FROM users", "postgres", true).is_none());
|
|
605
623
|
/// ```
|
|
606
624
|
pub fn select_star_finding(query: &str, dialect: &str, has_schema: bool) -> Option<(Rule, String)> {
|
|
607
|
-
|
|
625
|
+
star_finding(parse(query, dialect).result_stars(), query, has_schema)
|
|
626
|
+
}
|
|
627
|
+
|
|
628
|
+
/// [`select_star_finding`] of the `stars` of `query`, `None` when it does not parse.
|
|
629
|
+
fn star_finding(
|
|
630
|
+
stars: Option<Vec<String>>,
|
|
631
|
+
query: &str,
|
|
632
|
+
has_schema: bool,
|
|
633
|
+
) -> Option<(Rule, String)> {
|
|
634
|
+
let stars = stars.unwrap_or_else(|| {
|
|
608
635
|
// A query that doesn't parse falls back to the text.
|
|
609
636
|
let upper = query.to_uppercase();
|
|
610
637
|
if upper.contains("SELECT *") || upper.contains("SELECT\n*") {
|
|
@@ -1124,6 +1151,41 @@ mod tests {
|
|
|
1124
1151
|
RuleConfig::from_overrides(Some(overrides)).unwrap()
|
|
1125
1152
|
}
|
|
1126
1153
|
|
|
1154
|
+
#[test]
|
|
1155
|
+
fn test_each_query_is_analyzed_once() {
|
|
1156
|
+
let (schema, _) = sqlty_sql::analyzer::load_schema_with_skipped(
|
|
1157
|
+
"CREATE TABLE users (id INTEGER NOT NULL, name TEXT);",
|
|
1158
|
+
"postgres",
|
|
1159
|
+
);
|
|
1160
|
+
let source = concat!(
|
|
1161
|
+
"from sqlty import SQL\n",
|
|
1162
|
+
"a = \"--sql\\nSELECT id, nope FROM users\"\n",
|
|
1163
|
+
"b = SQL[tuple[str]](\"--sql\\nSELECT * FROM users\")\n",
|
|
1164
|
+
"c = SQL[tuple[str]](\"--sql\\nSELECT * FROM users\")\n",
|
|
1165
|
+
"d = SQL[tuple[int]](\"--sql\\nSELEC 1\")\n",
|
|
1166
|
+
"e = \"--sql\\nSELECT id, nope FROM users\"\n",
|
|
1167
|
+
);
|
|
1168
|
+
ANALYZED.with(|count| count.set(0));
|
|
1169
|
+
let diags = check_source(
|
|
1170
|
+
source,
|
|
1171
|
+
"postgres",
|
|
1172
|
+
Some(&schema),
|
|
1173
|
+
&RuleConfig::default(),
|
|
1174
|
+
None,
|
|
1175
|
+
false,
|
|
1176
|
+
&[],
|
|
1177
|
+
);
|
|
1178
|
+
let rules: Vec<Rule> = diags.iter().map(|d| d.rule).collect();
|
|
1179
|
+
assert!(
|
|
1180
|
+
rules.contains(&Rule::Name(NameRule::UnknownColumn)),
|
|
1181
|
+
"{rules:?}"
|
|
1182
|
+
);
|
|
1183
|
+
assert!(rules.contains(&Rule::SelectStar), "{rules:?}");
|
|
1184
|
+
assert!(rules.contains(&Rule::NarrowType), "{rules:?}");
|
|
1185
|
+
assert!(rules.contains(&Rule::UnparsedQuery), "{rules:?}");
|
|
1186
|
+
assert_eq!(ANALYZED.with(std::cell::Cell::get), 3);
|
|
1187
|
+
}
|
|
1188
|
+
|
|
1127
1189
|
#[test]
|
|
1128
1190
|
fn test_detects_stale_rewrite() {
|
|
1129
1191
|
let source = r#"q = "--sql\nSELECT 1::INTEGER""#;
|
|
@@ -133,7 +133,10 @@ pub(crate) fn rewrite_scan(
|
|
|
133
133
|
keep_lines: bool,
|
|
134
134
|
skip: &dyn Fn(usize) -> bool,
|
|
135
135
|
) -> Option<String> {
|
|
136
|
-
let
|
|
136
|
+
let (dialect, schema) = (options.dialect.name(), options.schema);
|
|
137
|
+
let replacements = wraps(scan, options, skip, &|content| {
|
|
138
|
+
infer_sql_content(content, dialect, schema)
|
|
139
|
+
});
|
|
137
140
|
if replacements.is_empty() {
|
|
138
141
|
return None;
|
|
139
142
|
}
|
|
@@ -280,9 +283,15 @@ pub(crate) fn line_ending(source: &str, at: usize) -> &'static str {
|
|
|
280
283
|
/// a wrapper call (`mod.SQL[...]` included), the argument of a psycopg `SQL(...)`,
|
|
281
284
|
/// groups with a prefixed string, and
|
|
282
285
|
/// every group on a line that holds an f- or t-string `--sql` group.
|
|
283
|
-
|
|
286
|
+
/// `infer` gives the row type of a group's content.
|
|
287
|
+
pub(crate) fn wraps(
|
|
288
|
+
scan: &Scan,
|
|
289
|
+
options: &Options,
|
|
290
|
+
skip: &dyn Fn(usize) -> bool,
|
|
291
|
+
infer: &dyn Fn(&str) -> Option<String>,
|
|
292
|
+
) -> Vec<Edit> {
|
|
284
293
|
let source = scan.source();
|
|
285
|
-
let
|
|
294
|
+
let dialect = options.dialect.name();
|
|
286
295
|
let (istyle, untyped) = (&options.style, options.untyped);
|
|
287
296
|
let interpolated: Vec<usize> = scan
|
|
288
297
|
.groups()
|
|
@@ -315,13 +324,12 @@ pub(crate) fn wraps(scan: &Scan, options: &Options, skip: &dyn Fn(usize) -> bool
|
|
|
315
324
|
continue;
|
|
316
325
|
}
|
|
317
326
|
let content = scan.content(group);
|
|
318
|
-
|
|
319
|
-
if after_marker(content).is_none() {
|
|
327
|
+
if after_marker(content.trim()).is_none() {
|
|
320
328
|
continue;
|
|
321
329
|
}
|
|
322
|
-
let type_str = match
|
|
330
|
+
let type_str = match infer(&content) {
|
|
323
331
|
Some(inferred) => spelling.respell(inferred),
|
|
324
|
-
None if untyped && is_untyped(content, dialect) => istyle.untyped_name(),
|
|
332
|
+
None if untyped && is_untyped(&content, dialect) => istyle.untyped_name(),
|
|
325
333
|
// Don't wrap when inference fails — SQL[Any] is never useful.
|
|
326
334
|
None => continue,
|
|
327
335
|
};
|
|
@@ -52,6 +52,8 @@ pub enum Rule {
|
|
|
52
52
|
TstringSkipped,
|
|
53
53
|
/// A `--sql` query that is not plain string literals.
|
|
54
54
|
UncheckedQuery,
|
|
55
|
+
/// A helper call whose query is not a string literal.
|
|
56
|
+
DynamicQuery,
|
|
55
57
|
/// A `SQL[UNTYPED]` query.
|
|
56
58
|
UntypedQuery,
|
|
57
59
|
/// A query that does not parse, so it cannot be checked.
|
|
@@ -68,7 +70,7 @@ pub enum Rule {
|
|
|
68
70
|
|
|
69
71
|
impl Rule {
|
|
70
72
|
/// Every rule.
|
|
71
|
-
pub const ALL: [Rule;
|
|
73
|
+
pub const ALL: [Rule; 35] = [
|
|
72
74
|
Rule::ColumnCountMismatch,
|
|
73
75
|
Rule::ColumnTypeMismatch,
|
|
74
76
|
Rule::ColumnNameMismatch,
|
|
@@ -89,6 +91,7 @@ impl Rule {
|
|
|
89
91
|
Rule::FstringSkipped,
|
|
90
92
|
Rule::TstringSkipped,
|
|
91
93
|
Rule::UncheckedQuery,
|
|
94
|
+
Rule::DynamicQuery,
|
|
92
95
|
Rule::UntypedQuery,
|
|
93
96
|
Rule::UnparsedQuery,
|
|
94
97
|
Rule::UnusedIgnore,
|
|
@@ -128,6 +131,7 @@ impl Rule {
|
|
|
128
131
|
Rule::FstringSkipped => "fstring-skipped",
|
|
129
132
|
Rule::TstringSkipped => "tstring-skipped",
|
|
130
133
|
Rule::UncheckedQuery => "unchecked-query",
|
|
134
|
+
Rule::DynamicQuery => "dynamic-query",
|
|
131
135
|
Rule::UntypedQuery => "untyped-query",
|
|
132
136
|
Rule::UnparsedQuery => "unparsed-query",
|
|
133
137
|
Rule::UnusedIgnore => "unused-ignore",
|
|
@@ -179,7 +183,9 @@ impl Rule {
|
|
|
179
183
|
| Rule::Name(
|
|
180
184
|
NameRule::UnknownFunction | NameRule::UnknownType | NameRule::UnsupportedSyntax,
|
|
181
185
|
) => Severity::Warn,
|
|
182
|
-
Rule::RedundantOptional | Rule::RedundantLiteral =>
|
|
186
|
+
Rule::RedundantOptional | Rule::RedundantLiteral | Rule::DynamicQuery => {
|
|
187
|
+
Severity::Ignore
|
|
188
|
+
}
|
|
183
189
|
}
|
|
184
190
|
}
|
|
185
191
|
}
|
|
@@ -321,6 +327,7 @@ mod tests {
|
|
|
321
327
|
assert_eq!(config.severity(Rule::NarrowType), Severity::Error);
|
|
322
328
|
assert_eq!(config.severity(Rule::UnparsedQuery), Severity::Warn);
|
|
323
329
|
assert_eq!(config.severity(Rule::RedundantOptional), Severity::Ignore);
|
|
330
|
+
assert_eq!(config.severity(Rule::DynamicQuery), Severity::Ignore);
|
|
324
331
|
assert_eq!(
|
|
325
332
|
config.severity(Rule::Name(NameRule::UnknownTable)),
|
|
326
333
|
Severity::Error
|
|
@@ -20,10 +20,10 @@ thiserror.workspace = true
|
|
|
20
20
|
|
|
21
21
|
[build-dependencies]
|
|
22
22
|
serde = { version = "1", features = ["derive"] }
|
|
23
|
-
toml = "
|
|
23
|
+
toml = "1.1"
|
|
24
24
|
|
|
25
25
|
[dev-dependencies]
|
|
26
26
|
insta.workspace = true
|
|
27
27
|
# For `tests/inference_compiler.rs`, which tests the build script's compiler.
|
|
28
28
|
serde = { version = "1", features = ["derive"] }
|
|
29
|
-
toml = "
|
|
29
|
+
toml = "1.1"
|
|
@@ -885,6 +885,15 @@ fn generate(rules: &[Rule], extensions: &[Extension]) -> String {
|
|
|
885
885
|
"#[cfg(test)]\npub(crate) const EXTENDING_DIALECTS: &[&str] = &[{}];",
|
|
886
886
|
names.join(", ")
|
|
887
887
|
);
|
|
888
|
+
out.push_str("\n/// The bit of the SQL type `sql` in an operand predicate; none for a type no rule can name.\n");
|
|
889
|
+
out.push_str("fn type_bit(sql: &str) -> u128 {\n match sql {\n");
|
|
890
|
+
for name in SQL_TYPES {
|
|
891
|
+
let _ = writeln!(out, " {name:?} => {:#x},", type_bit(name));
|
|
892
|
+
}
|
|
893
|
+
let _ = writeln!(
|
|
894
|
+
out,
|
|
895
|
+
" _ => 0,\n }}\n}}\n\nconst KNOWN: u128 = {KNOWN:#x};"
|
|
896
|
+
);
|
|
888
897
|
out
|
|
889
898
|
}
|
|
890
899
|
|
|
@@ -1042,14 +1051,27 @@ fn operand(types: &Types) -> String {
|
|
|
1042
1051
|
match types {
|
|
1043
1052
|
None => "None".to_string(),
|
|
1044
1053
|
Some(pred) => format!(
|
|
1045
|
-
"Some(
|
|
1054
|
+
"Some({:#x} /* {} */)",
|
|
1055
|
+
pred.types
|
|
1056
|
+
.iter()
|
|
1057
|
+
.map(|name| type_bit(name))
|
|
1058
|
+
.fold(if pred.known { KNOWN } else { 0 }, |mask, bit| mask | bit),
|
|
1046
1059
|
pred.known
|
|
1047
1060
|
.then_some("@known")
|
|
1048
1061
|
.into_iter()
|
|
1049
1062
|
.chain(pred.types.iter().copied())
|
|
1050
|
-
.map(|t| format!("{t:?}"))
|
|
1051
1063
|
.collect::<Vec<_>>()
|
|
1052
|
-
.join("
|
|
1064
|
+
.join(" | ")
|
|
1053
1065
|
),
|
|
1054
1066
|
}
|
|
1055
1067
|
}
|
|
1068
|
+
|
|
1069
|
+
/// The bit `@known` sets in an operand predicate; [`SQL_TYPES`] take the bits below it.
|
|
1070
|
+
const KNOWN: u128 = 1 << 127;
|
|
1071
|
+
const _: () = assert!(SQL_TYPES.len() < 127);
|
|
1072
|
+
|
|
1073
|
+
/// The bit of the SQL type `name` in an operand predicate.
|
|
1074
|
+
fn type_bit(name: &str) -> u128 {
|
|
1075
|
+
let at = SQL_TYPES.iter().position(|known| *known == name).unwrap();
|
|
1076
|
+
1 << at
|
|
1077
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
# SQLite date and time functions.
|
|
2
|
+
|
|
3
|
+
[[function]]
|
|
4
|
+
id = "sqlite.datetime.bigint"
|
|
5
|
+
function = "UNIXEPOCH"
|
|
6
|
+
dialects = ["sqlite"]
|
|
7
|
+
type = "BIGINT"
|
|
8
|
+
nullability = "code"
|
|
9
|
+
reference = "SQLite documentation, Date And Time Functions"
|
|
10
|
+
reasoning = "The function returns an integer. SQLite also returns NULL for a time value or modifier it cannot read. With no argument, or `'now'` alone, it reads the current time and is never NULL; `analyzer/nullability.rs` checks the arguments."
|
|
11
|
+
|
|
12
|
+
[[function]]
|
|
13
|
+
id = "sqlite.datetime.double"
|
|
14
|
+
function = "JULIANDAY"
|
|
15
|
+
dialects = ["sqlite"]
|
|
16
|
+
type = "DOUBLE"
|
|
17
|
+
nullability = "code"
|
|
18
|
+
reference = "SQLite documentation, Date And Time Functions"
|
|
19
|
+
reasoning = "The function returns a floating-point value. SQLite also returns NULL for a time value or modifier it cannot read. With no argument, or `'now'` alone, it reads the current time and is never NULL; `analyzer/nullability.rs` checks the arguments."
|
|
20
|
+
|
|
21
|
+
[[function]]
|
|
22
|
+
id = "sqlite.datetime.text"
|
|
23
|
+
functions = ["DATE", "TIME", "DATETIME"]
|
|
24
|
+
dialects = ["sqlite"]
|
|
25
|
+
type = "TEXT"
|
|
26
|
+
nullability = "code"
|
|
27
|
+
reference = "SQLite documentation, Date And Time Functions"
|
|
28
|
+
reasoning = "Each of these returns text. SQLite also returns NULL for a time value or modifier it cannot read. With no argument, or `'now'` alone, each reads the current time and is never NULL; `analyzer/nullability.rs` checks the arguments."
|
|
29
|
+
|
|
30
|
+
[[function]]
|
|
31
|
+
id = "sqlite.datetime.formatted"
|
|
32
|
+
functions = ["TIMEDIFF", "STRFTIME"]
|
|
33
|
+
dialects = ["sqlite"]
|
|
34
|
+
type = "TEXT"
|
|
35
|
+
nullability = "nullable"
|
|
36
|
+
reference = "SQLite documentation, Date And Time Functions"
|
|
37
|
+
reasoning = "Each of these returns text. SQLite also returns NULL for a time value, modifier or format it cannot read, even for the current time."
|