fix(rivetkit): drop is_read_only_sql classifier, surface RETURNING rows

Author: NathanFlurry

rivetkit-rust/packages/rivetkit-core/src/registry/inspector.rs

@@ -495,18 +495,11 @@ impl RegistryDispatcher {
 			Some(encode_json_as_cbor(&body.args)?)
 		};
 
-		if is_read_only_sql(&body.sql) {
-			let rows = ctx
-				.db_query(&body.sql, params.as_deref())
-				.await
-				.context("run inspector read-only database query")?;
-			return Ok(decode_cbor_json_or_null(&rows));
-		}
-
-		ctx.db_run(&body.sql, params.as_deref())
+		let rows = ctx
+			.db_query(&body.sql, params.as_deref())
 			.await
-			.context("run inspector database mutation")?;
-		Ok(JsonValue::Array(Vec::new()))
+			.context("run inspector database statement")?;
+		Ok(decode_cbor_json_or_null(&rows))
 	}
 }
 
@@ -609,14 +602,6 @@ pub(super) fn quote_sql_identifier(identifier: &str) -> String {
 	format!("\"{}\"", identifier.replace('"', "\"\""))
 }
 
-pub(super) fn is_read_only_sql(sql: &str) -> bool {
-	let statement = sql.trim_start().to_ascii_uppercase();
-	matches!(
-		statement.split_whitespace().next(),
-		Some("SELECT" | "PRAGMA" | "WITH" | "EXPLAIN")
-	)
-}
-
 pub(super) fn json_http_response(
 	status: StatusCode,
 	payload: &impl Serialize,

rivetkit-typescript/packages/rivetkit/src/registry/native.ts

@@ -3448,9 +3448,6 @@ export function buildNativeFactory(
 						{ status: 400 },
 					);
 				}
-				const readOnly = /^\s*(SELECT|PRAGMA|WITH|EXPLAIN)\b/i.test(
-					body.sql,
-				);
 				if (
 					body.properties &&
 					typeof body.properties === "object" &&
@@ -3459,24 +3456,14 @@ export function buildNativeFactory(
 					const bindings = normalizeSqlitePropertyBindings(
 						body.properties as Record<string, unknown>,
 					);
-					if (readOnly) {
-						const rows = queryRows(
-							await actorCtx.sql.query(body.sql, bindings),
-						);
-						return jsonResponse({ rows: jsonSafe(rows) });
-					}
-					await actorCtx.sql.run(body.sql, bindings);
-					return jsonResponse({ rows: [] });
-				}
-				const args = Array.isArray(body.args) ? body.args : [];
-				if (readOnly) {
 					const rows = queryRows(
-						await actorCtx.sql.query(body.sql, args),
+						await actorCtx.sql.query(body.sql, bindings),
 					);
 					return jsonResponse({ rows: jsonSafe(rows) });
 				}
-				await actorCtx.sql.run(body.sql, args);
-				return jsonResponse({ rows: [] });
+				const args = Array.isArray(body.args) ? body.args : [];
+				const rows = queryRows(await actorCtx.sql.query(body.sql, args));
+				return jsonResponse({ rows: jsonSafe(rows) });
 			}
 			if (
 				url.pathname === "/inspector/summary" &&