Use type name for query name in macros

Author: wickwirew

Sources/OtterMacros/DatabaseMacro.swift

@@ -44,12 +44,13 @@ extension DatabaseMacro: MemberMacro {
             }
         }
 
-        for (name, variable) in variables {
-            guard let queryMacro = variable.queryMacroInputsIfIsQuery(in: context) else { continue }
+        for variable in variables.values {
+            guard let queryMacro = variable.queryMacroInputsIfIsQuery(in: context),
+                  let typeName = variable.typeName?.removingQuerySuffix() else { continue }
 
             let (statement, diagnostics) = compiler.compile(
                 query: queryMacro.source,
-                named: name.removingQuerySuffix(),
+                named: typeName,
                 inputType: queryMacro.inputName,
                 outputType: queryMacro.outputName
             )

Sources/OtterMacros/Syntax+Extensions.swift

@@ -12,6 +12,16 @@ import SwiftSyntaxBuilder
 import SwiftSyntaxMacros
 
 extension VariableDeclSyntax {
+    /// The variables type name.
+    var typeName: String? {
+        for binding in bindings {
+            guard let someOrAny = binding.typeAnnotation?.type.as(SomeOrAnyTypeSyntax.self),
+                  let name = someOrAny.constraint.as(IdentifierTypeSyntax.self)?.name.text else { continue }
+            return name
+        }
+        return nil
+    }
+    
     /// Searchs the variable decl for the `@Query` macro and gets the input
     /// arguments and performs any validation.
     func queryMacroInputsIfIsQuery(in context: some MacroExpansionContext) -> (

Tests/OtterTests/DatabaseValueAdapterTests.swift

@@ -142,10 +142,10 @@ struct DatabaseValueAdapterTests {
     @Database
     struct TestDB {
         @Query("INSERT INTO hasValues VALUES (?, ?)")
-        var insert: InsertDatabaseQuery
+        var insert: any InsertQuery
 
         @Query("SELECT * FROM hasValues")
-        var all: AllDatabaseQuery
+        var all: any AllQuery
 
         static var migrations: [String] {
             return [

Tests/OtterTests/SQLAnyTests.swift

@@ -43,10 +43,10 @@ struct SQLAnyTests {
     @Database
     struct AnyDB {
         @Query("INSERT INTO foo (bar) VALUES (?)")
-        var insertFoo: InsertFooDatabaseQuery
+        var insertFoo: any InsertFooQuery
 
         @Query("SELECT * FROM foo")
-        var selectFoos: SelectFoosDatabaseQuery
+        var selectFoos: any SelectFoosQuery
 
         static var migrations: [String] {
             return ["CREATE TABLE foo (bar ANY);"]

Tests/OtterTests/TestDatabase.swift

@@ -12,22 +12,22 @@ import Otter
 @Database
 struct TestDB {
     @Query("SELECT * FROM foo")
-    var selectFoos: SelectFoosDatabaseQuery
+    var selectFoos: any SelectFoosQuery
 
     @Query("SELECT * FROM foo WHERE bar = ?")
-    var selectFoo: SelectFooDatabaseQuery
+    var selectFoo: any SelectFooQuery
 
     @Query("INSERT INTO foo (bar) VALUES (?)")
-    var insertFoo: InsertFooDatabaseQuery
+    var insertFoo: any InsertFooQuery
 
     @Query("INSERT INTO baz (qux) VALUES (?)")
-    var insertBaz: InsertBazDatabaseQuery
+    var insertBaz: any InsertBazQuery
 
     @Query("SELECT foo.*, baz.* FROM foo LEFT OUTER JOIN baz ON foo.bar = baz.qux")
-    var selectFooAndBaz: SelectFooAndBazDatabaseQuery
+    var selectFooAndBaz: any SelectFooAndBazQuery
 
     @Query("SELECT foo.*, baz.* FROM foo INNER JOIN baz ON foo.bar = baz.qux")
-    var selectFooAndBazNotOptional: SelectFooAndBazNotOptionalDatabaseQuery
+    var selectFooAndBazNotOptional: any SelectFooAndBazNotOptionalQuery
 
     static var migrations: [String] {
         return [