Fixed migrations

Author: wickwirew

Sources/Compiler/Driver.swift

@@ -57,7 +57,7 @@ public actor Driver {
             // create the migrations and try to build to see if things work before
             // they create their first query. If it can find the migrations folder
             // thats probably good enough.
-            let queriesFiles = try fileSystem.exists(at: queriesPath)
+            let queriesFiles = fileSystem.exists(at: queriesPath)
                 ? try fileSystem.files(atPath: queriesPath)
                 : []
 
@@ -86,9 +86,9 @@ public actor Driver {
             // An array of all migrations source code
             let migrations = results.values
                 .filter { $0.usage == .migration }
-                .sorted(by: { $0.fileName < $1.fileName })
-                .flatMap(\.statements)
-                .map(\.sanitizedSource)
+                .reduce(into: [:]) { $0[$1.fileName, default: []].append(contentsOf: $1.statements) }
+                .map { ($0.key, $0.value.map(\.sanitizedSource).joined(separator: "\n")) }
+                .map(\.1)
 
             // An array of all queries grouped by their file name
             let queries = results.values

Sources/Compiler/Gen/SwiftLanguage.swift

@@ -127,6 +127,7 @@ public struct SwiftLanguage: Language {
     /// file and requires a little extra treatment
     public func macro(
         databaseName: String,
+        migrations: [String],
         tables: [GeneratedModel],
         queries: [GeneratedQuery],
         addConnection: Bool,
@@ -146,6 +147,20 @@ public struct SwiftLanguage: Language {
         self.adapters(adapters: adapters)
         take()
 
+        writer.write("static var sanitizedMigrations: [String] ")
+        writer.braces {
+            writer.write(line: "return ")
+            writer.brackets {
+                for (position, migration) in migrations.positional() {
+                    multilineStringLiteral(of: migration)
+                    
+                    if !position.isLast {
+                        writer.write(",")
+                    }
+                }
+            }
+        }
+        
         for table in tables {
             declaration(for: table, isOutput: true)
             take()
@@ -238,7 +253,7 @@ public struct SwiftLanguage: Language {
                         }
                     }
                 }
-                writer.write(line: ")")
+                writer.write(line: ") ")
 
                 writer.braces {
                     for adapter in adapters {

Sources/Otter/Database.swift

@@ -15,9 +15,16 @@ public protocol Database: ConnectionWrapper {
     init(connection: any Connection, adapters: Adapters)
     /// An ordered list of migrations to be run.
     static var migrations: [String] { get }
+    /// The `migrations` sanitized with all non-valid SQL removed.
+    ///
+    /// Note: This only exists for the @Database macro. The macro will
+    /// generate this. Not needed for the build tool plugin
+    static var sanitizedMigrations: [String] { get }
 }
 
 public extension Database {
+    static var sanitizedMigrations: [String] { migrations }
+    
     /// Opens a connection pool to the database at the given URL.
     ///
     /// - Parameter url: The url of the database file
@@ -41,13 +48,13 @@ public extension Database {
             try ConnectionPool(
                 path: path,
                 limit: config.maxConnectionCount,
-                migrations: Self.migrations
+                migrations: Self.sanitizedMigrations
             )
         } else {
             try ConnectionPool(
                 path: ":memory:",
                 limit: 1,
-                migrations: Self.migrations
+                migrations: Self.sanitizedMigrations
             )
         }
 

Sources/OtterMacros/DatabaseMacro.swift

@@ -35,10 +35,17 @@ extension DatabaseMacro: MemberMacro {
         }
 
         var compiler = Compiler()
+        var sanitizedMigrations: [String] = []
         var queries: [Statement] = []
 
         for (migration, expr) in migrations {
-            let (_, diagnostics) = compiler.compile(migration: migration)
+            let (statements, diagnostics) = compiler.compile(migration: migration)
+            
+            sanitizedMigrations.append(
+                statements
+                    .map(\.sanitizedSource)
+                    .joined(separator: "\n")
+            )
 
             for diag in diagnostics {
                 context.addDiagnostics(from: diag, node: expr)
@@ -78,6 +85,7 @@ extension DatabaseMacro: MemberMacro {
 
         let raw = swift.macro(
             databaseName: structDecl.name.text,
+            migrations: sanitizedMigrations,
             tables: values.tables,
             queries: values.queries.flatMap(\.1),
             addConnection: variables["connection"] == nil,