@@ -198,7 +198,7 @@ export function classifyAndCheck(sql: string, dialect?: string): {
 
     // DuckDB scanner functions run their statement on the attached remote database, outside any local
     // read-only transaction, so a SELECT calling them is a write.
-    const remoteExecute = REMOTE_EXECUTE_CALL.test(maskSql(tokenizeSql(sql, dialect).tokens))
+    const remoteExecute = REMOTE_EXECUTE_CALL.test(maskSql(tokenizeSql(sql, dialect).tokens, true))
     return {
       queryType: !remoteExecute && otherIsReadOnly(sql, result.statements, dialect) ? "read" : "write",
       blocked,
 
@@ -21,7 +21,7 @@ export function tokenizeSql(sql: string, dialect?: string): { tokens: SqlToken[]
       kind = "comment"
       // PostgreSQL also ends line comments at CR. Keep following code visible
       // when the dialect is unknown; other dialects retain their LF handling.
-      const newline = !dialect || /^postgres$/i.test(dialect) ? /[\r\n]/ : /\n/
+      const newline = !dialect || /^(postgres|duckdb)$/i.test(dialect) ? /[\r\n]/ : /\n/
       const end = sql.slice(i + 2).search(newline)
       i = end < 0 ? sql.length : i + 2 + end
     } else if (sql.startsWith("/*", i)) {
 
@@ -362,3 +362,11 @@ describe("SQL-building aggregates are reads", () => {
 test.each(["postgres_execute", "mysql_execute"])("a SELECT calling %s is classified as a write", (fn) => {
   expect(classify(`SELECT * FROM ${fn}('remote', 'DELETE FROM orders')`, "duckdb")).toBe("write")
 })
+
+test("a quoted remote-execute function name is still classified as a write", () => {
+  expect(classify(`SELECT * FROM "postgres_execute"('remote', 'DELETE FROM orders')`, "duckdb")).toBe("write")
+})
+
+test("duckdb line comments end at CR so a following DROP is blocked", () => {
+  expect(classifyAndCheck("SELECT 1 -- x\r; DROP SCHEMA s", "duckdb").blocked).toBe(true)
+})