jdb/fiber-orm-nim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jdb:1.0.0
Branches Tags
jdb:main
jdb:3.1.1 jdb:3.1.0 jdb:3.0.0 jdb:2.2.0 jdb:2.1.1 jdb:2.1.0 jdb:2.0.0 jdb:1.0.4 jdb:1.0.3 jdb:1.0.2 jdb:1.0.1 jdb:1.0.0 jdb:0.3.6 jdb:0.3.5 jdb:0.3.4 jdb:0.3.3 jdb:0.3.2 jdb:0.3.1 jdb:0.3.0 jdb:0.2.0 jdb:0.1.2 jdb:0.1.1 jdb:0.1.0
..
compare: jdb:1.0.2
Branches Tags
jdb:main
jdb:3.1.1 jdb:3.1.0 jdb:3.0.0 jdb:2.2.0 jdb:2.1.1 jdb:2.1.0 jdb:2.0.0 jdb:1.0.4 jdb:1.0.3 jdb:1.0.2 jdb:1.0.1 jdb:1.0.0 jdb:0.3.6 jdb:0.3.5 jdb:0.3.4 jdb:0.3.3 jdb:0.3.2 jdb:0.3.1 jdb:0.3.0 jdb:0.2.0 jdb:0.1.2 jdb:0.1.1 jdb:0.1.0

3 Commits
1.0.0 ... 1.0.2

Author SHA1 Message Date
Jonathan Bernard
1d7c955805 Bugfix: don't try to cull connections from an empty pool. 
The first step in culling connections was to take a subset of the pool's
connections from index 0 to numToCull. This leads to an error if
numToCull is also zero.
 2022-06-04 10:46:00 -05:00
Jonathan Bernard
9625ac6a5e withPool executes provided statement block in a try/finally to ensure the connection is released. 2022-04-25 18:22:34 -05:00
Jonathan Bernard
d4540a1de7 Make column ordering explicit in createRecord return. 
The Nim [Row][nim-row] implementation only supports positional
identification of columns. In other words, there is nothing to tell us
which column is in which position. Because of this, we always create SQL
statements which explicitly name the columns we wish to receive so that
we know the order of columns and can rebuild models appropriately.

`createRule` wasn't doing this but naively using `RETURNING *`. This
still works as long as the field ordering in the Nim model class match
the default column ordering returned by the database, but confuses
columns otherwise. This fixes that by specifying explicitly the column
ordering as we do in other places.

[nim-row]: https://nim-lang.org/docs/db_postgres.html#Row
 2022-03-11 12:54:14 -06:00
3 changed files with 14 additions and 14 deletions
Expand all files Collapse all files

2
fiber_orm.nimble
View File

@ -1,6 +1,6 @@
# Package # Package
version = "1.0.0" version = "1.0.2"
author = "Jonathan Bernard" author = "Jonathan Bernard"
description = "Lightweight Postgres ORM for Nim." description = "Lightweight Postgres ORM for Nim."
license = "GPL-3.0" license = "GPL-3.0"

4
src/fiber_orm.nim
View File

@ -34,13 +34,11 @@ proc createRecord*[T](db: DbConn, rec: T): T =
var mc = newMutateClauses() var mc = newMutateClauses()
populateMutateClauses(rec, true, mc) populateMutateClauses(rec, true, mc)
# Confusingly, getRow allows inserts and updates. We use it to get back the ID
# we want from the row.
let sqlStmt = let sqlStmt =
"INSERT INTO " & tableName(rec) & "INSERT INTO " & tableName(rec) &
" (" & mc.columns.join(",") & ") " & " (" & mc.columns.join(",") & ") " &
" VALUES (" & mc.placeholders.join(",") & ") " & " VALUES (" & mc.placeholders.join(",") & ") " &
" RETURNING *" " RETURNING " & columnNamesForModel(rec).join(",")
log().debug "createRecord: [" & sqlStmt & "]" log().debug "createRecord: [" & sqlStmt & "]"
let newRow = db.getRow(sql(sqlStmt), mc.values) let newRow = db.getRow(sql(sqlStmt), mc.values)

22
src/fiber_orm/pool.nim
View File

@ -62,14 +62,16 @@ proc maintain(pool: DbConnPool): void =
let freeConns = pool.conns.filterIt(it.free) let freeConns = pool.conns.filterIt(it.free)
if pool.conns.len > pool.cfg.poolSize and freeConns.len > 0: if pool.conns.len > pool.cfg.poolSize and freeConns.len > 0:
let numToCull = min(freeConns.len, pool.conns.len - pool.cfg.poolSize) let numToCull = min(freeConns.len, pool.conns.len - pool.cfg.poolSize)
let toCull = freeConns[0..numToCull]
pool.conns.keepIf((pc) => toCull.allIt(it.id != pc.id)) if numToCull > 0:
for culled in toCull: let toCull = freeConns[0..numToCull]
try: culled.conn.close() pool.conns.keepIf((pc) => toCull.allIt(it.id != pc.id))
except: discard "" for culled in toCull:
log().debug( try: culled.conn.close()
"Trimming pool size. Culled $# free connections. $# connections remaining." % except: discard ""
[$toCull.len, $pool.conns.len]) log().debug(
"Trimming pool size. Culled $# free connections. $# connections remaining." %
[$toCull.len, $pool.conns.len])
proc take*(pool: DbConnPool): tuple[id: int, conn: DbConn] = proc take*(pool: DbConnPool): tuple[id: int, conn: DbConn] =
pool.maintain pool.maintain
@ -93,5 +95,5 @@ proc release*(pool: DbConnPool, connId: int): void =
template withConn*(pool: DbConnPool, stmt: untyped): untyped = template withConn*(pool: DbConnPool, stmt: untyped): untyped =
let (connId, conn {.inject.}) = take(pool) let (connId, conn {.inject.}) = take(pool)
stmt try: stmt
release(pool, connId) finally: release(pool, connId)