* Fixed sugar.RemoveRecursive() for column table type

Author: asmyasnikov

.github/workflows/tests.yml

@@ -61,6 +61,7 @@ jobs:
     env:
       OS: ubuntu-latest
       GO: ${{ matrix.go-version }}
+      YDB_VERSION: ${{ matrix.ydb-version }}
       YDB_CONNECTION_STRING: grpc://localhost:2136/local
       YDB_CONNECTION_STRING_SECURE: grpcs://localhost:2135/local
       YDB_SSL_ROOT_CERTIFICATES_FILE: /tmp/ydb_certs/ca.pem

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fixed `sugar.RemoveRecursive()` for column table type
+
 ## v3.48.7
 * Added `sugar.StackRecord()` helper for stringification of current file path and line
 * Updated `google.golang.org/grpc` from `v1.49.0` to `v1.53.0` due to vulnerability

sugar/path.go

@@ -132,7 +132,7 @@ func RemoveRecursive(ctx context.Context, db dbFoRemoveRecursive, pathToRemove s
 					)
 				}
 
-			case scheme.EntryTable:
+			case scheme.EntryTable, scheme.EntryColumnTable:
 				err = db.Table().Do(ctx, func(ctx context.Context, session table.Session) (err error) {
 					return session.DropTable(ctx, pt)
 				}, table.WithIdempotent())

tests/integration/sugar_make_remove_recursive_test.go

@@ -5,7 +5,10 @@ package integration
 
 import (
 	"fmt"
+	"os"
 	"path"
+	"strconv"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -36,6 +39,27 @@ func TestSugarMakeRemoveRecursive(t *testing.T) {
 	_, err = db.Scripting().Execute(scope.Ctx, query, nil)
 	require.NoError(t, err)
 
+	if v, has := os.LookupEnv("YDB_VERSION"); has {
+		vv := strings.Split(v, ".")
+		if len(vv) >= 2 {
+			year, err := strconv.Atoi(vv[0])
+			if err == nil {
+				release, err := strconv.Atoi(vv[1])
+				if err == nil {
+					if year >= 23 && release >= 2 {
+						tablePath = path.Join(testPrefix, "columnTableName")
+						query = fmt.Sprintf(
+							"CREATE TABLE `%v` (id Uint64 NOT NULL, PRIMARY KEY (id)) PARTITION BY HASH(id) WITH (STORE = COLUMN)",
+							tablePath,
+						)
+						_, err = db.Scripting().Execute(scope.Ctx, query, nil)
+						require.NoError(t, err)
+					}
+				}
+			}
+		}
+	}
+
 	err = db.Topic().Create(scope.Ctx, path.Join(testPrefix, "topic"))
 	require.NoError(t, err)