LibSQL+SQLServer: Bare bones INSERT and SELECT statements

This patch provides very basic, bare bones implementations of the
INSERT and SELECT statements. They are *very* limited:
- The only variant of the INSERT statement that currently works is
   SELECT INTO schema.table (column1, column2, ....) VALUES
      (value11, value21, ...), (value12, value22, ...), ...
   where the values are literals.
- The SELECT statement is even more limited, and is only provided to
  allow verification of the INSERT statement. The only form implemented
  is: SELECT * FROM schema.table

These statements required a bit of change in the Statement::execute
API. Originally execute only received a Database object as parameter.
This is not enough; we now pass an ExecutionContext object which
contains the Database, the current result set, and the last Tuple read
from the database. This object will undoubtedly evolve over time.

This API change dragged SQLServer::SQLStatement into the patch.

Another API addition is Expression::evaluate. This method is,
unsurprisingly, used to evaluate expressions, like the values in the
INSERT statement.

Finally, a new test file is added: TestSqlStatementExecution, which
tests the currently implemented statements. As the number and flavour of
implemented statements grows, this test file will probably have to be
restructured.

Tests/LibSQL/TestSqlStatementExecution.cpp

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2021, Jan de Visser <jan@de-visser.net>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <unistd.h>
+
+#include <AK/ScopeGuard.h>
+#include <LibSQL/AST/Parser.h>
+#include <LibSQL/Database.h>
+#include <LibSQL/Row.h>
+#include <LibSQL/SQLResult.h>
+#include <LibSQL/Value.h>
+#include <LibTest/TestCase.h>
+
+namespace {
+
+constexpr const char* db_name = "/tmp/test.db";
+
+RefPtr<SQL::SQLResult> execute(NonnullRefPtr<SQL::Database> database, String const& sql)
+{
+    auto parser = SQL::AST::Parser(SQL::AST::Lexer(sql));
+    auto statement = parser.next_statement();
+    EXPECT(!parser.has_errors());
+    if (parser.has_errors()) {
+        outln(parser.errors()[0].to_string());
+    }
+    SQL::AST::ExecutionContext context { database };
+    auto result = statement->execute(context);
+    EXPECT(result->error().code == SQL::SQLErrorCode::NoError);
+    return result;
+}
+
+void create_schema(NonnullRefPtr<SQL::Database> database)
+{
+    auto result = execute(database, "CREATE SCHEMA TestSchema;");
+    EXPECT(result->inserted() == 1);
+}
+
+void create_table(NonnullRefPtr<SQL::Database> database)
+{
+    create_schema(database);
+    auto result = execute(database, "CREATE TABLE TestSchema.TestTable ( TextColumn text, IntColumn integer );");
+    EXPECT(result->inserted() == 1);
+}
+
+TEST_CASE(create_schema)
+{
+    ScopeGuard guard([]() { unlink(db_name); });
+    auto database = SQL::Database::construct(db_name);
+    create_schema(database);
+    auto schema = database->get_schema("TESTSCHEMA");
+    EXPECT(schema);
+}
+
+TEST_CASE(create_table)
+{
+    ScopeGuard guard([]() { unlink(db_name); });
+    auto database = SQL::Database::construct(db_name);
+    create_table(database);
+    auto table = database->get_table("TESTSCHEMA", "TESTTABLE");
+    EXPECT(table);
+}
+
+TEST_CASE(insert_into_table)
+{
+    ScopeGuard guard([]() { unlink(db_name); });
+    auto database = SQL::Database::construct(db_name);
+    create_table(database);
+    auto result = execute(database, "INSERT INTO TestSchema.TestTable ( TextColumn, IntColumn ) VALUES ( 'Test', 42 );");
+    EXPECT(result->inserted() == 1);
+
+    auto table = database->get_table("TESTSCHEMA", "TESTTABLE");
+
+    int count = 0;
+    for (auto& row : database->select_all(*table)) {
+        EXPECT_EQ(row["TEXTCOLUMN"].to_string(), "Test");
+        EXPECT_EQ(row["INTCOLUMN"].to_int().value(), 42);
+        count++;
+    }
+    EXPECT_EQ(count, 1);
+}
+
+TEST_CASE(select_from_table)
+{
+    ScopeGuard guard([]() { unlink(db_name); });
+    auto database = SQL::Database::construct(db_name);
+    create_table(database);
+    auto result = execute(database, "INSERT INTO TestSchema.TestTable ( TextColumn, IntColumn ) VALUES ( 'Test_1', 42 ), ( 'Test_2', 43 );");
+    EXPECT(result->inserted() == 2);
+    result = execute(database, "INSERT INTO TestSchema.TestTable ( TextColumn, IntColumn ) VALUES ( 'Test_3', 44 ), ( 'Test_4', 45 );");
+    EXPECT(result->inserted() == 2);
+    result = execute(database, "INSERT INTO TestSchema.TestTable ( TextColumn, IntColumn ) VALUES ( 'Test_5', 46 );");
+    EXPECT(result->inserted() == 1);
+    result = execute(database, "SELECT * FROM TestSchema.TestTable;");
+    EXPECT(result->has_results());
+    EXPECT_EQ(result->results().size(), 5u);
+}
+
+}

