vfmt: change all '$expr' to '${expr}' (#16428)

vlib/sqlite/orm.v

@@ -9,7 +9,7 @@ pub fn (db DB) @select(config orm.SelectConfig, data orm.QueryData, where orm.Qu
 	// 1. Create query and bind necessary data
 	query := orm.orm_select_gen(config, '`', true, '?', 1, where)
 	$if trace_sqlite ? {
-		eprintln('> @select query: "$query"')
+		eprintln('> @select query: "${query}"')
 	}
 	stmt := db.new_init_stmt(query)!
 	defer {
@@ -83,7 +83,7 @@ pub fn (db DB) create(table string, fields []orm.TableField) ! {
 }
 
 pub fn (db DB) drop(table string) ! {
-	query := 'DROP TABLE `$table`;'
+	query := 'DROP TABLE `${table}`;'
 	sqlite_stmt_worker(db, query, orm.QueryData{}, orm.QueryData{})!
 }
 
@@ -92,7 +92,7 @@ pub fn (db DB) drop(table string) ! {
 // Executes query and bind prepared statement data directly
 fn sqlite_stmt_worker(db DB, query string, data orm.QueryData, where orm.QueryData) ! {
 	$if trace_sqlite ? {
-		eprintln('> sqlite_stmt_worker query: "$query"')
+		eprintln('> sqlite_stmt_worker query: "${query}"')
 	}
 	stmt := db.new_init_stmt(query)!
 	defer {
@@ -158,7 +158,7 @@ fn (stmt Stmt) sqlite_select_column(idx int, typ int) !orm.Primitive {
 		d := stmt.get_int(idx)
 		primitive = time.unix(d)
 	} else {
-		return error('Unknown type $typ')
+		return error('Unknown type ${typ}')
 	}
 
 	return primitive
@@ -173,6 +173,6 @@ fn sqlite_type_from_v(typ int) !string {
 	} else if typ == orm.string {
 		'TEXT'
 	} else {
-		error('Unknown type $typ')
+		error('Unknown type ${typ}')
 	}
 }

vlib/sqlite/sqlite.v

@@ -264,7 +264,7 @@ pub fn (db &DB) exec_one(query string) !Row {
 [manualfree]
 pub fn (db &DB) error_message(code int, query string) IError {
 	errmsg := unsafe { cstring_to_vstring(&char(C.sqlite3_errmsg(db.conn))) }
-	msg := '$errmsg ($code) ($query)'
+	msg := '${errmsg} (${code}) (${query})'
 	unsafe { errmsg.free() }
 	return SQLError{
 		msg: msg
@@ -293,7 +293,7 @@ pub fn (db &DB) exec_param(query string, param string) []Row {
 // Creates table named 'table_name', with columns generated from 'columns' array.
 // Default columns type will be TEXT.
 pub fn (db &DB) create_table(table_name string, columns []string) {
-	db.exec('create table if not exists $table_name (' + columns.join(',\n') + ')')
+	db.exec('create table if not exists ${table_name} (' + columns.join(',\n') + ')')
 }
 
 // Set a busy timeout in milliseconds.

vlib/sqlite/sqlite_vfs_lowlevel_test.v

@@ -20,7 +20,7 @@ fn test_vfs_register() {
 		panic('expected that vfs is not known')
 	}
 
-	vfs_descr.register_as_nondefault() or { panic('vfs register failed $err') }
+	vfs_descr.register_as_nondefault() or { panic('vfs register failed ${err}') }
 
 	sqlite.get_vfs(vfs_name)?
 
@@ -28,7 +28,7 @@ fn test_vfs_register() {
 
 	assert now_default_vfs.zName == org_default_vfs.zName
 
-	vfs_descr.unregister() or { panic('vfs unregister failed $err') }
+	vfs_descr.unregister() or { panic('vfs unregister failed ${err}') }
 
 	if _ := sqlite.get_vfs(vfs_name) {
 		panic('vfs supposedly unregistered yet somehow still foundable')
@@ -119,7 +119,7 @@ fn example_vfs_fullpathname(vfs &sqlite.Sqlite3_vfs, input &char, size_of_output
 	}
 	result := unsafe { cstring_to_vstring(output) }
 
-	vfs_state.log << 'fullpathname from=$from to=$result}'
+	vfs_state.log << 'fullpathname from=${from} to=${result}}'
 
 	return sqlite.sqlite_ok
 }
@@ -174,7 +174,7 @@ fn example_vfs_open(vfs &sqlite.Sqlite3_vfs, file_name_or_null_for_tempfile &cha
 		outp.name = file_name.clone()
 		outp.vfs_state = vfs_state
 	}
-	vfs_state.log << 'open temp?=$is_temp name=$file_name'
+	vfs_state.log << 'open temp?=${is_temp} name=${file_name}'
 
 	return sqlite.sqlite_ok
 }
@@ -213,7 +213,7 @@ fn example_vfsfile_read(file &sqlite.Sqlite3_file, output voidptr, amount int, o
 
 	mut vfsfile := to_vfsopenedfile(file)
 
-	vfsfile.vfs_state.log << 'read file=$vfsfile.name'
+	vfsfile.vfs_state.log << 'read file=${vfsfile.name}'
 
 	unsafe {
 		C.memset(output, 0, amount)
@@ -263,7 +263,7 @@ fn example_vfsfile_close(file &sqlite.Sqlite3_file) int {
 
 	mut vfsfile := to_vfsopenedfile(file)
 
-	vfsfile.vfs_state.log << 'close file=$vfsfile.name'
+	vfsfile.vfs_state.log << 'close file=${vfsfile.name}'
 
 	return sqlite.sqlite_ok
 }

vlib/sqlite/vfs_lowlevel.v

@@ -118,14 +118,14 @@ pub fn get_default_vfs() ?&Sqlite3_vfs {
 pub fn (mut v Sqlite3_vfs) register_as_nondefault() ? {
 	res := C.sqlite3_vfs_register(v, 0)
 
-	return if sqlite_ok == res { none } else { error('sqlite3_vfs_register returned $res') }
+	return if sqlite_ok == res { none } else { error('sqlite3_vfs_register returned ${res}') }
 }
 
 // unregister Requests sqlite to stop using VFS as passed in receiver argument
 pub fn (mut v Sqlite3_vfs) unregister() ? {
 	res := C.sqlite3_vfs_unregister(v)
 
-	return if sqlite_ok == res { none } else { error('sqlite3_vfs_unregister returned $res') }
+	return if sqlite_ok == res { none } else { error('sqlite3_vfs_unregister returned ${res}') }
 }
 
 // https://www.sqlite.org/c3ref/open.html