pg: hande C calls, move to .c.v files (#19739)

vlang · Nov 3, 2023 · 24befa0 · 24befa0
1 parent be89cbf
commit 24befa0
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 17 deletions.
diff --git a/vlib/db/mssql/mssql.v → vlib/db/mssql/mssql.c.v b/vlib/db/mssql/mssql.v → vlib/db/mssql/mssql.c.v
diff --git a/vlib/db/mssql/stmt_handle.v → vlib/db/mssql/stmt_handle.c.v b/vlib/db/mssql/stmt_handle.v → vlib/db/mssql/stmt_handle.c.v
diff --git a/vlib/db/mysql/consts.v → vlib/db/mysql/consts.c.v b/vlib/db/mysql/consts.v → vlib/db/mysql/consts.c.v
diff --git a/vlib/db/mysql/mysql.v → vlib/db/mysql/mysql.c.v b/vlib/db/mysql/mysql.v → vlib/db/mysql/mysql.c.v
diff --git a/vlib/db/mysql/orm.v → vlib/db/mysql/orm.c.v b/vlib/db/mysql/orm.v → vlib/db/mysql/orm.c.v
diff --git a/vlib/db/mysql/result.v → vlib/db/mysql/result.c.v b/vlib/db/mysql/result.v → vlib/db/mysql/result.c.v
diff --git a/vlib/db/mysql/utils.v → vlib/db/mysql/utils.c.v b/vlib/db/mysql/utils.v → vlib/db/mysql/utils.c.v
diff --git a/vlib/db/pg/orm.v b/vlib/db/pg/orm.v
@@ -73,22 +73,6 @@ pub fn (db DB) drop(table string) ! {
 
 // utils
 
-fn pg_stmt_worker(db DB, query string, data orm.QueryData, where orm.QueryData) ![]Row {
-	mut param_types := []u32{}
-	mut param_vals := []&char{}
-	mut param_lens := []int{}
-	mut param_formats := []int{}
-
-	pg_stmt_binder(mut param_types, mut param_vals, mut param_lens, mut param_formats,
-		data)
-	pg_stmt_binder(mut param_types, mut param_vals, mut param_lens, mut param_formats,
-		where)
-
-	res := C.PQexecParams(db.conn, &char(query.str), param_vals.len, param_types.data,
-		param_vals.data, param_lens.data, param_formats.data, 0) // here, the last 0 means require text results, 1 - binary results
-	return db.handle_error_or_result(res, 'orm_stmt_worker')
-}
-
 fn pg_stmt_binder(mut types []u32, mut vals []&char, mut lens []int, mut formats []int, d orm.QueryData) {
 	for data in d.data {
 		pg_stmt_match(mut types, mut vals, mut lens, mut formats, data)

diff --git a/vlib/db/pg/pg.v → vlib/db/pg/pg.c.v b/vlib/db/pg/pg.v → vlib/db/pg/pg.c.v
@@ -1,6 +1,7 @@
 module pg
 
 import io
+import orm
 
 $if $pkgconfig('libpq') {
 	#pkgconfig --cflags --libs libpq
@@ -363,3 +364,19 @@ pub fn (db DB) copy_expert(query string, mut file io.ReaderWriter) !int {
 
 	return 0
 }
+
+fn pg_stmt_worker(db DB, query string, data orm.QueryData, where orm.QueryData) ![]Row {
+	mut param_types := []u32{}
+	mut param_vals := []&char{}
+	mut param_lens := []int{}
+	mut param_formats := []int{}
+
+	pg_stmt_binder(mut param_types, mut param_vals, mut param_lens, mut param_formats,
+		data)
+	pg_stmt_binder(mut param_types, mut param_vals, mut param_lens, mut param_formats,
+		where)
+
+	res := C.PQexecParams(db.conn, &char(query.str), param_vals.len, param_types.data,
+		param_vals.data, param_lens.data, param_formats.data, 0) // here, the last 0 means require text results, 1 - binary results
+	return db.handle_error_or_result(res, 'orm_stmt_worker')
+}
diff --git a/vlib/db/sqlite/sqlite.v → vlib/db/sqlite/sqlite.c.v b/vlib/db/sqlite/sqlite.v → vlib/db/sqlite/sqlite.c.v
diff --git a/vlib/db/sqlite/sqlite_vfs_lowlevel_test.v b/vlib/db/sqlite/sqlite_vfs_lowlevel_test.v
@@ -214,7 +214,7 @@ fn example_vfsfile_read(file &sqlite.Sqlite3_file, output voidptr, amount int, o
 	vfsfile.vfs_state.log << 'read file=${vfsfile.name}'
 
 	unsafe {
-		C.memset(output, 0, amount)
+		vmemset(output, 0, amount)
 	}
 
 	return sqlite.sqlite_ioerr_short_read

diff --git a/vlib/db/sqlite/stmt.v → vlib/db/sqlite/stmt.c.v b/vlib/db/sqlite/stmt.v → vlib/db/sqlite/stmt.c.v
diff --git a/vlib/db/sqlite/vfs_lowlevel.v → vlib/db/sqlite/vfs_lowlevel.c.v b/vlib/db/sqlite/vfs_lowlevel.v → vlib/db/sqlite/vfs_lowlevel.c.v