Userland/Libraries/LibSQL/AST/AST.h

@@ -295,7 +295,15 @@ private:
 // Expressions
 //==================================================================================================
 
+struct ExecutionContext {
+    NonnullRefPtr<Database> database;
+    RefPtr<SQLResult> result { nullptr };
+    Tuple current_row {};
+};
+
 class Expression : public ASTNode {
+public:
+    virtual Value evaluate(ExecutionContext&) const;
 };
 
 class ErrorExpression final : public Expression {
@@ -309,6 +317,7 @@ public:
     }
 
     double value() const { return m_value; }
+    virtual Value evaluate(ExecutionContext&) const override;
 
 private:
     double m_value;
@@ -322,6 +331,7 @@ public:
     }
 
     const String& value() const { return m_value; }
+    virtual Value evaluate(ExecutionContext&) const override;
 
 private:
     String m_value;
@@ -341,11 +351,14 @@ private:
 };
 
 class NullLiteral : public Expression {
+public:
+    virtual Value evaluate(ExecutionContext&) const override;
 };
 
 class NestedExpression : public Expression {
 public:
     const NonnullRefPtr<Expression>& expression() const { return m_expression; }
+    virtual Value evaluate(ExecutionContext&) const override;
 
 protected:
     explicit NestedExpression(NonnullRefPtr<Expression> expression)
@@ -439,6 +452,7 @@ public:
     }
 
     UnaryOperator type() const { return m_type; }
+    virtual Value evaluate(ExecutionContext&) const override;
 
 private:
     UnaryOperator m_type;
@@ -488,6 +502,7 @@ public:
     }
 
     const NonnullRefPtrVector<Expression>& expressions() const { return m_expressions; }
+    virtual Value evaluate(ExecutionContext&) const override;
 
 private:
     NonnullRefPtrVector<Expression> m_expressions;
