zedd/zrm
zedd/zrm
1
0
Fork 0
Code Issues 6 Pull requests Releases 7 Activity Actions

Add table name to key name in whereKey to prevent ambiguous names with inline relations.

Browse source
This commit is contained in:
Madeorsk 2024-11-25 23:28:27 +01:00
parent 8bc551b55b
commit 916def2046
Signed by: Madeorsk
GPG key ID: 677E51CA765BB79F
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/query.zig
View file

@ -160,6 +160,7 @@ pub fn RepositoryQuery(comptime Model: type, comptime TableShape: type, comptime
if (repositoryConfig.key.len == 1) { if (repositoryConfig.key.len == 1) {
// Find key name and its type. // Find key name and its type.
const keyName = repositoryConfig.key[0]; const keyName = repositoryConfig.key[0];
const qualifiedKeyName = "\"" ++ repositoryConfig.table ++ "\"." ++ keyName;
const keyType = std.meta.fields(TableShape)[std.meta.fieldIndex(TableShape, keyName).?].type; const keyType = std.meta.fields(TableShape)[std.meta.fieldIndex(TableShape, keyName).?].type;
// Accept arrays / slices of keys, and simple keys. // Accept arrays / slices of keys, and simple keys.
@ -172,28 +173,28 @@ pub fn RepositoryQuery(comptime Model: type, comptime TableShape: type, comptime
.Array => { .Array => {
if (ptr.child == u8) if (ptr.child == u8)
// If the child is a string, use it as a simple value. // If the child is a string, use it as a simple value.
try self.whereValue(KeyType, keyName, "=", modelKey) try self.whereValue(KeyType, qualifiedKeyName, "=", modelKey)
else else
// Otherwise, use it as an array. // Otherwise, use it as an array.
try self.whereIn(keyType, keyName, modelKey); try self.whereIn(keyType, qualifiedKeyName, modelKey);
}, },
// Add a simple condition with the pointed value. // Add a simple condition with the pointed value.
else => try self.whereValue(keyType, keyName, "=", modelKey.*), else => try self.whereValue(keyType, qualifiedKeyName, "=", modelKey.*),
} }
}, },
// Add a whereIn with the slice. // Add a whereIn with the slice.
else => { else => {
if (ptr.child == u8) if (ptr.child == u8)
// If the child is a string, use it as a simple value. // If the child is a string, use it as a simple value.
try self.whereValue(KeyType, keyName, "=", modelKey) try self.whereValue(KeyType, qualifiedKeyName, "=", modelKey)
else else
// Otherwise, use it as an array. // Otherwise, use it as an array.
try self.whereIn(keyType, keyName, modelKey); try self.whereIn(keyType, qualifiedKeyName, modelKey);
}, },
} }
}, },
// Add a simple condition with the given value. // Add a simple condition with the given value.
else => try self.whereValue(keyType, keyName, "=", modelKey), else => try self.whereValue(keyType, qualifiedKeyName, "=", modelKey),
} }
} else { } else {
// Accept arrays / slices of keys, and simple keys. // Accept arrays / slices of keys, and simple keys.