mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

orm: make last_id() return int, instead of orm.Primitive (fix #12110) (#17151)

Browse Source
This commit is contained in:
walking devel
2023-01-29 14:00:23 +00:00
committed by GitHub
parent e6a4f76f82
commit 4747e70d9d
10 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/db/mysql/orm.v
View File

@@ -153,14 +153,11 @@ pub fn (db Connection) delete(table string, where orm.QueryData) ! {
}
// last_id is used internally by V's ORM for post-processing `INSERT ` queries
pub fn (db Connection) last_id() orm.Primitive {
pub fn (db Connection) last_id() int {
query := 'SELECT last_insert_id();'
id := db.query(query) or {
Result{
result: 0
}
}
return orm.Primitive(id.rows()[0].vals[0].int())
id := db.query(query) or { return 0 }
return id.rows()[0].vals[0].int()
}
// DDL (table creation/destroying etc)

6
vlib/db/pg/orm.v
View File

@@ -51,10 +51,10 @@ pub fn (db DB) delete(table string, where orm.QueryData) ! {
}
// last_id is used internally by V's ORM for post-processing `INSERT ` queries
pub fn (db DB) last_id() orm.Primitive {
pub fn (db DB) last_id() int {
query := 'SELECT LASTVAL();'
id := db.q_int(query) or { 0 }
return orm.Primitive(id)
return db.q_int(query) or { 0 }
}
// DDL (table creation/destroying etc)

6
vlib/db/sqlite/orm.v
View File

@@ -71,10 +71,10 @@ pub fn (db DB) delete(table string, where orm.QueryData) ! {
}
// last_id is used internally by V's ORM for post-processing `INSERT ` queries
pub fn (db DB) last_id() orm.Primitive {
pub fn (db DB) last_id() int {
query := 'SELECT last_insert_rowid();'
id := db.q_int(query)
return orm.Primitive(id)
return db.q_int(query)
}
// DDL (table creation/destroying etc)