database-introspection: Support hyphenated names

server/prisma-rs/Cargo.toml

@@ -16,4 +16,4 @@ members = [
 ]
 
 [patch.crates-io]
-barrel = { git = "https://github.com/aknuds1/barrel.git", branch = "bugfix/fix-index-creation" }
+barrel = { git = "https://github.com/aknuds1/barrel.git", branch = "master" }

server/prisma-rs/libs/database-introspection/Cargo.toml

@@ -11,7 +11,6 @@ serde = {version = "1.0", features = ["derive"]}
 serde_json = "1.0"
 rusqlite = { version = "0.19", features = ["chrono", "bundled"] }
 prisma-query = { git = "https://github.com/prisma/prisma-query.git" }
-barrel = { version = "0.6.3-alpha.0", features = ["sqlite3", "mysql", "pg"] }
 itertools = "0.8"
 url = "1.7.2"
 postgres = { version = "0.16.0-rc.2", features = ["runtime", "with-serde_json-1", "with-chrono-0_4", "with-uuid-0_7"] }
@@ -20,5 +19,6 @@ mysql = { version = "16", features = ["ssl"] }
 regex = "1.2"
 
 [dev-dependencies]
+barrel = { version = "0.6.3-alpha.0", features = ["sqlite3", "mysql", "pg"] }
 fern = "0.5"
 pretty_assertions = "0.6"

server/prisma-rs/libs/database-introspection/tests/introspection_connection_tests.rs

@@ -1387,6 +1387,36 @@ fn multi_column_foreign_keys_must_work() {
     );
 }
 
+#[test]
+fn names_with_hyphens_must_work() {
+    setup();
+
+    test_each_backend(
+        |_, migration| {
+            migration.create_table("User-table", |t| {
+                t.add_column("column-1", types::integer().nullable(false));
+            });
+        },
+        |db_type, inspector| {
+            let result = inspector.introspect(SCHEMA).expect("introspecting");
+            let user_table = result.get_table("User-table").expect("getting User table");
+            let expected_columns = vec![
+                Column {
+                    name: "column-1".to_string(),
+                    tpe: ColumnType {
+                        raw: int_type(db_type),
+                        family: ColumnTypeFamily::Int,
+                    },
+                    arity: ColumnArity::Required,
+                    default: None,
+                    auto_increment: false,
+                },
+            ];
+            assert_eq!(user_table.columns, expected_columns);
+        },
+    );
+}
+
 #[test]
 fn postgres_foreign_key_on_delete_must_be_handled() {
     setup();
@@ -1767,9 +1797,9 @@ fn get_mysql_connector(sql: &str) -> mysql::IntrospectionConnector {
         .pass(Some(password));
     let mut conn = prisma_query::connector::Mysql::new(opts_builder).expect("connect to MySQL");
 
-    conn.execute_raw(&format!("DROP SCHEMA IF EXISTS {}", SCHEMA), &[])
+    conn.execute_raw(&format!("DROP SCHEMA IF EXISTS `{}`", SCHEMA), &[])
         .expect("dropping schema");
-    conn.execute_raw(&format!("CREATE SCHEMA {}", SCHEMA), &[])
+    conn.execute_raw(&format!("CREATE SCHEMA `{}`", SCHEMA), &[])
         .expect("creating schema");
 
     debug!("Executing MySQL migrations: {}", sql);