diff options
Diffstat (limited to 'query.zig')
| -rw-r--r-- | query.zig | 16 |
1 files changed, 8 insertions, 8 deletions
| @@ -10,7 +10,7 @@ pub const Text = struct { data: []const u8 }; | |||
| 10 | const BindMarker = struct { | 10 | const BindMarker = struct { |
| 11 | typed: ?type = null, // null == untyped | 11 | typed: ?type = null, // null == untyped |
| 12 | identifier: ?[]const u8 = null, | 12 | identifier: ?[]const u8 = null, |
| 13 | idType: IdType = .Integer, | 13 | id_type: IdType = .Integer, |
| 14 | 14 | ||
| 15 | pub const IdType = enum { | 15 | pub const IdType = enum { |
| 16 | Integer, | 16 | Integer, |
| @@ -48,7 +48,7 @@ pub const ParsedQuery = struct { | |||
| 48 | parsed_query.bind_markers[parsed_query.nb_bind_markers] = BindMarker{}; | 48 | parsed_query.bind_markers[parsed_query.nb_bind_markers] = BindMarker{}; |
| 49 | current_bind_marker_type_pos = 0; | 49 | current_bind_marker_type_pos = 0; |
| 50 | current_bind_marker_id_pos = 0; | 50 | current_bind_marker_id_pos = 0; |
| 51 | parsed_query.bind_markers[parsed_query.nb_bind_markers].idType = if (c == '?') .Integer else .String; | 51 | parsed_query.bind_markers[parsed_query.nb_bind_markers].id_type = if (c == '?') .Integer else .String; |
| 52 | state = .BindMarker; | 52 | state = .BindMarker; |
| 53 | buf[pos] = c; | 53 | buf[pos] = c; |
| 54 | pos += 1; | 54 | pos += 1; |
| @@ -316,23 +316,23 @@ test "parsed query: bind markers identifier type" { | |||
| 316 | const testCases = &[_]testCase{ | 316 | const testCases = &[_]testCase{ |
| 317 | .{ | 317 | .{ |
| 318 | .query = "foobar @ABC{usize}", | 318 | .query = "foobar @ABC{usize}", |
| 319 | .expected_marker = .{ .idType = .String }, | 319 | .expected_marker = .{ .id_type = .String }, |
| 320 | }, | 320 | }, |
| 321 | .{ | 321 | .{ |
| 322 | .query = "foobar ?123{text}", | 322 | .query = "foobar ?123{text}", |
| 323 | .expected_marker = .{ .idType = .Integer }, | 323 | .expected_marker = .{ .id_type = .Integer }, |
| 324 | }, | 324 | }, |
| 325 | .{ | 325 | .{ |
| 326 | .query = "foobar $abc{blob}", | 326 | .query = "foobar $abc{blob}", |
| 327 | .expected_marker = .{ .idType = .String }, | 327 | .expected_marker = .{ .id_type = .String }, |
| 328 | }, | 328 | }, |
| 329 | .{ | 329 | .{ |
| 330 | .query = "foobar ?123", | 330 | .query = "foobar ?123", |
| 331 | .expected_marker = .{ .idType = .Integer }, | 331 | .expected_marker = .{ .id_type = .Integer }, |
| 332 | }, | 332 | }, |
| 333 | .{ | 333 | .{ |
| 334 | .query = "foobar :abc", | 334 | .query = "foobar :abc", |
| 335 | .expected_marker = .{ .idType = .String }, | 335 | .expected_marker = .{ .id_type = .String }, |
| 336 | } | 336 | } |
| 337 | }; | 337 | }; |
| 338 | 338 | ||
| @@ -342,6 +342,6 @@ test "parsed query: bind markers identifier type" { | |||
| 342 | try testing.expectEqual(@as(usize, 1), parsed_query.nb_bind_markers); | 342 | try testing.expectEqual(@as(usize, 1), parsed_query.nb_bind_markers); |
| 343 | 343 | ||
| 344 | const bind_marker = parsed_query.bind_markers[0]; | 344 | const bind_marker = parsed_query.bind_markers[0]; |
| 345 | try testing.expectEqual(tc.expected_marker.idType, bind_marker.idType); | 345 | try testing.expectEqual(tc.expected_marker.id_type, bind_marker.id_type); |
| 346 | } | 346 | } |
| 347 | } | 347 | } |