Merge remote-tracking branch 'origin/main' into AssertQuery_Bug

Author: mbrandonw

.github/workflows/ci.yml

@@ -34,6 +34,7 @@ jobs:
     strategy:
       matrix:
         swift:
+          - '6.0'
           - '6.1'
     runs-on: ubuntu-latest
     container: swift:${{ matrix.swift }}

.gitignore

@@ -3,8 +3,7 @@
 /Packages
 xcuserdata/
 DerivedData/
-.swiftpm/configuration/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.swiftpm
 .netrc
 Package.resolved
-db.sqlite
+*.sqlite

.swiftpm/xcode/xcshareddata/xcschemes/StructuredQueries.xcscheme

@@ -9,22 +9,19 @@ import StructuredQueriesCore
   conformances: Table,
   PartialSelectStatement,
   PrimaryKeyedTable,
-  names: named(TableColumns),
-  named(From),
-  named(Draft),
+  names: named(From),
   named(columns),
   named(init(_:)),
   named(init(decoder:)),
   named(QueryValue),
   named(schemaName),
   named(tableName)
 )
-@attached(
-  memberAttribute
-)
+@attached(member, names: named(Draft), named(TableColumns))
+@attached(memberAttribute)
 public macro Table(
-  _ name: String? = nil,
-  schema schemaName: String? = nil
+  _ name: String = "",
+  schema schemaName: String = ""
 ) =
   #externalMacro(
     module: "StructuredQueriesMacros",
@@ -38,9 +35,9 @@ public macro Table(
 ///   - representableType: A type that represents the property type in a query expression. For types
 ///     that don't have a single representation in SQL, like `Date` and `UUID`.
 ///   - primaryKey: The column is its table's auto-incrementing primary key.
-@attached(accessor, names: named(willSet))
+@attached(peer)
 public macro Column(
-  _ name: String? = nil,
+  _ name: String = "",
   as representableType: (any QueryRepresentable.Type)? = nil,
   primaryKey: Bool = false
 ) =
@@ -52,7 +49,7 @@ public macro Column(
 /// Tells Structured Queries not to consider the annotated property a column of the table
 ///
 /// Like SwiftData's `@Transient` macro, but for SQL.
-@attached(accessor, names: named(willSet))
+@attached(peer)
 public macro Ephemeral() =
   #externalMacro(
     module: "StructuredQueriesMacros",
@@ -95,6 +92,7 @@ public macro Ephemeral() =
   names: named(Columns),
   named(init(decoder:))
 )
+@attached(member, names: named(Columns))
 public macro Selection() =
   #externalMacro(
     module: "StructuredQueriesMacros",
@@ -135,21 +133,9 @@ public macro sql<QueryValue>(
 ) -> SQLQueryExpression<QueryValue> =
   #externalMacro(module: "StructuredQueriesMacros", type: "SQLMacro")
 
-// NB: Due to a bug in Swift, this macro is expanded internally by the '@Table' macro.
-// @attached(
-//   memberAttribute
-// )
-// @attached(
-//   extension,
-//   conformances: Table,
-//   names: named(TableColumns),
-//   named(columns),
-//   named(init(_:)),
-//   named(init(decoder:)),
-//   named(tableName)
-// )
-// public macro _Draft<T: Table>(_: T.Type) =
-//   #externalMacro(
-//     module: "StructuredQueriesMacros",
-//     type: "TableMacro"
-//   )
+@freestanding(expression)
+public macro sql(
+  _ queryFragment: QueryFragment,
+  as queryValueType: Any.Type = Any.self
+) -> SQLQueryExpression<Any> =
+  #externalMacro(module: "StructuredQueriesMacros", type: "SQLMacro")