Revert "db.sqlite: support calling exec_param_many with [][]string or []string (it now accepts a sumtype of both) (#26100)"

spytheman · spytheman · commit 3779d72b2058 · 2025-12-26T14:50:31.000+02:00
This reverts commit 7c29359.
diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v
@@ -60,7 +60,8 @@ pub const is_ruby_present = os.execute('ruby --version').exit_code == 0
 pub const is_python_present = os.execute('python --version').exit_code == 0
 	&& os.execute('pkg-config python3 --libs').exit_code == 0
 
-pub const is_sqlite3_present = os.exists(@VEXEROOT + '/thirdparty/sqlite/sqlite3.c')
+pub const is_sqlite3_present = os.execute('sqlite3 --version').exit_code == 0
+	&& os.execute('pkg-config sqlite3 --libs').exit_code == 0
 
 pub const all_processes = get_all_processes()
 
diff --git a/vlib/db/sqlite/sqlite.c.v b/vlib/db/sqlite/sqlite.c.v
@@ -91,8 +91,6 @@ pub mut:
 	vals []string
 }
 
-pub type Params = []string | [][]string
-
 //
 fn C.sqlite3_open(&char, &&C.sqlite3) int
 
@@ -107,8 +105,6 @@ fn C.sqlite3_prepare_v2(&C.sqlite3, &char, int, &&C.sqlite3_stmt, &&char) int
 
 fn C.sqlite3_step(&C.sqlite3_stmt) int
 
-fn C.sqlite3_reset(&C.sqlite3_stmt) int
-
 fn C.sqlite3_finalize(&C.sqlite3_stmt) int
 
 //
@@ -361,82 +357,46 @@ pub fn (db &DB) exec_none(query string) int {
 
 // exec_param_many executes a query with parameters provided as ?,
 // and returns either an error on failure, or the full result set on success
-pub fn (db &DB) exec_param_many(query string, params Params) ![]Row {
+pub fn (db &DB) exec_param_many(query string, params []string) ![]Row {
 	$if trace_sqlite ? {
 		eprintln('> exec_param_many query: "${query}", params: ${params}')
 	}
 	mut stmt := &C.sqlite3_stmt(unsafe { nil })
 	mut code := C.sqlite3_prepare_v2(db.conn, &char(query.str), -1, &stmt, 0)
-	if code != sqlite_ok {
+	if code != 0 {
 		return db.error_message(code, query)
 	}
 	defer {
 		C.sqlite3_finalize(stmt)
 	}
-
-	mut rows := []Row{}
-	nr_cols := C.sqlite3_column_count(stmt)
-
-	if params is []string {
-		for i, param in params {
-			code = C.sqlite3_bind_text(stmt, i + 1, voidptr(param.str), param.len, 0)
-			if code != sqlite_ok {
-				return db.error_message(code, query)
-			}
+	for i, param in params {
+		code = C.sqlite3_bind_text(stmt, i + 1, voidptr(param.str), param.len, 0)
+		if code != 0 {
+			return db.error_message(code, query)
 		}
-		for {
-			mut row := Row{}
-			code = C.sqlite3_step(stmt)
-			if is_error(code) {
-				return db.error_message(code, query)
-			}
-			if code == sqlite_done {
-				break
-			}
-			for i in 0 .. nr_cols {
-				val := unsafe { &u8(C.sqlite3_column_text(stmt, i)) }
-				if val == &u8(unsafe { nil }) {
-					row.vals << ''
-				} else {
-					row.vals << unsafe { val.vstring() }
-				}
+	}
+	nr_cols := C.sqlite3_column_count(stmt)
+	mut res := 0
+	mut rows := []Row{}
+	for {
+		res = C.sqlite3_step(stmt)
+		if res != sqlite_row {
+			if rows.len == 0 && is_error(res) {
+				return db.error_message(res, query)
 			}
-			rows << row
+			break
 		}
-	} else if params is [][]string {
-		// Rows to process
-		for r in 0 .. params[0].len {
-			mut row := Row{}
-			// Param values to bind
-			for i, param in params {
-				code = C.sqlite3_bind_text(stmt, i + 1, voidptr(param[r].str), param[r].len,
-					0)
-				if code != sqlite_ok {
-					return db.error_message(code, query)
-				}
-			}
-			for {
-				code = C.sqlite3_step(stmt)
-				if is_error(code) {
-					return db.error_message(code, query)
-				}
-				if code == sqlite_done {
-					break
-				}
-				for i in 0 .. nr_cols {
-					val := unsafe { &u8(C.sqlite3_column_text(stmt, i)) }
-					if val == &u8(unsafe { nil }) {
-						row.vals << ''
-					} else {
-						row.vals << unsafe { val.vstring() }
-					}
-				}
-				rows << row
+		mut row := Row{}
+		for i in 0 .. nr_cols {
+			val := unsafe { &u8(C.sqlite3_column_text(stmt, i)) }
+			if val == &u8(unsafe { nil }) {
+				row.vals << ''
+			} else {
+				row.vals << unsafe { val.vstring() }
 			}
-			C.sqlite3_reset(stmt)
 		}
+		rows << row
 	}
-
 	return rows
 }
 
diff --git a/vlib/db/sqlite/sqlite_test.v b/vlib/db/sqlite/sqlite_test.v
@@ -136,22 +136,3 @@ fn test_exec_param_many() {
 	db.close()!
 	assert false
 }
-
-fn test_exec_param_many2() {
-	$if !linux {
-		return
-	}
-	mut db := sqlite.connect(':memory:') or { panic(err) }
-	assert db.is_open
-	db.exec('drop table if exists users')!
-	db.exec("create table users (id integer primary key, name text default '' unique);")!
-	db.exec_param_many('insert into users (id, name) values (?, ?)', [
-		['60', 'Sam'],
-		['61', 'Foo'],
-		['62', 'Bar'],
-	]) or { panic(err) }
-	count := db.q_int('select count(*) from users')!
-	assert count == 3
-
-	db.close()!
-}
