Merge pull request #5 from maiadegraaf/connect_exception

Catch Exception When Opening an Already Connected Database
duckdb · Jun 3, 2024 · 5168877 · 5168877
2 parents 688b5f8 + 8dafd30
commit 5168877
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/connect/connect.cpp b/src/connect/connect.cpp
@@ -139,7 +139,13 @@ SQLRETURN Connect::SetConnection() {
 	config.SetOptionsByName(config_map);
 
 	bool cache_instance = database != IN_MEMORY_PATH;
-	dbc->env->db = instance_cache.GetOrCreateInstance(database, config, cache_instance);
+
+    try {
+	    dbc->env->db = instance_cache.GetOrCreateInstance(database, config, cache_instance);
+    } catch (std::exception &ex) {
+        ErrorData error(ex);
+        return SetDiagnosticRecord(dbc, SQL_ERROR, "SQLDriverConnect", error.Message(), SQLStateType::ST_IM003, "");
+    }
 
 	if (!dbc->conn) {
 		dbc->conn = make_uniq<Connection>(*dbc->env->db);