diff --git a/cargo-sqlx/.gitignore b/cargo-sqlx/.gitignore
index 4b0df7dd..775aebdd 100644
--- a/cargo-sqlx/.gitignore
+++ b/cargo-sqlx/.gitignore
@@ -1,4 +1,6 @@
 /target
 /migrations
 Cargo.lock
-.env
\ No newline at end of file
+.env
+.env-pg
+**/*.sql
diff --git a/cargo-sqlx/src/postgres.rs b/cargo-sqlx/src/postgres.rs
index f9ac40d4..cc4bd51a 100644
--- a/cargo-sqlx/src/postgres.rs
+++ b/cargo-sqlx/src/postgres.rs
@@ -89,7 +89,7 @@ impl DatabaseMigrator for Postgres {
 
         let mut conn = PgConnection::connect(base_url).await?;
 
-        sqlx::query(&format!("CREATE DATABASE {}", db_name))
+        sqlx::query(&format!("CREATE DATABASE \"{}\"", db_name))
             .execute(&mut conn)
             .await
             .with_context(|| format!("Failed to create database: {}", db_name))?;
@@ -104,7 +104,7 @@ impl DatabaseMigrator for Postgres {
 
         let mut conn = PgConnection::connect(base_url).await?;
 
-        sqlx::query(&format!("DROP DATABASE {}", db_name))
+        sqlx::query(&format!("DROP DATABASE \"{}\"", db_name))
             .execute(&mut conn)
             .await
             .with_context(|| format!("Failed to drop database: {}", db_name))?;