From 4a2f83b4bea4506de5d60ef459d19bcb0cb0a3ee Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Thu, 28 May 2026 01:44:52 +0300
Subject: [PATCH] db: fix mysql and mssql CI regressions

---
 vlib/db/mssql/config.v  | 22 +++++++++-------------
 vlib/db/mysql/utils.c.v |  9 ++-------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/vlib/db/mssql/config.v b/vlib/db/mssql/config.v
index 2fcbf26fb..3611a44d2 100644
--- a/vlib/db/mssql/config.v
+++ b/vlib/db/mssql/config.v
@@ -77,20 +77,16 @@ pub fn (cfg Config) get_conn_str() string {
 	}
 	if cfg.options.len > 0 {
 		mut option_keys := cfg.options.keys()
-		$if tinyc {
-			// Manual insertion sort avoids relying on the generic .sort() helper,
-			// which has tripped tcc bounds-check builds in CI.
-			for i in 1 .. option_keys.len {
-				key := option_keys[i]
-				mut j := i
-				for j > 0 && option_keys[j - 1] > key {
-					option_keys[j] = option_keys[j - 1]
-					j--
-				}
-				option_keys[j] = key
+		// Manual insertion sort avoids relying on the generic .sort() helper,
+		// which has tripped bounds-check builds in CI.
+		for i in 1 .. option_keys.len {
+			key := option_keys[i]
+			mut j := i
+			for j > 0 && option_keys[j - 1] > key {
+				option_keys[j] = option_keys[j - 1]
+				j--
 			}
-		} $else {
-			option_keys.sort()
+			option_keys[j] = key
 		}
 		for key in option_keys {
 			append_conn_part(mut parts, key, cfg.options[key])
diff --git a/vlib/db/mysql/utils.c.v b/vlib/db/mysql/utils.c.v
index ca0ef215e..bc4a362ab 100644
--- a/vlib/db/mysql/utils.c.v
+++ b/vlib/db/mysql/utils.c.v
@@ -30,15 +30,10 @@ fn clone_mysql_cstring(ptr &u8) string {
 
 // resolve_nil_str returns an empty string if passed value is a nil pointer.
 fn resolve_nil_str(ptr &u8) string {
-	if isnil(ptr) {
-		return ''
-	}
-	return unsafe { ptr.vstring() }
+	return clone_mysql_cstring(ptr)
 }
 
 @[inline]
 fn mystring(b &u8) string {
-	unsafe {
-		return b.vstring()
-	}
+	return clone_mysql_cstring(b)
 }
-- 
2.39.5