orm: fix u8/i8 OID mapping and string default quoting

examples/veb_fullstack/product_entities.v

@@ -5,5 +5,5 @@ struct Product {
 	id         int @[primary; sql: serial]
 	user_id    int
 	name       string @[sql_type: 'TEXT']
-	created_at string @[default: 'CURRENT_TIMESTAMP']
+	created_at string @[default: CURRENT_TIMESTAMP]
 }

examples/veb_orm_jwt/user_entities.v

@@ -6,8 +6,8 @@ mut:
 	id         int    @[primary; sql: serial]
 	username   string @[required; sql_type: 'TEXT']
 	password   string @[required; sql_type: 'TEXT']
-	created_at string @[default: 'CURRENT_TIMESTAMP']
-	updated_at string @[default: 'CURRENT_TIMESTAMP']
-	deleted_at string @[default: 'CURRENT_TIMESTAMP']
+	created_at string @[default: CURRENT_TIMESTAMP]
+	updated_at string @[default: CURRENT_TIMESTAMP]
+	deleted_at string @[default: CURRENT_TIMESTAMP]
 	active     bool
 }

vlib/db/mysql/mysql_orm_test.v

@@ -34,14 +34,14 @@ mut:
 struct TestDefaultAttribute {
 	id         string @[primary; sql: serial]
 	name       string
-	created_at string @[default: 'CURRENT_TIMESTAMP'; sql_type: 'TIMESTAMP']
+	created_at string @[default: CURRENT_TIMESTAMP; sql_type: 'TIMESTAMP']
 }
 
 @[comment: 'This is a table comment']
 struct TestCommentAttribute {
 	id         string @[primary; sql: serial]
 	name       string @[comment: 'real user name']
-	created_at string @[default: 'CURRENT_TIMESTAMP'; sql_type: 'TIMESTAMP']
+	created_at string @[default: CURRENT_TIMESTAMP; sql_type: 'TIMESTAMP']
 }
 
 fn test_mysql_orm() {

vlib/db/pg/orm.v

@@ -311,9 +311,10 @@ fn pg_stmt_match(mut types []u32, mut vals []&char, mut lens []int, mut formats
 			formats << 1
 		}
 		u8 {
-			types << u32(Oid.t_char)
-			vals << &char(&data)
-			lens << int(sizeof(u8))
+			types << u32(Oid.t_int2)
+			num := conv.hton16(u16(data))
+			vals << &char(&num)
+			lens << int(sizeof(u16))
 			formats << 1
 		}
 		u16 {
@@ -338,9 +339,10 @@ fn pg_stmt_match(mut types []u32, mut vals []&char, mut lens []int, mut formats
 			formats << 1
 		}
 		i8 {
-			types << u32(Oid.t_char)
-			vals << &char(&data)
-			lens << int(sizeof(i8))
+			types << u32(Oid.t_int2)
+			num := conv.hton16(u16(data))
+			vals << &char(&num)
+			lens << int(sizeof(i16))
 			formats << 1
 		}
 		i16 {

vlib/db/pg/pg_orm_test.v

@@ -33,7 +33,7 @@ mut:
 struct TestDefaultAttribute {
 	id         string @[default: 'gen_random_uuid()'; primary; sql_type: 'uuid']
 	name       string
-	created_at string @[default: 'CURRENT_TIMESTAMP'; sql_type: 'TIMESTAMP']
+	created_at string @[default: CURRENT_TIMESTAMP; sql_type: 'TIMESTAMP']
 }
 
 struct TestInsertDefaultValues {
@@ -45,7 +45,7 @@ struct TestInsertDefaultValues {
 struct TestCommentAttribute {
 	id         string @[primary; sql: serial]
 	name       string @[comment: 'real user name']
-	created_at string @[default: 'CURRENT_TIMESTAMP'; sql_type: 'TIMESTAMP']
+	created_at string @[default: CURRENT_TIMESTAMP; sql_type: 'TIMESTAMP']
 }
 
 fn test_pg_orm() {

vlib/db/sqlite/sqlite_orm_test.v

@@ -17,9 +17,9 @@ struct TestCustomSqlType {
 struct TestDefaultAttribute {
 	id          string @[primary; sql: serial]
 	name        string
-	created_at  ?string @[default: 'CURRENT_TIME']
-	created_at1 ?string @[default: 'CURRENT_DATE']
-	created_at2 ?string @[default: 'CURRENT_TIMESTAMP']
+	created_at  ?string @[default: CURRENT_TIME]
+	created_at1 ?string @[default: CURRENT_DATE]
+	created_at2 ?string @[default: CURRENT_TIMESTAMP]
 }
 
 struct TestDurationAlias {

vlib/orm/orm.v

@@ -499,6 +499,25 @@ fn trim_attr_arg(arg string) string {
 	return out
 }
 
+fn is_sql_expr(val string) bool {
+	// Function calls like gen_random_uuid(), NOW(), etc.
+	// Written as @[default: 'gen_random_uuid()'] — we detect the shape:
+	// must start with a letter/underscore, have ( and end with ),
+	// and the part before ( must be a valid SQL identifier.
+	if val.contains('(') && val.ends_with(')') {
+		before_paren := val.all_before('(')
+		if before_paren.len > 0 && (before_paren[0].is_letter() || before_paren[0] == `_`) {
+			for ch in before_paren {
+				if !ch.is_letter() && !ch.is_digit() && ch != `_` {
+					return false
+				}
+			}
+			return true
+		}
+	}
+	return false
+}
+
 fn tenant_filter_array_primitive_type[T](value []T) int {
 	if value.len > 0 {
 		first := value[0]
@@ -1417,6 +1436,7 @@ pub fn orm_table_gen(sql_dialect SQLDialect, table Table, q string, defaults boo
 		}
 		mut default_val := field.default_val
 		mut has_default := default_val != ''
+		mut is_str_default := false
 		mut nullable := field.nullable
 		mut is_unique := false
 		mut is_skip := false
@@ -1469,6 +1489,7 @@ pub fn orm_table_gen(sql_dialect SQLDialect, table Table, q string, defaults boo
 				}
 				'default' {
 					has_default = true
+					is_str_default = attr.kind == .string
 					if default_val == '' {
 						default_val = attr.arg.trim_space()
 					}
@@ -1525,7 +1546,12 @@ pub fn orm_table_gen(sql_dialect SQLDialect, table Table, q string, defaults boo
 		stmt = '${q}${field_name}${q} ${col_typ}'
 		if defaults && has_default {
 			if default_val != '' {
-				stmt += ' DEFAULT ${default_val}'
+				if is_str_default && !is_sql_expr(default_val) {
+					escaped := default_val.replace("'", "''")
+					stmt += " DEFAULT '${escaped}'"
+				} else {
+					stmt += ' DEFAULT ${default_val}'
+				}
 			} else {
 				// Handle @[default: ''] - explicitly set DEFAULT '' for the column
 				stmt += " DEFAULT ''"

vlib/orm/orm_func_test.v

@@ -64,7 +64,7 @@ struct UserPart {
 
 struct UrlDefaultAttr {
 	id  int    @[primary; sql: serial]
-	url string @[default: '"https://example.test"']
+	url string @[default: 'https://example.test']
 }
 
 fn test_orm_func_field_attribute_argument_with_colon() {

vlib/orm/orm_null_test.v

@@ -106,7 +106,7 @@ struct Foo {
 mut:
 	id u64 @[primary; sql: serial]
 	a  string
-	b  string @[default: '"yes"']
+	b  string @[default: 'yes']
 	c  ?string
 	d  ?string = 'hi'
 	e  int
@@ -139,7 +139,7 @@ fn test_option_struct_fields_and_none() {
 	sql db {
 		create table Foo
 	}!
-	assert db.st.last == 'CREATE TABLE IF NOT EXISTS `foo` (`id` serial-type NOT NULL, `a` string-type NOT NULL, `b` string-type DEFAULT "yes" NOT NULL, `c` string-type, `d` string-type, `e` int-type NOT NULL, `f` int-type DEFAULT 33 NOT NULL, `g` int-type, `h` int-type, PRIMARY KEY(`id`));'
+	assert db.st.last == "CREATE TABLE IF NOT EXISTS `foo` (`id` serial-type NOT NULL, `a` string-type NOT NULL, `b` string-type DEFAULT 'yes' NOT NULL, `c` string-type, `d` string-type, `e` int-type NOT NULL, `f` int-type DEFAULT 33 NOT NULL, `g` int-type, `h` int-type, PRIMARY KEY(`id`));"
 
 	_ := sql db {
 		select from Foo where e > 5 && c is none && c !is none && h == 2

vlib/orm/orm_option_time_test.v

@@ -6,7 +6,7 @@ import time
 struct Foo {
 	id         int @[primary; sql: serial]
 	name       string
-	created_at time.Time @[default: 'CURRENT_TIME']
+	created_at time.Time @[default: CURRENT_TIME]
 	updated_at ?string   @[sql_type: 'TIMESTAMP']
 	deleted_at ?time.Time
 	children   []Child @[fkey: 'parent_id']

vlib/orm/orm_upsert_test.v

@@ -32,7 +32,7 @@ mut:
 struct DefaultUpsertUser {
 mut:
 	id     int    @[primary]
-	status string @[default: '"active"']
+	status string @[default: 'active']
 }
 
 fn test_upsert_updates_existing_row_using_unique_field() {

vlib/v/tests/orm_array_field_test.v

@@ -7,8 +7,8 @@ struct TaskMetadata {
 	task_id    string
 	key        string
 	value      string
-	created_at time.Time @[default: 'CURRENT_TIME']
-	updated_at time.Time @[default: 'CURRENT_TIME']
+	created_at time.Time @[default: CURRENT_TIME]
+	updated_at time.Time @[default: CURRENT_TIME]
 }
 
 @[table: 'tasks']

vlib/v3/tests/orm_join_sql_attr_test.v

@@ -149,16 +149,16 @@ fn main() {
 ")
 	assert selector_db_out == ''
 
-	mutated_insert_out := orm_join_sql_attr_run(v3_bin, 'orm_mutated_insert_fields', 'import db.sqlite
+	mutated_insert_out := orm_join_sql_attr_run(v3_bin, 'orm_mutated_insert_fields', "import db.sqlite
 
 struct MutatedInsertUser {
 	id int @[primary; sql: serial]
-mut:
-	name string @[default: \'"db_default"\']
+	mut:
+		name string @[default: 'db_default']
 }
 
 fn main() {
-	mut db := sqlite.connect(\':memory:\') or { panic(err) }
+	mut db := sqlite.connect(':memory:') or { panic(err) }
 	defer {
 		db.close() or {}
 	}
@@ -168,7 +168,7 @@ fn main() {
 	}!
 
 	mut user := MutatedInsertUser{}
-	user.name = \'Ada\'
+	user.name = 'Ada'
 	sql db {
 		insert user into MutatedInsertUser
 	}!
@@ -177,24 +177,24 @@ fn main() {
 		select from MutatedInsertUser
 	}!
 	assert rows.len == 1
-	assert rows[0].name == \'Ada\'
+	assert rows[0].name == 'Ada'
 }
-')
+")
 	assert mutated_insert_out == ''
 
-	selector_insert_out := orm_join_sql_attr_run(v3_bin, 'orm_selector_insert_value', 'import db.sqlite
+	selector_insert_out := orm_join_sql_attr_run(v3_bin, 'orm_selector_insert_value', "import db.sqlite
 
 struct SelectorInsertUser {
 	id int @[primary]
-	name string @[default: \'"db_default"\']
+	name string @[default: 'db_default']
 }
 
 struct SelectorInsertRequest {
 	user SelectorInsertUser
 }
 
 fn main() {
-	mut db := sqlite.connect(\':memory:\') or { panic(err) }
+	mut db := sqlite.connect(':memory:') or { panic(err) }
 	defer {
 		db.close() or {}
 	}
@@ -206,7 +206,7 @@ fn main() {
 	request := SelectorInsertRequest{
 		user: SelectorInsertUser{
 			id: 1
-			name: \'Ada\'
+			name: 'Ada'
 		}
 	}
 	sql db {
@@ -217,12 +217,12 @@ fn main() {
 		select from SelectorInsertUser where id == 1
 	}!
 	assert first.len == 1
-	assert first[0].name == \'Ada\'
+	assert first[0].name == 'Ada'
 
 	update_request := SelectorInsertRequest{
 		user: SelectorInsertUser{
 			id: 1
-			name: \'Grace\'
+			name: 'Grace'
 		}
 	}
 	sql db {
@@ -233,9 +233,9 @@ fn main() {
 		select from SelectorInsertUser where id == 1
 	}!
 	assert updated.len == 1
-	assert updated[0].name == \'Grace\'
+	assert updated[0].name == 'Grace'
 }
-')
+")
 	assert selector_insert_out == ''
 
 	invalid_result := orm_join_sql_attr_compile(v3_bin, 'orm_invalid_static_where', "import db.sqlite