fix(embedded/sql): selector resolution using valuesRowReader

Signed-off-by: Jeronimo Irazabal <[email protected]>

Author: jeroiraz

embedded/sql/engine_test.go

@@ -5215,22 +5215,43 @@ func TestMultiDBCatalogQueries(t *testing.T) {
 		_, _, err = engine.Exec("BEGIN TRANSACTION; USE DATABASE db1; COMMIT;", nil, nil)
 		require.ErrorIs(t, err, ErrNonTransactionalStmt)
 
-		r, err := engine.Query("SELECT * FROM DATABASES()", nil, nil)
-		require.NoError(t, err)
+		t.Run("unconditional database query", func(t *testing.T) {
+			r, err := engine.Query("SELECT * FROM DATABASES() WHERE name LIKE 'db*'", nil, nil)
+			require.NoError(t, err)
 
-		for _, db := range dbs {
-			row, err := r.Read()
+			for _, db := range dbs {
+				row, err := r.Read()
+				require.NoError(t, err)
+				require.NotNil(t, row)
+				require.NotNil(t, row)
+				require.Equal(t, db, row.ValuesBySelector["(*.databases.name)"].Value())
+			}
+
+			_, err = r.Read()
+			require.ErrorIs(t, err, ErrNoMoreRows)
+
+			err = r.Close()
 			require.NoError(t, err)
-			require.NotNil(t, row)
-			require.NotNil(t, row)
-			require.Equal(t, db, row.ValuesBySelector["(*.databases.name)"].Value())
-		}
+		})
 
-		_, err = r.Read()
-		require.ErrorIs(t, err, ErrNoMoreRows)
+		t.Run("query databases using conditions with table and column aliasing", func(t *testing.T) {
+			r, err := engine.Query("SELECT dbs.name as dbname FROM DATABASES() as dbs WHERE name LIKE 'db*'", nil, nil)
+			require.NoError(t, err)
 
-		err = r.Close()
-		require.NoError(t, err)
+			for _, db := range dbs {
+				row, err := r.Read()
+				require.NoError(t, err)
+				require.NotNil(t, row)
+				require.NotNil(t, row)
+				require.Equal(t, db, row.ValuesBySelector["(*.dbs.dbname)"].Value())
+			}
+
+			_, err = r.Read()
+			require.ErrorIs(t, err, ErrNoMoreRows)
+
+			err = r.Close()
+			require.NoError(t, err)
+		})
 	})
 
 	t.Run("with a handler, statements must only involve current selected database", func(t *testing.T) {

embedded/sql/values_row_reader.go

@@ -91,10 +91,10 @@ func (vr *valuesRowReader) Tx() *SQLTx {
 }
 
 func (vr *valuesRowReader) Database() string {
-	return vr.tx.currentDB.name
-}
+	if vr.dbAlias == "" {
+		return vr.tx.currentDB.name
+	}
 
-func (vr *valuesRowReader) DBAlias() string {
 	return vr.dbAlias
 }
 

embedded/sql/values_row_reader_test.go

@@ -62,7 +62,7 @@ func TestValuesRowReader(t *testing.T) {
 	rowReader, err := newValuesRowReader(nil, cols, "db1", "table1", values)
 	require.NoError(t, err)
 
-	require.Equal(t, "db1", rowReader.DBAlias())
+	require.Equal(t, "db1", rowReader.Database())
 	require.Nil(t, rowReader.OrderBy())
 	require.Nil(t, rowReader.ScanSpecs())