feat(psl)!: remove the url property from datasource blocks (#5683)

Remove the `url` property from `datasource` blocks in PSL, refactor the
code to handle URLs separately and update the tests.

Ref:
https://linear.app/prisma-company/issue/TML-1545/remove-url-datasource-attribute-from-psl

/prisma-branch next

Author: aqrln

Cargo.lock

@@ -27,7 +27,6 @@ async function main(): Promise<void> {
 
     datasource db {
       provider = "sqlite"
-      url      = "file:./db.sqlite"
     }
 
     model User {

libs/driver-adapters/executor/src/demo-qc.ts

@@ -39,7 +39,6 @@ async function main(): Promise<void> {
 
     datasource db {
       provider = "sqlite"
-      url      = "${url}"
     }
 
     model User {

libs/driver-adapters/executor/src/demo-se.ts

@@ -185,13 +185,11 @@ impl TestApiArgs {
 
     pub fn datasource_block<'a>(
         &'a self,
-        url: &'a str,
         params: &'a [(&'a str, &'a str)],
         preview_features: &'static [&'static str],
     ) -> DatasourceBlock<'a> {
         DatasourceBlock {
             provider: self.db.provider,
-            url,
             params,
             preview_features,
         }
@@ -201,7 +199,7 @@ impl TestApiArgs {
         self.db.provider
     }
 
-    pub fn shadow_database_url(&self) -> Option<&'static str> {
+    pub fn shadow_database_url(&self) -> Option<&str> {
         self.db.shadow_database_url.as_deref()
     }
 
@@ -216,16 +214,10 @@ impl TestApiArgs {
 
 pub struct DatasourceBlock<'a> {
     provider: &'a str,
-    url: &'a str,
     params: &'a [(&'a str, &'a str)],
     preview_features: &'static [&'static str],
 }
 
-impl DatasourceBlock<'_> {
-    pub fn url(&self) -> &str {
-        self.url
-    }
-}
 fn generator_block(preview_features: &'static [&'static str]) -> String {
     let preview_features: Vec<String> = preview_features.iter().map(|pf| format!(r#""{pf}""#)).collect();
 
@@ -251,8 +243,6 @@ impl Display for DatasourceBlock<'_> {
 
         f.write_str("datasource db {\n    provider = \"")?;
         f.write_str(self.provider)?;
-        f.write_str("\"\n    url = \"")?;
-        f.write_str(self.url)?;
         f.write_str("\"\n")?;
 
         for (param_name, param_value) in self.params {

libs/test-setup/src/test_api_args.rs

@@ -1,4 +1,3 @@
 datasource db {
     provider = "postgresql"
-    url = env("MEOW")
 }

prisma-fmt/schema.prisma

@@ -161,11 +161,8 @@ pub(super) fn add_schema_to_schemas(
             )
         }
         None => {
-            let has_properties = datasource.provider_defined() | datasource.url_defined()
-                || datasource.direct_url_defined()
-                || datasource.shadow_url_defined()
-                || datasource.relation_mode_defined()
-                || datasource.schemas_defined();
+            let has_properties =
+                datasource.provider_defined() || datasource.relation_mode_defined() || datasource.schemas_defined();
 
             let formatted_attribute = super::format_block_property(
                 "schemas",
@@ -180,7 +177,7 @@ pub(super) fn add_schema_to_schemas(
                 datasource_content,
                 formatted_attribute,
                 true,
-                datasource.url_span,
+                datasource.provider_span,
             )
         }
     };

prisma-fmt/src/code_actions/multi_schema.rs

@@ -193,7 +193,6 @@ mod tests {
                 "datasource.prisma",
                 r#"datasource db {
                     provider = "postgresql"
-                    url = "postgresql://example.com/db"
                 }"#,
             ),
         ];
@@ -203,33 +202,14 @@ mod tests {
         });
 
         let expected = expect![[
-            r#"{"config":{"generators":[{"name":"js","provider":{"fromEnvVar":null,"value":"prisma-client"},"output":null,"config":{},"binaryTargets":[],"previewFeatures":[],"sourceFilePath":"generator.prisma"}],"datasources":[{"name":"db","provider":"postgresql","activeProvider":"postgresql","url":{"fromEnvVar":null,"value":"postgresql://example.com/db"},"schemas":[],"sourceFilePath":"datasource.prisma"}],"warnings":[]},"errors":[]}"#
+            r#"{"config":{"generators":[{"name":"js","provider":{"fromEnvVar":null,"value":"prisma-client"},"output":null,"config":{},"binaryTargets":[],"previewFeatures":[],"sourceFilePath":"generator.prisma"}],"datasources":[{"name":"db","provider":"postgresql","activeProvider":"postgresql","schemas":[],"sourceFilePath":"datasource.prisma"}],"warnings":[]},"errors":[]}"#
         ]];
         let response = get_config(&request.to_string());
         expected.assert_eq(&response);
     }
 
     #[test]
