From 5145f2f0bb32afd2130fb71e0c2e8fc54705a79f Mon Sep 17 00:00:00 2001 From: Jannic Warken Date: Thu, 15 May 2025 17:57:39 +0200 Subject: [PATCH] Rename rule to SA201 --- .../sqlalchemy/{SA001.py => SA201.py} | 0 crates/ruff_linter/src/codes.rs | 2 +- .../ruff_linter/src/rules/sqlalchemy/mod.rs | 2 +- .../rules/missing_mapped_type_annotation.rs | 2 +- ...s__sqlalchemy__tests__SA201_SA201.py.snap} | 44 +++++++++---------- ruff.schema.json | 6 +-- 6 files changed, 28 insertions(+), 28 deletions(-) rename crates/ruff_linter/resources/test/fixtures/sqlalchemy/{SA001.py => SA201.py} (100%) rename crates/ruff_linter/src/rules/sqlalchemy/snapshots/{ruff_linter__rules__sqlalchemy__tests__SA001_SA001.py.snap => ruff_linter__rules__sqlalchemy__tests__SA201_SA201.py.snap} (70%) diff --git a/crates/ruff_linter/resources/test/fixtures/sqlalchemy/SA001.py b/crates/ruff_linter/resources/test/fixtures/sqlalchemy/SA201.py similarity index 100% rename from crates/ruff_linter/resources/test/fixtures/sqlalchemy/SA001.py rename to crates/ruff_linter/resources/test/fixtures/sqlalchemy/SA201.py diff --git a/crates/ruff_linter/src/codes.rs b/crates/ruff_linter/src/codes.rs index eb4682a79b..ad7e418005 100644 --- a/crates/ruff_linter/src/codes.rs +++ b/crates/ruff_linter/src/codes.rs @@ -1143,7 +1143,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> { (Flake8Logging, "015") => (RuleGroup::Stable, rules::flake8_logging::rules::RootLoggerCall), // SQLAlchemy - (SQLAlchemy, "001") => (RuleGroup::Preview, rules::sqlalchemy::rules::SQLAlchemyMissingMappedTypeAnnotation), + (SQLAlchemy, "201") => (RuleGroup::Preview, rules::sqlalchemy::rules::SQLAlchemyMissingMappedTypeAnnotation), _ => return None, }) diff --git a/crates/ruff_linter/src/rules/sqlalchemy/mod.rs b/crates/ruff_linter/src/rules/sqlalchemy/mod.rs index 19d5446de9..37ec857f41 100644 --- a/crates/ruff_linter/src/rules/sqlalchemy/mod.rs +++ b/crates/ruff_linter/src/rules/sqlalchemy/mod.rs @@ -12,7 +12,7 @@ mod tests { use crate::test::test_path; use crate::{assert_messages, settings}; - #[test_case(Rule::SQLAlchemyMissingMappedTypeAnnotation, Path::new("SA001.py"))] + #[test_case(Rule::SQLAlchemyMissingMappedTypeAnnotation, Path::new("SA201.py"))] fn rules(rule_code: Rule, path: &Path) -> Result<()> { let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy()); let diagnostics = test_path( diff --git a/crates/ruff_linter/src/rules/sqlalchemy/rules/missing_mapped_type_annotation.rs b/crates/ruff_linter/src/rules/sqlalchemy/rules/missing_mapped_type_annotation.rs index 299d3109d1..1788500daf 100644 --- a/crates/ruff_linter/src/rules/sqlalchemy/rules/missing_mapped_type_annotation.rs +++ b/crates/ruff_linter/src/rules/sqlalchemy/rules/missing_mapped_type_annotation.rs @@ -70,7 +70,7 @@ impl Violation for SQLAlchemyMissingMappedTypeAnnotation { } } -/// SA001 +/// SA201 pub(crate) fn missing_mapped_type_annotation(checker: &mut Checker, body: &[Stmt]) { if !checker.semantic().seen_module(Modules::SQLALCHEMY) { return; diff --git a/crates/ruff_linter/src/rules/sqlalchemy/snapshots/ruff_linter__rules__sqlalchemy__tests__SA001_SA001.py.snap b/crates/ruff_linter/src/rules/sqlalchemy/snapshots/ruff_linter__rules__sqlalchemy__tests__SA201_SA201.py.snap similarity index 70% rename from crates/ruff_linter/src/rules/sqlalchemy/snapshots/ruff_linter__rules__sqlalchemy__tests__SA001_SA001.py.snap rename to crates/ruff_linter/src/rules/sqlalchemy/snapshots/ruff_linter__rules__sqlalchemy__tests__SA201_SA201.py.snap index 408bf3e928..54581ac1b7 100644 --- a/crates/ruff_linter/src/rules/sqlalchemy/snapshots/ruff_linter__rules__sqlalchemy__tests__SA001_SA001.py.snap +++ b/crates/ruff_linter/src/rules/sqlalchemy/snapshots/ruff_linter__rules__sqlalchemy__tests__SA201_SA201.py.snap @@ -1,100 +1,100 @@ --- source: crates/ruff_linter/src/rules/sqlalchemy/mod.rs --- -SA001.py:52:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:52:5: SA201 Missing `Mapped` or other ORM container class type annotation | 50 | __tablename__ = "company" 51 | 52 | id = mapped_column(Integer, primary_key=True) - | ^^ SA001 + | ^^ SA201 53 | employees = relationship("Employee", back_populates="company") | -SA001.py:53:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:53:5: SA201 Missing `Mapped` or other ORM container class type annotation | 52 | id = mapped_column(Integer, primary_key=True) 53 | employees = relationship("Employee", back_populates="company") - | ^^^^^^^^^ SA001 + | ^^^^^^^^^ SA201 54 | 55 | name = mapped_column(String) | -SA001.py:55:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:55:5: SA201 Missing `Mapped` or other ORM container class type annotation | 53 | employees = relationship("Employee", back_populates="company") 54 | 55 | name = mapped_column(String) - | ^^^^ SA001 + | ^^^^ SA201 56 | company_name = synonym("name") | -SA001.py:56:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:56:5: SA201 Missing `Mapped` or other ORM container class type annotation | 55 | name = mapped_column(String) 56 | company_name = synonym("name") - | ^^^^^^^^^^^^ SA001 + | ^^^^^^^^^^^^ SA201 | -SA001.py:62:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:62:5: SA201 Missing `Mapped` or other ORM container class type annotation | 60 | __tablename__ = "employee" 61 | 62 | id = mapped_column(Integer, primary_key=True) - | ^^ SA001 + | ^^ SA201 63 | company_id = mapped_column(ForeignKey("company.id")) 64 | company = relationship("Company", back_populates="employees") | -SA001.py:63:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:63:5: SA201 Missing `Mapped` or other ORM container class type annotation | 62 | id = mapped_column(Integer, primary_key=True) 63 | company_id = mapped_column(ForeignKey("company.id")) - | ^^^^^^^^^^ SA001 + | ^^^^^^^^^^ SA201 64 | company = relationship("Company", back_populates="employees") | -SA001.py:64:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:64:5: SA201 Missing `Mapped` or other ORM container class type annotation | 62 | id = mapped_column(Integer, primary_key=True) 63 | company_id = mapped_column(ForeignKey("company.id")) 64 | company = relationship("Company", back_populates="employees") - | ^^^^^^^ SA001 + | ^^^^^^^ SA201 65 | 66 | company_name = association_proxy("company", "name") | -SA001.py:66:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:66:5: SA201 Missing `Mapped` or other ORM container class type annotation | 64 | company = relationship("Company", back_populates="employees") 65 | 66 | company_name = association_proxy("company", "name") - | ^^^^^^^^^^^^ SA001 + | ^^^^^^^^^^^^ SA201 67 | 68 | first_name = mapped_column(String) | -SA001.py:68:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:68:5: SA201 Missing `Mapped` or other ORM container class type annotation | 66 | company_name = association_proxy("company", "name") 67 | 68 | first_name = mapped_column(String) - | ^^^^^^^^^^ SA001 + | ^^^^^^^^^^ SA201 69 | last_name = mapped_column(String) | -SA001.py:69:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:69:5: SA201 Missing `Mapped` or other ORM container class type annotation | 68 | first_name = mapped_column(String) 69 | last_name = mapped_column(String) - | ^^^^^^^^^ SA001 + | ^^^^^^^^^ SA201 70 | 71 | name_length = column_property(func.length(first_name + last_name)) | -SA001.py:71:5: SA001 Missing `Mapped` or other ORM container class type annotation +SA201.py:71:5: SA201 Missing `Mapped` or other ORM container class type annotation | 69 | last_name = mapped_column(String) 70 | 71 | name_length = column_property(func.length(first_name + last_name)) - | ^^^^^^^^^^^ SA001 + | ^^^^^^^^^^^ SA201 | diff --git a/ruff.schema.json b/ruff.schema.json index 0bc2a50051..93a6d15e24 100644 --- a/ruff.schema.json +++ b/ruff.schema.json @@ -4138,9 +4138,9 @@ "S702", "S704", "SA", - "SA0", - "SA00", - "SA001", + "SA2", + "SA20", + "SA201", "SIM", "SIM1", "SIM10",