zedd/zrm
zedd/zrm
1
0
Fork 0
Code Issues 8 Pull requests Releases 4 Activity

Generalize query results mapping.

Browse source
This commit is contained in:
Madeorsk 2024-10-22 21:42:00 +02:00
parent f186b99fde
commit f39fc2cadd
Signed by: Madeorsk
GPG key ID: 677E51CA765BB79F
4 changed files with 37 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/insert.zig
View file

@ -334,30 +334,8 @@ pub fn RepositoryInsert(comptime Model: type, comptime TableShape: type, comptim
defer self.connection.release();
defer queryResult.deinit();
//TODO deduplicate this in postgresql.zig, we could do it if Mapper type was exposed.
//TODO make a generic mapper and do it in repository.zig?
// Create an arena for mapper data.
var mapperArena = std.heap.ArenaAllocator.init(allocator);
// Get result mapper.
const mapper = queryResult.mapper(TableShape, .{ .allocator = mapperArena.allocator() });
// Initialize models list.
var models = std.ArrayList(*Model).init(allocator);
defer models.deinit();
// Get all raw models from the result mapper.
while (try mapper.next()) |rawModel| {
// Parse each raw model from the mapper.
const model = try allocator.create(Model);
model.* = try repositoryConfig.fromSql(rawModel);
try models.append(model);
}
// Return a result with the models.
return repository.RepositoryResult(Model).init(allocator,
zollections.Collection(Model).init(allocator, try models.toOwnedSlice()),
mapperArena,
);
// Map query results.
return postgresql.mapResults(Model, TableShape, repositoryConfig, allocator, queryResult);
}
/// Initialize a new repository insert query.

31
src/postgresql.zig
View file

@ -1,5 +1,6 @@
const std = @import("std");
const pg = @import("pg");
const zollections = @import("zollections");
const global = @import("global.zig");
const errors = @import("errors.zig");
const database = @import("database.zig");
@ -55,3 +56,33 @@ pub fn handleRawPostgresqlError(err: anyerror, connection: *pg.Conn) anyerror {
return err;
}
}
/// Generic query results mapping.
pub fn mapResults(comptime Model: type, comptime TableShape: type,
repositoryConfig: repository.RepositoryConfiguration(Model, TableShape),
allocator: std.mem.Allocator, queryResult: *pg.Result) !repository.RepositoryResult(Model)
{
//TODO make a generic mapper and do it in repository.zig?
// Create an arena for mapper data.
var mapperArena = std.heap.ArenaAllocator.init(allocator);
// Get result mapper.
const mapper = queryResult.mapper(TableShape, .{ .allocator = mapperArena.allocator() });
// Initialize models list.
var models = std.ArrayList(*Model).init(allocator);
defer models.deinit();
// Get all raw models from the result mapper.
while (try mapper.next()) |rawModel| {
// Parse each raw model from the mapper.
const model = try allocator.create(Model);
model.* = try repositoryConfig.fromSql(rawModel);
try models.append(model);
}
// Return a result with the models.
return repository.RepositoryResult(Model).init(allocator,
zollections.Collection(Model).init(allocator, try models.toOwnedSlice()),
mapperArena,
);
}

26
src/query.zig
View file

@ -220,30 +220,8 @@ pub fn RepositoryQuery(comptime Model: type, comptime TableShape: type, comptime
defer self.connection.release();
defer queryResult.deinit();
//TODO deduplicate this in postgresql.zig, we could do it if Mapper type was exposed.
//TODO make a generic mapper and do it in repository.zig?
// Create an arena for mapper data.
var mapperArena = std.heap.ArenaAllocator.init(allocator);
// Get result mapper.
const mapper = queryResult.mapper(TableShape, .{ .allocator = mapperArena.allocator() });
// Initialize models list.
var models = std.ArrayList(*Model).init(allocator);
defer models.deinit();
// Get all raw models from the result mapper.
while (try mapper.next()) |rawModel| {
// Parse each raw model from the mapper.
const model = try allocator.create(Model);
model.* = try repositoryConfig.fromSql(rawModel);
try models.append(model);
}
// Return a result with the models.
return repository.RepositoryResult(Model).init(allocator,
zollections.Collection(Model).init(allocator, try models.toOwnedSlice()),
mapperArena,
);
// Map query results.
return postgresql.mapResults(Model, TableShape, repositoryConfig, allocator, queryResult);
}
/// Initialize a new repository query.

26
src/update.zig
View file

@ -308,30 +308,8 @@ pub fn RepositoryUpdate(comptime Model: type, comptime TableShape: type, comptim
defer self.connection.release();
defer queryResult.deinit();
//TODO deduplicate this in postgresql.zig, we could do it if Mapper type was exposed.
//TODO make a generic mapper and do it in repository.zig?
// Create an arena for mapper data.
var mapperArena = std.heap.ArenaAllocator.init(allocator);
// Get result mapper.
const mapper = queryResult.mapper(TableShape, .{ .allocator = mapperArena.allocator() });
// Initialize models list.
var models = std.ArrayList(*Model).init(allocator);
defer models.deinit();
// Get all raw models from the result mapper.
while (try mapper.next()) |rawModel| {
// Parse each raw model from the mapper.
const model = try allocator.create(Model);
model.* = try repositoryConfig.fromSql(rawModel);
try models.append(model);
}
// Return a result with the models.
return repository.RepositoryResult(Model).init(allocator,
zollections.Collection(Model).init(allocator, try models.toOwnedSlice()),
mapperArena,
);
// Map query results.
return postgresql.mapResults(Model, TableShape, repositoryConfig, allocator, queryResult);
}
/// Initialize a new repository update query.