relikd/appchk-app
1
0
Fork 0
Code Issues Pull Requests Releases Activity

DB readText -> col_text

Browse Source
This commit is contained in:
relikd
2020-06-27 00:54:50 +02:00
parent c7d0dc7c5f
commit 2312187670
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/DB/DBAppOnly.swift
View File

@@ -180,7 +180,7 @@ extension SQLiteDatabase {
try? run(sql: "SELECT fqdn, ts FROM heap WHERE ts >= ? AND ts <= ? ORDER BY ts DESC, rowid ASC;", try? run(sql: "SELECT fqdn, ts FROM heap WHERE ts >= ? AND ts <= ? ORDER BY ts DESC, rowid ASC;",
bind: [BindInt64(ts1), BindInt64(ts2)]) { bind: [BindInt64(ts1), BindInt64(ts2)]) {
allRows($0) { allRows($0) {
(readText($0, 0) ?? "", col_ts($0, 1)) (col_text($0, 0) ?? "", col_ts($0, 1))
} }
} }
} }
@@ -205,7 +205,7 @@ extension SQLiteDatabase {
} }
return try? run(sql: "SELECT \(col), COUNT(*), COUNT(opt), MAX(ts) FROM heap \(Where) GROUP BY \(col);", bind: Where.bindings) { return try? run(sql: "SELECT \(col), COUNT(*), COUNT(opt), MAX(ts) FROM heap \(Where) GROUP BY \(col);", bind: Where.bindings) {
allRows($0) { allRows($0) {
GroupedDomain(domain: readText($0, 0) ?? "", GroupedDomain(domain: col_text($0, 0) ?? "",
total: sqlite3_column_int($0, 1), total: sqlite3_column_int($0, 1),
blocked: sqlite3_column_int($0, 2), blocked: sqlite3_column_int($0, 2),
lastModified: col_ts($0, 3)) lastModified: col_ts($0, 3))
@@ -287,7 +287,7 @@ extension SQLiteDatabase {
) ORDER BY rank ASC LIMIT 99; ) ORDER BY rank ASC LIMIT 99;
""", bind: [BindInt64(dt), BindInt64(low), BindInt64(high), BindText(fqdn), BindInt64(dt)]) { """, bind: [BindInt64(dt), BindInt64(low), BindInt64(high), BindText(fqdn), BindInt64(dt)]) {
allRows($0) { allRows($0) {
(readText($0, 0) ?? "", sqlite3_column_int($0, 1), sqlite3_column_double($0, 2), sqlite3_column_double($0, 3)) (col_text($0, 0) ?? "", sqlite3_column_int($0, 1), sqlite3_column_double($0, 2), sqlite3_column_double($0, 3))
} }
} }
} }
@@ -368,9 +368,9 @@ extension SQLiteDatabase {
return Recording(id: sqlite3_column_int64(stmt, 0), return Recording(id: sqlite3_column_int64(stmt, 0),
start: col_ts(stmt, 1), start: col_ts(stmt, 1),
stop: end == 0 ? nil : end, stop: end == 0 ? nil : end,
appId: readText(stmt, 3), appId: col_text(stmt, 3),
title: readText(stmt, 4), title: col_text(stmt, 4),
notes: readText(stmt, 5)) notes: col_text(stmt, 5))
} }
/// `WHERE stop IS NULL` /// `WHERE stop IS NULL`
@@ -448,7 +448,7 @@ extension SQLiteDatabase {
func recordingLogsGetGrouped(_ r: Recording) -> [RecordLog]? { func recordingLogsGetGrouped(_ r: Recording) -> [RecordLog]? {
try? run(sql: "SELECT domain, COUNT() FROM recLog WHERE rid = ? GROUP BY domain;", try? run(sql: "SELECT domain, COUNT() FROM recLog WHERE rid = ? GROUP BY domain;",
bind: [BindInt64(r.id)]) { bind: [BindInt64(r.id)]) {
allRows($0) { (readText($0, 0) ?? "", sqlite3_column_int($0, 1)) } allRows($0) { (col_text($0, 0) ?? "", sqlite3_column_int($0, 1)) }
} }
} }
} }

2
main/DB/DBCommon.swift
View File

@@ -71,7 +71,7 @@ extension SQLiteDatabase {
return try? run(sql: "SELECT domain, opt FROM filter \(rv>0 ? "WHERE opt & ?" : "");", return try? run(sql: "SELECT domain, opt FROM filter \(rv>0 ? "WHERE opt & ?" : "");",
bind: rv>0 ? [BindInt32(rv)] : []) { bind: rv>0 ? [BindInt32(rv)] : []) {
allRowsKeyed($0) { allRowsKeyed($0) {
(key: readText($0, 0) ?? "", (key: col_text($0, 0) ?? "",
value: FilterOptions(rawValue: sqlite3_column_int($0, 1))) value: FilterOptions(rawValue: sqlite3_column_int($0, 1)))
} }
} }

2
main/DB/DBCore.swift
View File

@@ -193,7 +193,7 @@ extension SQLiteDatabase {
var numberOfChanges: Int32 { get { sqlite3_changes(dbPointer) } } var numberOfChanges: Int32 { get { sqlite3_changes(dbPointer) } }
var lastInsertedRow: SQLiteRowID { get { sqlite3_last_insert_rowid(dbPointer) } } var lastInsertedRow: SQLiteRowID { get { sqlite3_last_insert_rowid(dbPointer) } }
func readText(_ stmt: OpaquePointer, _ col: Int32) -> String? { func col_text(_ stmt: OpaquePointer, _ col: Int32) -> String? {
let val = sqlite3_column_text(stmt, col) let val = sqlite3_column_text(stmt, col)
return (val != nil ? String(cString: val!) : nil) return (val != nil ? String(cString: val!) : nil)
} }