Support two-argument TRIM(string, characters) in PostgreSQL (apache#2240)

Author: LucaCappelletti94

src/ast/mod.rs

@@ -1131,7 +1131,7 @@ pub enum Expr {
     /// ```sql
     /// TRIM([BOTH | LEADING | TRAILING] [<expr> FROM] <expr>)
     /// TRIM(<expr>)
-    /// TRIM(<expr>, [, characters]) -- only Snowflake or Bigquery
+    /// TRIM(<expr>, [, characters]) -- PostgreSQL, DuckDB, Snowflake, BigQuery, Generic
     /// ```
     Trim {
         /// The expression to trim from.

src/dialect/bigquery.rs

@@ -162,4 +162,8 @@ impl Dialect for BigQueryDialect {
     fn supports_select_wildcard_replace(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }

src/dialect/clickhouse.rs

@@ -141,4 +141,8 @@ impl Dialect for ClickHouseDialect {
     fn supports_select_wildcard_replace(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }

src/dialect/duckdb.rs

@@ -129,4 +129,8 @@ impl Dialect for DuckDbDialect {
     fn supports_select_wildcard_replace(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }

src/dialect/generic.rs

@@ -284,4 +284,8 @@ impl Dialect for GenericDialect {
     fn supports_key_column_option(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }

src/dialect/mod.rs

@@ -1651,6 +1651,12 @@ pub trait Dialect: Debug + Any {
     fn supports_select_format(&self) -> bool {
         false
     }
+
+    /// Returns true if the dialect supports the two-argument comma-separated
+    /// form of the `TRIM` function: `TRIM(expr, characters)`.
+    fn supports_comma_separated_trim(&self) -> bool {
+        false
+    }
 }
 
 /// Operators for which precedence must be defined.

src/dialect/postgresql.rs

@@ -306,4 +306,8 @@ impl Dialect for PostgreSqlDialect {
     fn supports_create_table_like_parenthesized(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }

src/dialect/snowflake.rs

@@ -667,6 +667,10 @@ impl Dialect for SnowflakeDialect {
     fn supports_lambda_functions(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }
 
 // Peeks ahead to identify tokens that are expected after

src/dialect/sqlite.rs

@@ -120,4 +120,8 @@ impl Dialect for SQLiteDialect {
     fn supports_notnull_operator(&self) -> bool {
         true
     }
+
+    fn supports_comma_separated_trim(&self) -> bool {
+        true
+    }
 }

src/parser/mod.rs

@@ -2940,7 +2940,7 @@ impl<'a> Parser<'a> {
     /// ```sql
     /// TRIM ([WHERE] ['text' FROM] 'text')
     /// TRIM ('text')
-    /// TRIM(<expr>, [, characters]) -- only Snowflake or BigQuery
+    /// TRIM(<expr>, [, characters]) -- PostgreSQL, DuckDB, Snowflake, BigQuery, Generic
     /// ```
     pub fn parse_trim_expr(&mut self) -> Result<Expr, ParserError> {
         self.expect_token(&Token::LParen)?;
@@ -2961,8 +2961,7 @@ impl<'a> Parser<'a> {
                 trim_what: Some(trim_what),
                 trim_characters: None,
             })
-        } else if self.consume_token(&Token::Comma)
-            && dialect_of!(self is DuckDbDialect | SnowflakeDialect | BigQueryDialect | GenericDialect)
+        } else if self.dialect.supports_comma_separated_trim() && self.consume_token(&Token::Comma)
         {
             let characters = self.parse_comma_separated(Parser::parse_expr)?;
             self.expect_token(&Token::RParen)?;