@@ -667,7 +682,7 @@ private:
 
 class Statement : public ASTNode {
 public:
-    virtual RefPtr<SQLResult> execute(NonnullRefPtr<Database>) const { return nullptr; }
+    virtual RefPtr<SQLResult> execute(ExecutionContext&) const { return nullptr; }
 };
 
 class ErrorStatement final : public Statement {
@@ -684,7 +699,7 @@ public:
     const String& schema_name() const { return m_schema_name; }
     bool is_error_if_schema_exists() const { return m_is_error_if_schema_exists; }
 
-    RefPtr<SQLResult> execute(NonnullRefPtr<Database>) const override;
+    RefPtr<SQLResult> execute(ExecutionContext&) const override;
 
 private:
     String m_schema_name;
@@ -723,7 +738,7 @@ public:
     bool is_temporary() const { return m_is_temporary; }
     bool is_error_if_table_exists() const { return m_is_error_if_table_exists; }
 
-    RefPtr<SQLResult> execute(NonnullRefPtr<Database>) const override;
+    RefPtr<SQLResult> execute(ExecutionContext&) const override;
 
 private:
     String m_schema_name;
@@ -886,6 +901,8 @@ public:
     bool has_selection() const { return !m_select_statement.is_null(); }
     const RefPtr<Select>& select_statement() const { return m_select_statement; }
 
+    RefPtr<SQLResult> execute(ExecutionContext&) const;
+
 private:
     RefPtr<CommonTableExpressionList> m_common_table_expression_list;
     ConflictResolution m_conflict_resolution;
@@ -977,6 +994,7 @@ public:
     const RefPtr<GroupByClause>& group_by_clause() const { return m_group_by_clause; }
     const NonnullRefPtrVector<OrderingTerm>& ordering_term_list() const { return m_ordering_term_list; }
     const RefPtr<LimitClause>& limit_clause() const { return m_limit_clause; }
+    RefPtr<SQLResult> execute(ExecutionContext&) const override;
 
 private:
     RefPtr<CommonTableExpressionList> m_common_table_expression_list;

Userland/Libraries/LibSQL/AST/CreateSchema.cpp

@@ -10,9 +10,9 @@
 
 namespace SQL::AST {
 
-RefPtr<SQLResult> CreateSchema::execute(NonnullRefPtr<Database> database) const
+RefPtr<SQLResult> CreateSchema::execute(ExecutionContext& context) const
 {
-    auto schema_def = database->get_schema(m_schema_name);
+    auto schema_def = context.database->get_schema(m_schema_name);
     if (schema_def) {
         if (m_is_error_if_schema_exists) {
             return SQLResult::construct(SQLCommand::Create, SQLErrorCode::SchemaExists, m_schema_name);
@@ -21,7 +21,7 @@ RefPtr<SQLResult> CreateSchema::execute(NonnullRefPtr<Database> database) const
     }
 
     schema_def = SchemaDef::construct(m_schema_name);
-    database->add_schema(*schema_def);
+    context.database->add_schema(*schema_def);
     return SQLResult::construct(SQLCommand::Create, 0, 1);
 }
 

Userland/Libraries/LibSQL/AST/CreateTable.cpp

@@ -9,13 +9,13 @@
 
 namespace SQL::AST {
 
-RefPtr<SQLResult> CreateTable::execute(NonnullRefPtr<Database> database) const
+RefPtr<SQLResult> CreateTable::execute(ExecutionContext& context) const
 {
     auto schema_name = (!m_schema_name.is_null() && !m_schema_name.is_empty()) ? m_schema_name : "default";
-    auto schema_def = database->get_schema(schema_name);
+    auto schema_def = context.database->get_schema(schema_name);
     if (!schema_def)
         return SQLResult::construct(SQLCommand::Create, SQLErrorCode::SchemaDoesNotExist, m_schema_name);
-    auto table_def = database->get_table(schema_name, m_table_name);
+    auto table_def = context.database->get_table(schema_name, m_table_name);
     if (table_def) {
         if (m_is_error_if_table_exists) {
             return SQLResult::construct(SQLCommand::Create, SQLErrorCode::TableExists, m_table_name);
@@ -37,7 +37,7 @@ RefPtr<SQLResult> CreateTable::execute(NonnullRefPtr<Database> database) const
         }
         table_def->append_column(column.name(), type);
     }
-    database->add_table(*table_def);
+    context.database->add_table(*table_def);
     return SQLResult::construct(SQLCommand::Create, 0, 1);
 }
 

Userland/Libraries/LibSQL/AST/Expression.cpp

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2021, Jan de Visser <jan@de-visser.net>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <LibSQL/AST/AST.h>
+#include <LibSQL/Database.h>
+
+namespace SQL::AST {
+
+Value Expression::evaluate(ExecutionContext&) const
+{
+    return Value::null();
+}
+
+Value NumericLiteral::evaluate(ExecutionContext&) const
+{
+    Value ret(SQLType::Float);
+    ret = value();
+    return ret;
+}
+
+Value StringLiteral::evaluate(ExecutionContext&) const
+{
+    Value ret(SQLType::Text);
+    ret = value();
+    return ret;
+}
+
+Value NullLiteral::evaluate(ExecutionContext&) const
+{
+    return Value::null();
+}
+
+Value NestedExpression::evaluate(ExecutionContext& context) const
+{
+    return expression()->evaluate(context);
+}
+
+Value ChainedExpression::evaluate(ExecutionContext& context) const
+{
+    Value ret(SQLType::Tuple);
+    Vector<Value> values;
+    for (auto& expression : expressions()) {
+        values.append(expression.evaluate(context));
+    }
+    ret = values;
+    return ret;
+}
+
+Value UnaryOperatorExpression::evaluate(ExecutionContext& context) const
+{
+    Value expression_value = NestedExpression::evaluate(context);
+    switch (type()) {
+    case UnaryOperator::Plus:
+        if (expression_value.type() == SQLType::Integer || expression_value.type() == SQLType::Float)
+            return expression_value;
+        // TODO: Error handling.
+        VERIFY_NOT_REACHED();
+    case UnaryOperator::Minus:
+        if (expression_value.type() == SQLType::Integer) {
+            expression_value = -int(expression_value);
+            return expression_value;
+        }
+        if (expression_value.type() == SQLType::Float) {
+            expression_value = -double(expression_value);
+            return expression_value;
+        }
+        // TODO: Error handling.
+        VERIFY_NOT_REACHED();
+    case UnaryOperator::Not:
+        if (expression_value.type() == SQLType::Boolean) {
+            expression_value = !bool(expression_value);
+            return expression_value;
+        }
+        // TODO: Error handling.
+        VERIFY_NOT_REACHED();
+    case UnaryOperator::BitwiseNot:
+        if (expression_value.type() == SQLType::Integer) {
+            expression_value = ~u32(expression_value);
+            return expression_value;
+        }
+        // TODO: Error handling.
+        VERIFY_NOT_REACHED();
+    }
+    VERIFY_NOT_REACHED();
+}
+
+}

Userland/Libraries/LibSQL/AST/Insert.cpp

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021, Jan de Visser <jan@de-visser.net>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <LibSQL/AST/AST.h>
+#include <LibSQL/Database.h>
+#include <LibSQL/Meta.h>
+#include <LibSQL/Row.h>
+
+namespace SQL::AST {
+
+RefPtr<SQLResult> Insert::execute(ExecutionContext& context) const
+{
+    auto table_def = context.database->get_table(m_schema_name, m_table_name);
+    if (!table_def) {
+        auto schema_name = m_schema_name;
+        if (schema_name.is_null() || schema_name.is_empty())
+            schema_name = "default";
+        return SQLResult::construct(SQLCommand::Insert, SQLErrorCode::TableDoesNotExist, String::formatted("{}.{}", schema_name, m_table_name));
+    }
+
+    Row row(table_def);
+    for (auto& column : m_column_names) {
+        if (!row.has(column)) {
+            return SQLResult::construct(SQLCommand::Insert, SQLErrorCode::ColumnDoesNotExist, column);
+        }
+    }
+
+    for (auto& row_expr : m_chained_expressions) {
+        for (auto& column_def : table_def->columns()) {
+            if (!m_column_names.contains_slow(column_def.name())) {
+                row[column_def.name()] = column_def.default_value();
+            }
+        }
+        auto row_value = row_expr.evaluate(context);
+        VERIFY(row_value.type() == SQLType::Tuple);
+        auto values = row_value.to_vector().value();
+        for (auto ix = 0u; ix < values.size(); ix++) {
+            auto& column_name = m_column_names[ix];
+            row[column_name] = values[ix];
+        }
+        context.database->insert(row);
+    }
+    return SQLResult::construct(SQLCommand::Insert, 0, m_chained_expressions.size(), 0);
+}
+
+}

Userland/Libraries/LibSQL/AST/Parser.cpp

@@ -205,10 +205,16 @@ NonnullRefPtr<Insert> Parser::parse_insert_statement(RefPtr<CommonTableExpressio
 
     if (consume_if(TokenType::Values)) {
         parse_comma_separated_list(false, [&]() {
-            if (auto chained_expression = parse_chained_expression(); chained_expression.has_value())
+            if (auto chained_expression = parse_chained_expression(); chained_expression.has_value()) {
-                chained_expressions.append(move(chained_expression.value()));
+                auto chained_expr = dynamic_cast<ChainedExpression*>(chained_expression->ptr());
-            else
+                if ((column_names.size() > 0) && (chained_expr->expressions().size() != column_names.size())) {
+                    syntax_error("Number of expressions does not match number of columns");
+                } else {
+                    chained_expressions.append(move(chained_expression.value()));
+                }
+            } else {
                 expected("Chained expression");
+            }
         });
     } else if (match(TokenType::Select)) {
         select_statement = parse_select_statement({});

Userland/Libraries/LibSQL/AST/Select.cpp

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021, Jan de Visser <jan@de-visser.net>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <LibSQL/AST/AST.h>
+#include <LibSQL/Database.h>
+#include <LibSQL/Meta.h>
+#include <LibSQL/Row.h>
+
+namespace SQL::AST {
+
+RefPtr<SQLResult> Select::execute(ExecutionContext& context) const
+{
+    if (table_or_subquery_list().size() == 1 && table_or_subquery_list()[0].is_table()) {
+        if (result_column_list().size() == 1 && result_column_list()[0].type() == ResultType::All) {
+            auto table = context.database->get_table(table_or_subquery_list()[0].schema_name(), table_or_subquery_list()[0].table_name());
+            if (!table) {
+                return SQLResult::construct(SQL::SQLCommand::Select, SQL::SQLErrorCode::TableDoesNotExist, table_or_subquery_list()[0].table_name());
+            }
+            NonnullRefPtr<TupleDescriptor> descriptor = table->to_tuple_descriptor();
+            context.result = SQLResult::construct();
+            for (auto& row : context.database->select_all(*table)) {
+                Tuple tuple(descriptor);
+                for (auto ix = 0u; ix < descriptor->size(); ix++) {
+                    tuple[ix] = row[ix];
+                }
+                context.result->append(tuple);
+            }
+            return context.result;
+        }
+    }
+    return SQLResult::construct();
+}
+
+}

Userland/Libraries/LibSQL/CMakeLists.txt

@@ -1,8 +1,11 @@
 set(SOURCES
     AST/CreateSchema.cpp
     AST/CreateTable.cpp
+    AST/Expression.cpp
+    AST/Insert.cpp
     AST/Lexer.cpp
     AST/Parser.cpp
+    AST/Select.cpp
     AST/SyntaxHighlighter.cpp
     AST/Token.cpp
     BTree.cpp

Userland/Libraries/LibSQL/Database.cpp

@@ -51,8 +51,11 @@ Key Database::get_schema_key(String const& schema_name)
     return key;
 }
 
-RefPtr<SchemaDef> Database::get_schema(String const& schema_name)
+RefPtr<SchemaDef> Database::get_schema(String const& schema)
 {
+    auto schema_name = schema;
+    if (schema.is_null() || schema.is_empty())
+        schema_name = "default";
     Key key = get_schema_key(schema_name);
     auto schema_def_opt = m_schema_cache.get(key.hash());
     if (schema_def_opt.has_value())
@@ -83,7 +86,10 @@ Key Database::get_table_key(String const& schema_name, String const& table_name)
 
 RefPtr<TableDef> Database::get_table(String const& schema, String const& name)
 {
-    Key key = get_table_key(schema, name);
+    auto schema_name = schema;
+    if (schema.is_null() || schema.is_empty())
+        schema_name = "default";
+    Key key = get_table_key(schema_name, name);
     auto table_def_opt = m_table_cache.get(key.hash());
     if (table_def_opt.has_value())
         return table_def_opt.value();

Userland/Libraries/LibSQL/SQLResult.h

@@ -49,6 +49,7 @@ constexpr char const* command_tag(SQLCommand command)
     S(SchemaDoesNotExist, "Schema '{}' does not exist")           \
     S(SchemaExists, "Schema '{}' already exist")                  \
     S(TableDoesNotExist, "Table '{}' does not exist")             \
+    S(ColumnDoesNotExist, "Column '{}' does not exist")           \
     S(TableExists, "Table '{}' already exist")                    \
     S(InvalidType, "Invalid type '{}'")                           \
     S(InvalidDatabaseName, "Invalid database name '{}'")

Userland/Services/SQLServer/SQLStatement.cpp

@@ -66,7 +66,9 @@ void SQLStatement::execute()
             report_error(maybe_error.value());
             return;
         }
-        m_result = m_statement->execute(*connection()->database());
+        VERIFY(!connection()->database().is_null());
+        SQL::AST::ExecutionContext context { connection()->database().release_nonnull() };
+        m_result = m_statement->execute(context);
         if (m_result->error().code != SQL::SQLErrorCode::NoError) {
             report_error(m_result->error());
             return;