Virtual column proof of concept

.github/workflows/test.yml

@@ -22,6 +22,10 @@ jobs:
     - name: Test
       if: ${{ matrix.platform != 'ubuntu-latest' }}
       run: go test ./...
+      env:
+        CI_TEST: "true"
     - name: Test
       if: ${{ matrix.platform == 'ubuntu-latest' }}
       run: go test -race ./...
+      env:
+        CI_TEST: "true"

enginetest/memory_engine_test.go

@@ -17,6 +17,7 @@ package enginetest_test
 import (
 	"fmt"
 	"log"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -192,22 +193,100 @@ func newUpdateResult(matched, updated int) types.OkResult {
 
 // Convenience test for debugging a single query. Unskip and set to the desired query.
 func TestSingleScript(t *testing.T) {
-	t.Skip()
+	// t.Skip()
 	var scripts = []queries.ScriptTest{
 		{
-			Name: "add new generated column",
+			Name: "virtual column inserts, updates, deletes",
 			SetUpScript: []string{
-				"create table t1 (a int primary key, b int)",
-				"insert into t1 values (1,2), (2,3), (3,4)",
+				"create table t1 (a int primary key, b int generated always as (a + 1) virtual)",
 			},
 			Assertions: []queries.ScriptTestAssertion{
 				{
-					Query:    "alter table t1 add column c int as (a + b) stored",
-					Expected: []sql.Row{{types.NewOkResult(0)}},
+					Query: 			"insert into t1 (a) values (1), (2), (3)",
+					Expected: 		[]sql.Row{{types.NewOkResult(3)}},
+				},
+				{
+					Query:    "select * from t1 order by a",
+					Expected: []sql.Row{{1, 2}, {2, 3}, {3, 4}},
+				},
+				{
+					Query:    "update t1 set a = 4 where a = 3",
+					Expected: []sql.Row{{types.OkResult{
+						RowsAffected: 1,
+						Info: plan.UpdateInfo{
+							Matched: 1,
+							Updated: 1,
+						}},
+					}},
+				},
+				{
+					Query:    "select * from t1 order by a",
+					Expected: []sql.Row{{1,2}, {2, 3}, {4, 5}},
+				},
+				{
+					Query:    "delete from t1 where a = 2",
+					Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
 				},
 				{
 					Query:    "select * from t1 order by a",
-					Expected: []sql.Row{{1, 2, 3}, {2, 3, 5}, {3, 4, 7}},
+					Expected: []sql.Row{{1, 2}, {4, 5}},
+				},
+			},
+		},
+		{
+			Name: "virtual column ordering",
+			SetUpScript: []string{
+				// virtual is the default for generated columns
+				"create table t1 (v1 int generated always as (2), a int, v2 int generated always as (a + v1), c int)",
+			},
+			Assertions: []queries.ScriptTestAssertion{
+				{
+					Query: 			"insert into t1 (a, c) values (1,5), (3,7)",
+					Expected: 		[]sql.Row{{types.NewOkResult(2)}},
+				},
+				{
+					Query: 			"insert into t1 (c, a) values (5,6), (7,8)",
+					Expected: 		[]sql.Row{{types.NewOkResult(2)}},
+				},
+				{
+					Query:    "select * from t1 order by a",
+					Expected: []sql.Row{
+						{2, 1, 3, 5},
+						{2, 3, 5, 7},
+						{2, 6, 8, 5},
+						{2, 8, 10, 7},
+					},
+				},
+				{
+					Query:    "update t1 set a = 4 where a = 3",
+					Expected: []sql.Row{{types.OkResult{
+						RowsAffected: 1,
+						Info: plan.UpdateInfo{
+							Matched: 1,
+							Updated: 1,
+						}},
+					}},
+				},
+				{
+					Query:    "select * from t1 order by a",
+					Expected: []sql.Row{
+						{2, 1, 3, 5},
+						{2, 4, 6, 7},
+						{2, 6, 8, 5},
+						{2, 8, 10, 7},
+					},
+				},
+				{
+					Query:    "delete from t1 where v2 = 6",
+					Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
+				},
+				{
+					Query:    "select * from t1 order by a",
+					Expected: []sql.Row{
+						{2, 1, 3, 5},
+						{2, 6, 8, 5},
+						{2, 8, 10, 7},
+					},
 				},
 			},
 		},
@@ -827,16 +906,25 @@ func TestCharsetCollationEngine(t *testing.T) {
 }
 
 func TestCharsetCollationWire(t *testing.T) {
+	if _, ok := os.LookupEnv("CI_TEST"); !ok {
+		t.Skip("Skipping test that requires CI_TEST=true")
+	}
 	harness := enginetest.NewDefaultMemoryHarness()
 	enginetest.TestCharsetCollationWire(t, harness, harness.SessionBuilder())
 }
 
 func TestDatabaseCollationWire(t *testing.T) {
+	if _, ok := os.LookupEnv("CI_TEST"); !ok {
+		t.Skip("Skipping test that requires CI_TEST=true")
+	}
 	harness := enginetest.NewDefaultMemoryHarness()
 	enginetest.TestDatabaseCollationWire(t, harness, harness.SessionBuilder())
 }
 
 func TestTypesOverWire(t *testing.T) {
+	if _, ok := os.LookupEnv("CI_TEST"); !ok {
+		t.Skip("Skipping test that requires CI_TEST=true")
+	}
 	harness := enginetest.NewDefaultMemoryHarness()
 	enginetest.TestTypesOverWire(t, harness, harness.SessionBuilder())
 }

enginetest/queries/generated_columns.go

@@ -16,6 +16,7 @@ package queries
 
 import (
 	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/plan"
 	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
@@ -175,4 +176,99 @@ var GeneratedColumnTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "virtual column inserts, updates, deletes",
+		SetUpScript: []string{
+			"create table t1 (a int primary key, b int generated always as (a + 1) virtual)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: 			"insert into t1 (a) values (1), (2), (3)",
+				Expected: 		[]sql.Row{{types.NewOkResult(3)}},
+			},
+			{
+				Query:    "select * from t1 order by a",
+				Expected: []sql.Row{{1, 2}, {2, 3}, {3, 4}},
+			},
+			{
+				Query:    "update t1 set a = 4 where a = 3",
+				Expected: []sql.Row{{types.OkResult{
+					RowsAffected: 1,
+					Info: plan.UpdateInfo{
+						Matched: 1,
+						Updated: 1,
+					}},
+				}},
+			},
+			{
+				Query:    "select * from t1 order by a",
+				Expected: []sql.Row{{1,2}, {2, 3}, {4, 5}},
+			},
+			{
+				Query:    "delete from t1 where a = 2",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
+			},
+			{
+				Query:    "select * from t1 order by a",
+				Expected: []sql.Row{{1, 2}, {4, 5}},
+			},
+		},
+	},
+	{
+		Name: "virtual column ordering",
+		SetUpScript: []string{
+			// virtual is the default for generated columns
+			"create table t1 (v1 int generated always as (2), a int, v2 int generated always as (a + v1), c int)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: 			"insert into t1 (a, c) values (1,5), (3,7)",
+				Expected: 		[]sql.Row{{types.NewOkResult(2)}},
+			},
+			{
+				Query: 			"insert into t1 (c, a) values (5,6), (7,8)",
+				Expected: 		[]sql.Row{{types.NewOkResult(2)}},
+			},
+			{
+				Query:    "select * from t1 order by a",
+				Expected: []sql.Row{
+					{2, 1, 3, 5},
+					{2, 3, 5, 7},
+					{2, 6, 8, 5},
+					{2, 8, 10, 7},
+				},
+			},
+			{
+				Query:    "update t1 set a = 4 where a = 3",
+				Expected: []sql.Row{{types.OkResult{
+					RowsAffected: 1,
+					Info: plan.UpdateInfo{
+						Matched: 1,
+						Updated: 1,
+					}},
+				}},
+			},
+			{
+				Query:    "select * from t1 order by a",
+				Expected: []sql.Row{
+					{2, 1, 3, 5},
+					{2, 4, 6, 7},
+					{2, 6, 8, 5},
+					{2, 8, 10, 7},
+				},
+			},
+			{
+				Query:    "delete from t1 where v2 = 6",
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
+			},
+			{
+				Query:    "select * from t1 order by a",
+				Expected: []sql.Row{
+					{2, 1, 3, 5},
+					{2, 6, 8, 5},
+					{2, 8, 10, 7},
+				},
+			},
+		},
+	},
 }