From fa4fda59989abbbc5358ea97dbdc045681944e20 Mon Sep 17 00:00:00 2001 From: All Asmaul Husnain <2263081025@uttarauniversity.edu.bd> Date: Sun, 15 Nov 2026 00:28:10 +0600 Subject: [PATCH] fix: stop legacy insert from storing the trailing semicolon in email --- src/parser.c | 2 +- tests/test_parser.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 1 deletion(-) diff --git a/src/parser.c b/src/parser.c index 3bd95e8..acc9041 100644 --- a/src/parser.c +++ b/src/parser.c @@ -78,7 +78,7 @@ static int parse_legacy_insert(const char *input, Statement *statement) char id_text[11] = {0}; int matched = sscanf( input, - "insert %10[0-9] %32s %255s%n", + "insert %10[0-9] %32[^ \t;] %255[^ \t;]%n", id_text, statement->row.username, statement->row.email, diff --git a/tests/test_parser.c b/tests/test_parser.c index d821580..8930d4d 100644 --- a/tests/test_parser.c +++ b/tests/test_parser.c @@ -1,6 +1,7 @@ #include "parser.h" #include +#include #include static void test_insert(void) @@ -77,6 +78,123 @@ static void test_invalid_input(void) PARSER_SYNTAX_ERROR); } +static void test_lowercase_insert_and_select(void) +{ + Statement statement; + assert(parse_statement( + "insert into users values (8, 'carol', 'carol@example.com');", + &statement) == PARSER_OK); + assert(statement.type == STATEMENT_INSERT); + assert(statement.row.id == 8); + assert(strcmp(statement.row.username, "carol") == 0); + assert(strcmp(statement.row.email, "carol@example.com") == 0); + + assert(parse_statement("select * from users;", &statement) == PARSER_OK); + assert(statement.type == STATEMENT_SELECT); + assert(parse_statement("select * from users where id = 9;", &statement) == + PARSER_OK); + assert(statement.where_id == 9); +} + +static void test_legacy_insert(void) +{ + Statement statement; + assert(parse_statement("insert 5 bob bob@example.com", &statement) == + PARSER_OK); + assert(statement.type == STATEMENT_INSERT); + assert(statement.row.id == 5); + assert(strcmp(statement.row.username, "bob") == 0); + assert(strcmp(statement.row.email, "bob@example.com") == 0); +} + +static void test_legacy_insert_semicolon_is_not_part_of_email(void) +{ + Statement statement; + assert(parse_statement("insert 5 bob bob@example.com;", &statement) == + PARSER_OK); + assert(statement.type == STATEMENT_INSERT); + assert(strcmp(statement.row.email, "bob@example.com") == 0); + + assert(parse_statement("insert 5 bob bob@example.com; garbage", + &statement) == PARSER_SYNTAX_ERROR); + assert(parse_statement("insert 5 bob bob@example.com garbage", + &statement) == PARSER_SYNTAX_ERROR); +} + +static void test_meta_help_and_exit(void) +{ + Statement statement; + assert(parse_statement(".help", &statement) == PARSER_OK); + assert(statement.type == META_HELP); + assert(parse_statement(".exit", &statement) == PARSER_OK); + assert(statement.type == META_EXIT); +} + +static void test_parse_rejects_null_and_empty(void) +{ + Statement statement; + assert(parse_statement(NULL, &statement) == PARSER_SYNTAX_ERROR); + assert(parse_statement("SELECT * FROM users;", NULL) == + PARSER_SYNTAX_ERROR); + assert(parse_statement("", &statement) == PARSER_SYNTAX_ERROR); +} + +static void test_parse_rejects_zero_id(void) +{ + Statement statement; + assert(parse_statement( + "INSERT INTO users VALUES (0, 'alice', 'alice@example.com');", + &statement) == PARSER_SYNTAX_ERROR); + assert(parse_statement("SELECT * FROM users WHERE id = 0;", &statement) == + PARSER_SYNTAX_ERROR); + assert(parse_statement("SELECT * FROM users WHERE id = -1;", &statement) == + PARSER_SYNTAX_ERROR); +} + +static void test_insert_rejects_empty_fields(void) +{ + Statement statement; + assert(parse_statement("INSERT INTO users VALUES (1, '', 'a@b.com');", + &statement) == PARSER_SYNTAX_ERROR); + assert(parse_statement("INSERT INTO users VALUES (1, 'alice', '');", + &statement) == PARSER_SYNTAX_ERROR); + assert(parse_statement("INSERT INTO users VALUES (1, alice, 'a@b.com');", + &statement) == PARSER_SYNTAX_ERROR); +} + +static void test_insert_field_length_limits(void) +{ + Statement statement; + char input[600]; + char field[257]; + + memset(field, 'a', 32); + field[32] = '\0'; + snprintf(input, sizeof(input), + "INSERT INTO users VALUES (1, '%s', 'a@b.com');", field); + assert(parse_statement(input, &statement) == PARSER_OK); + assert(strlen(statement.row.username) == 32U); + + memset(field, 'a', 33); + field[33] = '\0'; + snprintf(input, sizeof(input), + "INSERT INTO users VALUES (1, '%s', 'a@b.com');", field); + assert(parse_statement(input, &statement) == PARSER_SYNTAX_ERROR); + + memset(field, 'e', 255); + field[255] = '\0'; + snprintf(input, sizeof(input), + "INSERT INTO users VALUES (1, 'alice', '%s');", field); + assert(parse_statement(input, &statement) == PARSER_OK); + assert(strlen(statement.row.email) == 255U); + + memset(field, 'e', 256); + field[256] = '\0'; + snprintf(input, sizeof(input), + "INSERT INTO users VALUES (1, 'alice', '%s');", field); + assert(parse_statement(input, &statement) == PARSER_SYNTAX_ERROR); +} + int main(void) { test_insert(); @@ -88,5 +206,13 @@ int main(void) test_meta_command(); test_invalid_input(); test_numeric_overflow_is_rejected(); + test_lowercase_insert_and_select(); + test_legacy_insert(); + test_legacy_insert_semicolon_is_not_part_of_email(); + test_meta_help_and_exit(); + test_parse_rejects_null_and_empty(); + test_parse_rejects_zero_id(); + test_insert_rejects_empty_fields(); + test_insert_field_length_limits(); return 0; }