Add option to convert "<>" to "!=" (#18)

Author: ppputtyo

README.md

@@ -82,7 +82,8 @@ If there is no configuration file, the default values are used.
 | [`remove_table_as_keyword`](docs/options/remove_table_as_keyword.md)           | bool                                 | Remove `AS` in table aliases.                                                                                                                                                                                                                          | true    |
 | [`remove_redundant_nest`](docs/options/remove_redundant_nest.md)               | bool                                 | Remove redundant parentheses. (e.g. `(((foo)))` → `(foo)`)                                                                                                                                                                                             | true    |
 | [`complement_sql_id`](docs/options/complement_sql_id.md)                       | bool                                 | Complement [SQL ID](https://palette-doc.rtfa.as/coding-standards/forSQL/SQL%E3%82%B3%E3%83%BC%E3%83%87%E3%82%A3%E3%83%B3%E3%82%B0%E8%A6%8F%E7%B4%84%EF%BC%88uroboroSQL%EF%BC%89.html#sql-%E8%AD%98%E5%88%A5%E5%AD%90).                                 | false   |
-| [`convert_double_colon_cast`](docs/options/convert_double_colon_cast.md)         | bool                                 | Convert casts by `X::type` to the form `CAST(X AS type)`.                                                                                                                                                                                              | true    |
+| [`convert_double_colon_cast`](docs/options/convert_double_colon_cast.md)       | bool                                 | Convert casts by `X::type` to the form `CAST(X AS type)`.                                                                                                                                                                                              | true    |
+| [`unify_not_equal`](docs/options/unify_not_equal.md)                           | bool                                 | Convert comparison operator `<>` to `!=`                                                                                                                                                                                                               | true    |
 
 ## Structure
 

crates/uroborosql-fmt/src/config.rs

@@ -65,6 +65,11 @@ fn default_convert_double_colon_cast() -> bool {
     true
 }
 
+/// unify_not_equalのデフォルト値(true)
+fn default_unify_not_equal() -> bool {
+    true
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "lowercase")]
 pub(crate) enum Case {
@@ -138,6 +143,9 @@ pub struct Config {
     /// `X::type`のキャストを`CAST(X AS type)`に変換する
     #[serde(default = "default_convert_double_colon_cast")]
     pub(crate) convert_double_colon_cast: bool,
+    /// not_equalを!=に統一する
+    #[serde(default = "default_unify_not_equal")]
+    pub(crate) unify_not_equal: bool,
 }
 
 impl Config {
@@ -158,6 +166,7 @@ impl Config {
             remove_redundant_nest: default_remove_redundant_nest(),
             complement_sql_id: default_complement_sql_id(),
             convert_double_colon_cast: default_convert_double_colon_cast(),
+            unify_not_equal: default_unify_not_equal(),
         }
     }
 
@@ -201,6 +210,7 @@ pub(crate) fn load_never_complement_settings() {
         remove_table_as_keyword: false,
         remove_redundant_nest: false,
         convert_double_colon_cast: false,
+        unify_not_equal: false,
     };
 
     *CONFIG.write().unwrap() = config;

crates/uroborosql-fmt/src/visitor/expr/binary.rs

@@ -1,6 +1,7 @@
 use tree_sitter::TreeCursor;
 
 use crate::{
+    config::CONFIG,
     cst::*,
     error::UroboroSQLFmtError,
     visitor::{ensure_kind, Visitor},
@@ -27,7 +28,12 @@ impl Visitor {
 
         // 演算子
         let op_node = cursor.node();
-        let op_str = op_node.utf8_text(src.as_ref()).unwrap().to_string();
+        let mut op_str = op_node.utf8_text(src.as_ref()).unwrap().to_string();
+
+        // unify_not_equalがtrueの場合は <> を != に統一する
+        if CONFIG.read().unwrap().unify_not_equal && op_str == "<>" {
+            op_str = "!=".to_string();
+        }
 
         cursor.goto_next_sibling();
         // cursor -> _expression

crates/uroborosql-fmt/testfiles/config_test/configs/config1.json

@@ -11,5 +11,6 @@
   "remove_table_as_keyword": false,
   "remove_redundant_parentheses": true,
   "complement_sql_id": true,
-  "convert_double_colon_cast": true
+  "convert_double_colon_cast": true,
+  "unify_not_equal": true
 }

crates/uroborosql-fmt/testfiles/config_test/configs/config2.json

@@ -11,5 +11,6 @@
   "remove_table_as_keyword": true,
   "remove_redundant_nest": false,
   "complement_sql_id": false,
-  "convert_double_colon_cast": true
+  "convert_double_colon_cast": true,
+  "unify_not_equal": true
 }

crates/uroborosql-fmt/testfiles/config_test/configs/config3.json

@@ -11,5 +11,6 @@
   "remove_table_as_keyword": false,
   "remove_redundant_parentheses": true,
   "complement_sql_id": false,
-  "convert_double_colon_cast": false
+  "convert_double_colon_cast": false,
+  "unify_not_equal": false
 }

crates/uroborosql-fmt/testfiles/config_test/configs/config4.json

@@ -11,5 +11,6 @@
   "remove_table_as_keyword": false,
   "remove_redundant_nest": false,
   "complement_sql_id": false,
-  "convert_double_colon_cast": false
+  "convert_double_colon_cast": false,
+  "unify_not_equal": false
 }

crates/uroborosql-fmt/testfiles/config_test/dst_config1/not_euqal.sql

@@ -0,0 +1,14 @@
+SELECT /* _SQL_ID_ */
+	*
+FROM
+	STUDENTS
+WHERE
+	STUDENT_ID	!=	2
+;
+SELECT
+	*
+FROM
+	STUDENTS
+WHERE
+	STUDENT_ID	!=	2
+;

crates/uroborosql-fmt/testfiles/config_test/dst_config2/not_euqal.sql

@@ -0,0 +1,14 @@
+SELECT
+	*
+FROM
+	students
+WHERE
+	student_id	!=	2
+;
+SELECT
+	*
+FROM
+	students
+WHERE
+	student_id	!=	2
+;

crates/uroborosql-fmt/testfiles/config_test/dst_config3/not_euqal.sql

@@ -0,0 +1,14 @@
+select
+	*
+from
+	students
+where
+	student_id	<>	2
+;
+select
+	*
+from
+	students
+where
+	student_id	!=	2
+;