Added a writeEntityTable and fixed date and time
This commit is contained in:
+18
-4
@@ -437,9 +437,9 @@ pub const FileEngine = struct {
|
||||
}
|
||||
|
||||
// Append all writer to each other
|
||||
writer.writeByte('[') catch return FileEngineError.WriteError;
|
||||
//writer.writeByte('[') catch return FileEngineError.WriteError;
|
||||
for (thread_writer_list) |list| writer.writeAll(list.items) catch return FileEngineError.WriteError;
|
||||
writer.writeByte(']') catch return FileEngineError.WriteError;
|
||||
//writer.writeByte(']') catch return FileEngineError.WriteError;
|
||||
}
|
||||
|
||||
fn parseEntitiesOneFile(
|
||||
@@ -475,7 +475,7 @@ pub const FileEngine = struct {
|
||||
if (sync_context.checkStructLimit()) break;
|
||||
if (filter) |f| if (!f.evaluate(row)) continue;
|
||||
|
||||
writeEntity(
|
||||
writeEntityTable(
|
||||
writer,
|
||||
row,
|
||||
additional_data,
|
||||
@@ -490,7 +490,21 @@ pub const FileEngine = struct {
|
||||
_ = sync_context.completeThread();
|
||||
}
|
||||
|
||||
fn writeEntity(
|
||||
fn writeEntityTable(
|
||||
writer: anytype,
|
||||
row: []zid.Data,
|
||||
additional_data: *AdditionalData,
|
||||
data_types: []const DataType,
|
||||
) !void {
|
||||
try writer.writeAll("| ");
|
||||
for (additional_data.member_to_find.items) |member| {
|
||||
try writeValue(writer, row[member.index], data_types[member.index]);
|
||||
try writer.writeAll(" \t| ");
|
||||
}
|
||||
try writer.writeByte('\n');
|
||||
}
|
||||
|
||||
fn writeEntityJSON(
|
||||
writer: anytype,
|
||||
row: []zid.Data,
|
||||
additional_data: *AdditionalData,
|
||||
|
||||
@@ -247,7 +247,7 @@ pub const Filter = struct {
|
||||
|
||||
fn evaluateNode(self: Filter, node: *FilterNode, row: []Data) bool {
|
||||
return switch (node.*) {
|
||||
.condition => |cond| Filter.evaluateCondition(cond, row),
|
||||
.condition => |cond| Filter.evaluateCondition(cond, row[cond.data_index]),
|
||||
.logical => |logical| switch (logical.operator) {
|
||||
.AND => self.evaluateNode(logical.left, row) and self.evaluateNode(logical.right, row),
|
||||
.OR => self.evaluateNode(logical.left, row) or self.evaluateNode(logical.right, row),
|
||||
@@ -256,9 +256,7 @@ pub const Filter = struct {
|
||||
};
|
||||
}
|
||||
|
||||
fn evaluateCondition(condition: Condition, row: []Data) bool {
|
||||
const row_value: Data = row[condition.data_index];
|
||||
log.debug("Checking condition {any}", .{condition});
|
||||
fn evaluateCondition(condition: Condition, row_value: Data) bool {
|
||||
return switch (condition.operation) {
|
||||
.equal => switch (condition.data_type) {
|
||||
.int => row_value.Int == condition.value.int,
|
||||
|
||||
@@ -103,3 +103,39 @@ pub fn printOpenFile(comptime format: []const u8, args: anytype, options: std.fs
|
||||
const path = std.fmt.bufPrint(&path_buffer, format, args) catch return ZipponError.CantOpenDir;
|
||||
return std.fs.cwd().openFile(path, options) catch ZipponError.CantOpenFile;
|
||||
}
|
||||
|
||||
pub fn printTable(writer: anytype, headers: []const []const u8, data: []const []const []const u8) !void {
|
||||
// Calculate column widths
|
||||
var col_widths = [_]usize{0} ** 10;
|
||||
|
||||
// Determine max width for each column
|
||||
for (headers, 0..) |header, i| {
|
||||
col_widths[i] = @max(col_widths[i], header.len);
|
||||
}
|
||||
|
||||
for (data) |row| {
|
||||
for (row, 0..) |cell, i| {
|
||||
col_widths[i] = @max(col_widths[i], cell.len);
|
||||
}
|
||||
}
|
||||
|
||||
// Print headers
|
||||
for (headers, 0..) |header, i| {
|
||||
try writer.print("{s:<[*]}", .{ header, col_widths[i] + 2 });
|
||||
}
|
||||
try writer.print("\n", .{});
|
||||
|
||||
// Print separator
|
||||
for (headers, 0..) |_, i| {
|
||||
try writer.print("{s:-<[*]}", .{ "-", col_widths[i] + 2 });
|
||||
}
|
||||
try writer.print("\n", .{});
|
||||
|
||||
// Print data rows
|
||||
for (data) |row| {
|
||||
for (row, 0..) |cell, i| {
|
||||
try writer.print("{s:<[*]}", .{ cell, col_widths[i] + 2 });
|
||||
}
|
||||
try writer.print("\n", .{});
|
||||
}
|
||||
}
|
||||
|
||||
+12
-8
@@ -1014,12 +1014,15 @@ pub const Parser = struct {
|
||||
|
||||
test "ADD" {
|
||||
try testParsing("ADD User (name = 'Bob', email='bob@email.com', age=55, scores=[ 1 ], best_friend=none, bday=2000/01/01, a_time=12:04, last_order=2000/01/01-12:45)");
|
||||
try testParsing("ADD User (name = 'Bob', email='bob@email.com', age=55, scores=[ 666 123 331 ], best_friend=none, bday=2000/01/01, a_time=12:04:54, last_order=2000/01/01-12:45)");
|
||||
try testParsing("ADD User (name = 'Bob', email='bob@email.com', age=-55, scores=[ 33 ], best_friend=none, bday=2000/01/01, a_time=12:04:54.8741, last_order=2000/01/01-12:45)");
|
||||
try testParsing("ADD User (name = 'Boba', email='boba@email.com', age=20, scores=[ ], best_friend=none, bday=2000/01/01, a_time=12:04:54.8741, last_order=2000/01/01-12:45)");
|
||||
try testParsing("ADD User (name = 'Bob', email='bob@email.com', age=55, scores=[ 666 123 331 ], best_friend=none, bday=2000/11/01, a_time=12:04:54, last_order=2000/01/01-12:45)");
|
||||
try testParsing("ADD User (name = 'Bob', email='bob@email.com', age=-55, scores=[ 33 ], best_friend=none, bday=2000/01/04, a_time=12:04:54.8741, last_order=2000/01/01-12:45)");
|
||||
try testParsing("ADD User (name = 'Boba', email='boba@email.com', age=20, scores=[ ], best_friend=none, bday=2000/06/06, a_time=04:04:54.8741, last_order=2000/01/01-12:45)");
|
||||
|
||||
// This need to take the first User named Bob as it is a unique link
|
||||
try testParsing("ADD User (name = 'Bob', email='bob@email.com', age=-55, scores=[ 1 ], best_friend={name = 'Bob'}, bday=2000/01/01, a_time=12:04:54.8741, last_order=2000/01/01-12:45)");
|
||||
try testParsing("ADD User (name = 'Bou', email='bob@email.com', age=66, scores=[ 1 ], best_friend={name = 'Boba'}, bday=2000/01/01, a_time=02:04:54.8741, last_order=2000/01/01-12:45)");
|
||||
|
||||
try testParsing("GRAB User");
|
||||
}
|
||||
|
||||
test "GRAB filter with string" {
|
||||
@@ -1062,15 +1065,16 @@ test "Specific query" {
|
||||
|
||||
test "UPDATE relationship" {
|
||||
try testParsing("UPDATE User [1] {} TO (best_friend = {name='Boba'} )");
|
||||
try testParsing("GRAB User {best_friend IN {name = 'Boba'}}"); // Not yet working
|
||||
}
|
||||
|
||||
//test "GRAB Relationship" {
|
||||
// try testParsing("GRAB User {best_friend IN {name = 'Bob'}}");
|
||||
//}
|
||||
// Not yet working but dont trow an error
|
||||
test "GRAB Relationship" {
|
||||
try testParsing("GRAB User {best_friend IN {name = 'Bob'}}");
|
||||
try testParsing("GRAB User {best_friend IN {name = 'Boba'}}");
|
||||
}
|
||||
|
||||
test "DELETE" {
|
||||
try testParsing("DELETE User {name='Bob'}");
|
||||
try testParsing("DELETE User {}");
|
||||
}
|
||||
|
||||
test "Synthax error" {
|
||||
|
||||
Reference in New Issue
Block a user