Merge branch 'main' into feat/ga-mysql-fulltextsearch-fulltextindex

prisma-fmt/src/validate.rs

@@ -59,6 +59,28 @@ mod tests {
     use super::*;
     use expect_test::expect;
 
+    #[test]
+    fn validate_non_ascii_identifiers() {
+        let schema = r#"
+        datasource db {
+            provider = "postgresql"
+            url = env("DBURL")
+        }
+
+        model Lööps {
+            id Int @id
+            läderlappen Boolean
+        }
+        "#;
+
+        let request = json!({
+            "prismaSchema": schema,
+        });
+
+        let response = validate(&request.to_string());
+        assert!(response.is_ok())
+    }
+
     #[test]
     fn validate_invalid_schema_with_colors() {
         let schema = r#"

psl/psl/tests/validation/enums/value_with_non_ascii_ident_should_not_error.prisma

@@ -0,0 +1,12 @@
+generator client {
+    provider = "prisma-client-js"
+}
+
+datasource db {
+    provider = "postgresql"
+    url      = env("DATABASE_URL")
+}
+
+enum CatVariant {
+    lööps
+}

psl/psl/tests/validation/models/field_with_non_ascii_ident_should_not_error.prisma

@@ -0,0 +1,14 @@
+generator client {
+    provider = "prisma-client-js"
+}
+
+datasource db {
+    provider = "postgresql"
+    url      = env("DATABASE_URL")
+}
+
+model A {
+    id Int @id @map("_id")
+    lööps String[]
+}
+

psl/psl/tests/validation/models/model_with_non_ascii_ident_should_not_error.prisma

@@ -0,0 +1,12 @@
+generator client {
+    provider = "prisma-client-js"
+}
+
+datasource db {
+    provider = "postgresql"
+    url      = env("DATABASE_URL")
+}
+
+model Lööp {
+    id Int @id
+}

psl/schema-ast/src/parser/datamodel.pest

@@ -130,9 +130,11 @@ doc_content = @{ (!NEWLINE ~ ANY)* }
 // ######################################
 // shared building blocks
 // ######################################
-identifier = @{ ASCII_ALPHANUMERIC ~ ( "_" | "-" | ASCII_ALPHANUMERIC)* }
+unicode_alphanumeric = { LETTER | ASCII_DIGIT }
+identifier = @{ unicode_alphanumeric ~ ( "_" | "-" | unicode_alphanumeric)* }
 path = @{ identifier ~ ("." ~ path?)* }
 
+
 WHITESPACE = _{ SPACE_SEPARATOR | "\t" } // tabs are also whitespace
 NEWLINE = _{ "\n" | "\r\n" | "\r" }
 empty_lines = @{ (WHITESPACE* ~ NEWLINE)+ }