Allow unsetting ns/db (#313)

surrealdb · Jul 17, 2024 · 2caaab1 · 2caaab1
1 parent 423a150
commit 2caaab1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/engines/http.ts b/src/engines/http.ts
@@ -73,10 +73,12 @@ export class HttpEngine extends AbstractEngine {
 
 		if (request.method === "use") {
 			const [ns, db] = request.params as [
-				string | undefined,
-				string | undefined,
+				string | false | undefined,
+				string | false | undefined,
 			];
 
+			if (ns === false) this.connection.namespace = undefined;
+			if (db === false) this.connection.database = undefined;
 			if (ns) this.connection.namespace = ns;
 			if (db) this.connection.database = db;
 			return {

diff --git a/src/engines/ws.ts b/src/engines/ws.ts
@@ -146,10 +146,12 @@ export class WebsocketEngine extends AbstractEngine {
 			switch (request.method) {
 				case "use": {
 					const [ns, db] = request.params as [
-						string | undefined,
-						string | undefined,
+						string | false | undefined,
+						string | false | undefined,
 					];
 
+					if (ns === false) this.connection.namespace = undefined;
+					if (db === false) this.connection.database = undefined;
 					if (ns) this.connection.namespace = ns;
 					if (db) this.connection.database = db;
 					break;

diff --git a/src/surreal.ts b/src/surreal.ts
@@ -44,6 +44,7 @@ import {
 	NoNamespaceSpecified,
 	NoTokenReturned,
 	ResponseError,
+	SurrealDbError,
 	UnsupportedEngine,
 } from "./errors.ts";
 
@@ -208,10 +209,15 @@ export class Surreal {
 		namespace,
 		database,
 	}: {
-		namespace?: string;
-		database?: string;
+		namespace?: string | false;
+		database?: string | false;
 	}): Promise<true> {
 		if (!this.connection) throw new NoActiveSocket();
+
+		if (namespace === false && database !== false)
+			throw new SurrealDbError(
+				"Cannot unset namespace without unsetting database",
+			);
 		const { error } = await this.rpc("use", [namespace, database]);
 		if (error) throw new ResponseError(error.message);
 		return true;