Update diff in part4

manikantareddygk · Apr 10, 2019 · d876834 · d876834
1 parent 7bc1ab5
commit d876834
Showing 1 changed file with 36 additions and 34 deletions.
diff --git a/_parts/part4.md b/_parts/part4.md
@@ -305,15 +305,17 @@ It's gonna be great.
 
 Here's the complete diff for this part:
 ```diff
+@@ -22,6 +22,8 @@ typedef enum MetaCommandResult_t MetaCommandResult;
+
  enum PrepareResult_t {
    PREPARE_SUCCESS,
 +  PREPARE_NEGATIVE_ID,
 +  PREPARE_STRING_TOO_LONG,
    PREPARE_SYNTAX_ERROR,
    PREPARE_UNRECOGNIZED_STATEMENT
- };
-@@ -33,8 +35,8 @@ const uint32_t COLUMN_USERNAME_SIZE = 32;
- const uint32_t COLUMN_EMAIL_SIZE = 255;
+  };
+@@ -34,8 +36,8 @@ typedef enum StatementType_t StatementType;
+ #define COLUMN_EMAIL_SIZE 255
  struct Row_t {
    uint32_t id;
 -  char username[COLUMN_USERNAME_SIZE];
@@ -322,69 +324,69 @@ Here's the complete diff for this part:
 +  char email[COLUMN_EMAIL_SIZE + 1];
  };
  typedef struct Row_t Row;
- 
-@@ -133,17 +135,40 @@ MetaCommandResult do_meta_command(InputBuffer* input_buffer) {
+
+@@ -150,18 +152,40 @@ MetaCommandResult do_meta_command(InputBuffer* input_buffer, Table *table) {
    }
  }
-
+
+-PrepareResult prepare_statement(InputBuffer* input_buffer,
+-                                Statement* statement) {
+-  if (strncmp(input_buffer->buffer, "insert", 6) == 0) {
 +PrepareResult prepare_insert(InputBuffer* input_buffer, Statement* statement) {
-+  statement->type = STATEMENT_INSERT;
+   statement->type = STATEMENT_INSERT;
+-  int args_assigned = sscanf(
+-     input_buffer->buffer, "insert %d %s %s", &(statement->row_to_insert.id),
+-     statement->row_to_insert.username, statement->row_to_insert.email
+-     );
+-  if (args_assigned < 3) {
 +
 +  char* keyword = strtok(input_buffer->buffer, " ");
 +  char* id_string = strtok(NULL, " ");
 +  char* username = strtok(NULL, " ");
 +  char* email = strtok(NULL, " ");
 +
 +  if (id_string == NULL || username == NULL || email == NULL) {
-+    return PREPARE_SYNTAX_ERROR;
-+  }
+      return PREPARE_SYNTAX_ERROR;
+   }
 +
 +  int id = atoi(id_string);
 +  if (id < 0) {
-+    return PREPARE_NEGATIVE_ID;
++     return PREPARE_NEGATIVE_ID;
 +  }
 +  if (strlen(username) > COLUMN_USERNAME_SIZE) {
-+    return PREPARE_STRING_TOO_LONG;
++     return PREPARE_STRING_TOO_LONG;
 +  }
 +  if (strlen(email) > COLUMN_EMAIL_SIZE) {
-+    return PREPARE_STRING_TOO_LONG;
++     return PREPARE_STRING_TOO_LONG;
 +  }
 +
 +  statement->row_to_insert.id = id;
 +  strcpy(statement->row_to_insert.username, username);
 +  strcpy(statement->row_to_insert.email, email);
 +
-+  return PREPARE_SUCCESS;
-+}
+   return PREPARE_SUCCESS;
 +
- PrepareResult prepare_statement(InputBuffer* input_buffer,
-                                 Statement* statement) {
-   if (strncmp(input_buffer->buffer, "insert", 6) == 0) {
--    statement->type = STATEMENT_INSERT;
--    int args_assigned = sscanf(
--        input_buffer->buffer, "insert %d %s %s", &(statement->row_to_insert.id),
--        statement->row_to_insert.username, statement->row_to_insert.email);
--    if (args_assigned < 3) {
--      return PREPARE_SYNTAX_ERROR;
--    }
--    return PREPARE_SUCCESS;
-+    return prepare_insert(input_buffer, statement);
++}
++PrepareResult prepare_statement(InputBuffer* input_buffer,
++                                Statement* statement) {
++  if (strncmp(input_buffer->buffer, "insert", 6) == 0) {
++      return prepare_insert(input_buffer, statement);
    }
    if (strcmp(input_buffer->buffer, "select") == 0) {
      statement->type = STATEMENT_SELECT;
-@@ -205,6 +230,12 @@ int main(int argc, char* argv[]) {
+@@ -223,6 +247,12 @@ int main(int argc, char* argv[]) {
      switch (prepare_statement(input_buffer, &statement)) {
        case (PREPARE_SUCCESS):
          break;
 +      case (PREPARE_NEGATIVE_ID):
-+        printf("ID must be positive.\n");
-+        continue;
++	printf("ID must be positive.\n");
++	continue;
 +      case (PREPARE_STRING_TOO_LONG):
-+        printf("String is too long.\n");
-+        continue;
++	printf("String is too long.\n");
++	continue;
        case (PREPARE_SYNTAX_ERROR):
-         printf("Syntax error. Could not parse statement.\n");
-         continue;
+ 	printf("Syntax error. Could not parse statement.\n");
+ 	continue;
 ```
 And we added tests:
 ```diff
@@ -474,4 +476,4 @@ And we added tests:
 +    ])
 +  end
 +end
-```
+```