re-organize code

Author: Banyc

src/MiniSQL.Api/Api.cs

@@ -88,7 +88,6 @@ private void HandleStatement(CreateStatement statement)
             }
         }
 
-        // TODO: review
         // drop statement
         private void HandleStatement(DropStatement statement)
         {
@@ -127,16 +126,8 @@ private void HandleStatement(DeleteStatement statement)
             SchemaRecord tableSchema = _catalogManager.GetTableSchemaRecord(statement.TableName);
             List<SchemaRecord> indexSchemas = _catalogManager.GetIndicesSchemaRecord(statement.TableName);
 
-            // // delete index records from index trees
-            // foreach (SchemaRecord indexSchema in indexSchemas)
-            // {
-            //     // build condition for each index tree
-            //     Expression condition = new Expression();
-
-                
-            // }
-
             // TODO
+            // delete index records from index trees
             // __problem__:
             // attribute names := (priKey, a, b, c)
             // condition := b < 3 and c > 5
@@ -169,9 +160,9 @@ private SelectResult HandleSelectStatement(SelectStatement statement)
                     {
                         isIndexTreeAvailable = true;
                         // find out the primary key
-                        // List<AtomValue> indexPrimaryKeyPair = _recordManager.SelectRecord(statement.Condition.Ands[indexSchema.Name].RightOperant.ConcreteValue, indexSchema.RootPage);
+                        // List<AtomValue> indexPrimaryKeyPair = _recordManager.SelectRecord(statement.Condition.Ands[indexSchema.Name].RightOperand.ConcreteValue, indexSchema.RootPage);
                         // primaryKey = indexPrimaryKeyPair[1];
-                        List<AtomValue> wrappedPrimaryKey = _recordManager.SelectRecord(statement.Condition.Ands[indexSchema.SQL.AttributeName].RightOperant.ConcreteValue, indexSchema.RootPage);
+                        List<AtomValue> wrappedPrimaryKey = _recordManager.SelectRecord(statement.Condition.Ands[indexSchema.SQL.AttributeName].RightOperand.ConcreteValue, indexSchema.RootPage);
                         primaryKey = wrappedPrimaryKey?[0];
                         break;
                     }

src/MiniSQL.Api/Program.cs

@@ -18,7 +18,6 @@ namespace MiniSQL.Api
 {
     class Program
     {
-        // TODO: view of the whole solution 
         static void Main(string[] args)
         {
             // init

src/MiniSQL.Api/tests/compilation.sql

@@ -0,0 +1,83 @@
+-- insert-delete
+
+-- create table test
+-- (
+--     id INT,
+--     name Char(8)
+-- );
+create table test
+(
+    id INT,
+    name Char(8),
+    primary key (id)
+);
+
+insert into test values (1, "Tom");
+insert into test values (2, "Tim");
+insert into test values (3, "Tai");
+
+select * from test;
+
+delete from test where name = "Tai";
+
+select * from test;
+
+delete from test where id < 3;
+
+select * from test;
+
+-- type
+
+create table typetest
+(
+    id INT,
+    name Char(8),
+    height FLOAT,
+    primary key (id)
+);
+
+insert into typetest values (3, "test1", 12.3);
+insert into typetest values (3, "test2", 332.1);
+
+select * from typetest;
+
+-- table collision
+
+create table test
+(
+    id INT,
+    name Char(8),
+    height FLOAT,
+    primary key (id)
+);
+create table test
+(
+    id INT,
+    name Char(8),
+    height FLOAT,
+    primary key (id)
+);
+
+-- inconsistent number of values
+
+create table test
+(
+    id INT,
+    name Char(8),
+    height FLOAT,
+    primary key (id)
+);
+
+insert into test values (1, "Tom");
+
+-- inconsistent types of values
+
+create table test
+(
+    id INT,
+    name Char(8),
+    height FLOAT,
+    primary key (id)
+);
+
+insert into test values (1, 1123.4, "Tom");

src/MiniSQL.BufferManager/Program.cs

@@ -53,13 +53,13 @@ private static Expression GetAndsExpression()
             // <=
             Expression node4 = new Expression();
             node4.Operator = Operator.LessThanOrEqualTo;
-            node4.LeftOperant = node8;
-            node4.RightOperant = node9;
+            node4.LeftOperand = node8;
+            node4.RightOperand = node9;
             // <=
             Expression node5 = new Expression();
             node5.Operator = Operator.LessThanOrEqualTo;
-            node5.LeftOperant = node10;
-            node5.RightOperant = node11;
+            node5.LeftOperand = node10;
+            node5.RightOperand = node11;
             // 6.6
             Expression node6 = new Expression();
             node6.Operator = Operator.AtomConcreteValue;
@@ -73,18 +73,18 @@ private static Expression GetAndsExpression()
             // and
             Expression node2 = new Expression();
             node2.Operator = Operator.And;
-            node2.LeftOperant = node4;
-            node2.RightOperant = node5;
+            node2.LeftOperand = node4;
+            node2.RightOperand = node5;
             // >
             Expression node3 = new Expression();
             node3.Operator = Operator.MoreThan;
-            node3.LeftOperant = node6;
-            node3.RightOperant = node7;
+            node3.LeftOperand = node6;
+            node3.RightOperand = node7;
             // and
             Expression node1 = new Expression();
             node1.Operator = Operator.And;
-            node1.LeftOperant = node2;
-            node1.RightOperant = node3;
+            node1.LeftOperand = node2;
+            node1.RightOperand = node3;
 
             return node1;
         }