Merge pull request #21 from fmguerreiro/fix/postgres-unreserve-fulltext

fix(parser): guard MySQL FULLTEXT/SPATIAL table constraint on dialect

Author: fmguerreiro

Cargo.toml

@@ -18,7 +18,7 @@
 [package]
 name = "pgmold-sqlparser"
 description = "Fork of sqlparser with additional PostgreSQL features (PARTITION OF, SECURITY DEFINER/INVOKER, SET params, EXCLUDE, TEXT SEARCH, AGGREGATE, FOREIGN TABLE/FDW, PUBLICATION, SUBSCRIPTION, ALTER DOMAIN/TRIGGER/EXTENSION, CAST, CONVERSION, LANGUAGE, RULE, STATISTICS, ACCESS METHOD, EVENT TRIGGER, TRANSFORM, SECURITY LABEL, USER MAPPING, TABLESPACE)"
-version = "0.60.12"
+version = "0.60.13"
 authors = ["Filipe Guerreiro <filipe.m.guerreiro@gmail.com>"]
 homepage = "https://github.com/fmguerreiro/datafusion-sqlparser-rs"
 documentation = "https://docs.rs/pgmold-sqlparser/"

src/parser/mod.rs

@@ -10018,6 +10018,19 @@ impl<'a> Parser<'a> {
             None
         };
 
+        // FULLTEXT and SPATIAL are MySQL-specific table constraint keywords. For
+        // dialects that don't support them (e.g. PostgreSQL) they are valid
+        // identifiers and must not be consumed here — the caller will parse them
+        // as column names instead.
+        if name.is_none()
+            && self
+                .peek_one_of_keywords(&[Keyword::FULLTEXT, Keyword::SPATIAL])
+                .is_some()
+            && !dialect_of!(self is GenericDialect | MySqlDialect)
+        {
+            return Ok(None);
+        }
+
         let next_token = self.next_token();
         match next_token.token {
             Token::Word(w) if w.keyword == Keyword::UNIQUE => {

tests/sqlparser_postgres.rs

@@ -7220,6 +7220,20 @@ fn parse_ts_datatypes() {
     }
 }
 
+#[test]
+fn parse_fulltext_column_and_index_in_postgres() {
+    match pg().verified_stmt("CREATE TABLE film (fulltext TSVECTOR NOT NULL)") {
+        Statement::CreateTable(CreateTable { columns, .. }) => {
+            assert_eq!(columns.len(), 1);
+            assert_eq!(columns[0].name.value, "fulltext");
+            assert_eq!(columns[0].data_type, DataType::TsVector);
+        }
+        _ => unreachable!(),
+    }
+
+    pg().verified_stmt("CREATE INDEX film_fulltext_idx ON film USING gist (fulltext)");
+}
+
 #[test]
 fn parse_alter_table_constraint_not_valid() {
     match pg_and_generic().verified_stmt(