-    fn get_config_env_var() {
-        let schema = r#"
-            datasource thedb {
-                provider = "postgresql"
-                url = env("IGNORED")
-            }
-        "#;
-
-        let request = json!({
-            "prismaSchema": schema,
-        });
-        let expected = expect![[
-            r#"{"config":{"generators":[],"datasources":[{"name":"thedb","provider":"postgresql","activeProvider":"postgresql","url":{"fromEnvVar":"IGNORED","value":null},"schemas":[],"sourceFilePath":"schema.prisma"}],"warnings":[]},"errors":[]}"#
-        ]];
-        let response = get_config(&request.to_string());
-        expected.assert_eq(&response);
-    }
-
-    #[test]
-    fn get_config_direct_url_should_error() {
+    fn get_config_urls_should_error() {
         let schema = r#"
             datasource thedb {
                 provider = "postgresql"
@@ -245,7 +225,7 @@ mod tests {
             }
         });
         let expected = expect![[
-            r#"{"config":{"generators":[],"datasources":[{"name":"thedb","provider":"postgresql","activeProvider":"postgresql","url":{"fromEnvVar":"DBURL","value":null},"schemas":[],"sourceFilePath":"schema.prisma"}],"warnings":[]},"errors":[{"file_name":"schema.prisma","message":"\u001b[1;91merror\u001b[0m: \u001b[1mThe datasource property `directUrl` is no longer supported in schema files. Move connection URLs to `prisma.config.ts`. See https://pris.ly/d/config-datasource\u001b[0m\n  \u001b[1;94m-->\u001b[0m  \u001b[4mschema.prisma:5\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\u001b[1;94m 4 | \u001b[0m                url = env(\"DBURL\")\n\u001b[1;94m 5 | \u001b[0m                \u001b[1;91mdirectUrl = \"postgresql://example.com/direct\"\u001b[0m\n\u001b[1;94m   | \u001b[0m\n"}]}"#
+            r#"{"config":{"generators":[],"datasources":[{"name":"thedb","provider":"postgresql","activeProvider":"postgresql","schemas":[],"sourceFilePath":"schema.prisma"}],"warnings":[]},"errors":[{"file_name":"schema.prisma","message":"\u001b[1;91merror\u001b[0m: \u001b[1mThe datasource property `url` is no longer supported in schema files. Move connection URLs for Migrate to `prisma.config.ts` and pass either `adapter` for a direct database connection or `accelerateUrl` for Accelerate to the `PrismaClient` constructor. See https://pris.ly/d/config-datasource and https://pris.ly/d/prisma7-client-config\u001b[0m\n  \u001b[1;94m-->\u001b[0m  \u001b[4mschema.prisma:4\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\u001b[1;94m 3 | \u001b[0m                provider = \"postgresql\"\n\u001b[1;94m 4 | \u001b[0m                \u001b[1;91murl = env(\"DBURL\")\u001b[0m\n\u001b[1;94m   | \u001b[0m\n"},{"file_name":"schema.prisma","message":"\u001b[1;91merror\u001b[0m: \u001b[1mThe datasource property `directUrl` is no longer supported in schema files. Move connection URLs to `prisma.config.ts`. See https://pris.ly/d/config-datasource\u001b[0m\n  \u001b[1;94m-->\u001b[0m  \u001b[4mschema.prisma:5\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\u001b[1;94m 4 | \u001b[0m                url = env(\"DBURL\")\n\u001b[1;94m 5 | \u001b[0m                \u001b[1;91mdirectUrl = \"postgresql://example.com/direct\"\u001b[0m\n\u001b[1;94m   | \u001b[0m\n"}]}"#
         ]];
         let response = get_config(&request.to_string());
         expected.assert_eq(&response);

prisma-fmt/src/get_config.rs

@@ -37,7 +37,6 @@ mod tests {
 
             datasource db {
                 provider = "postgresql"
-                url      = env("DATABASE_URL")
             }
 
             model User {

prisma-fmt/src/get_datamodel.rs

@@ -50,11 +50,10 @@ mod tests {
     }
 
     #[test]
-    fn get_dmmf_missing_env_var() {
+    fn get_dmmf_single_file() {
         let schema = r#"
             datasource thedb {
                 provider = "postgresql"
-                url = env("NON_EXISTING_ENV_VAR_WE_COUNT_ON_IT_AT_LEAST")
             }
         "#;
 
@@ -190,28 +189,6 @@ mod tests {
         expected.assert_eq(&prettified_response);
     }
 
-    #[test]
-    fn get_dmmf_direct_url_direct_empty() {
-        let schema = r#"
-            datasource thedb {
-                provider = "postgresql"
-                url = env("DBURL")
-                directUrl = ""
-            }
-        "#;
-
-        let request = json!({
-            "prismaSchema": schema,
-        });
-
-        let expected = expect![[
-            r#"{"error_code":"P1012","message":"\u001b[1;91merror\u001b[0m: \u001b[1mThe datasource property `directUrl` is no longer supported in schema files. Move connection URLs to `prisma.config.ts`. See https://pris.ly/d/config-datasource\u001b[0m\n  \u001b[1;94m-->\u001b[0m  \u001b[4mschema.prisma:5\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\u001b[1;94m 4 | \u001b[0m                url = env(\"DBURL\")\n\u001b[1;94m 5 | \u001b[0m                \u001b[1;91mdirectUrl = \"\"\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\nValidation Error Count: 1"}"#
-        ]];
-
-        let response = get_dmmf(&request.to_string()).unwrap_err();
-        expected.assert_eq(&response);
-    }
-
     #[test]
     fn get_dmmf_multiple_files() {
         let schema = vec![
@@ -220,7 +197,6 @@ mod tests {
                 r#"
                 datasource thedb {
                     provider = "postgresql"
-                    url = env("DBURL")
                 }
 
                 model A {
@@ -6907,7 +6883,6 @@ mod tests {
         let schema = r#"
           datasource db {
               provider = "sqlite"
-              url = "sqlite"
               relationMode = "prisma"
               referentialIntegrity = "foreignKeys"
           }
@@ -6918,7 +6893,7 @@ mod tests {
         });
 
         let expected = expect![[
-            r#"{"error_code":"P1012","message":"\u001b[1;91merror\u001b[0m: \u001b[1mThe `referentialIntegrity` and `relationMode` attributes cannot be used together. Please use only `relationMode` instead.\u001b[0m\n  \u001b[1;94m-->\u001b[0m  \u001b[4mschema.prisma:6\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\u001b[1;94m 5 | \u001b[0m              relationMode = \"prisma\"\n\u001b[1;94m 6 | \u001b[0m              \u001b[1;91mreferentialIntegrity = \"foreignKeys\"\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\nValidation Error Count: 1"}"#
+            r#"{"error_code":"P1012","message":"\u001b[1;91merror\u001b[0m: \u001b[1mThe `referentialIntegrity` and `relationMode` attributes cannot be used together. Please use only `relationMode` instead.\u001b[0m\n  \u001b[1;94m-->\u001b[0m  \u001b[4mschema.prisma:5\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\u001b[1;94m 4 | \u001b[0m              relationMode = \"prisma\"\n\u001b[1;94m 5 | \u001b[0m              \u001b[1;91mreferentialIntegrity = \"foreignKeys\"\u001b[0m\n\u001b[1;94m   | \u001b[0m\n\nValidation Error Count: 1"}"#
         ]];
         let response = get_dmmf(&request.to_string()).unwrap_err();
         expected.assert_eq(&response);

prisma-fmt/src/get_dmmf.rs

@@ -101,7 +101,6 @@ mod tests {
         let schema = indoc! {r#"
             datasource db {
               provider = "postgresql"
-              url      = env("DATABASE_URL")
             }
 
             generator client {
@@ -119,8 +118,8 @@ mod tests {
             [
               {
                 "file_name": "schema.prisma",
-                "start": 146,
-                "end": 160,
+                "start": 113,
+                "end": 127,
                 "text": "Preview feature \"createMany\" is deprecated. The functionality can be used without specifying it as a preview feature.",
                 "is_warning": true
               }
@@ -134,7 +133,6 @@ mod tests {
         let schema1 = indoc! {r#"
             datasource db {
               provider = "postgresql"
-              url      = env("DATABASE_URL")
             }
 
             generator client {
@@ -158,8 +156,8 @@ mod tests {
             [
               {
                 "file_name": "schema1.prisma",
-                "start": 146,
-                "end": 160,
+                "start": 113,
+                "end": 127,
                 "text": "Preview feature \"createMany\" is deprecated. The functionality can be used without specifying it as a preview feature.",
                 "is_warning": true
               }