YQ Connector: move rdbms dir into datasource

25 files changed, 15 insertions, 12 deletions

diff --git a/ydb/library/yql/providers/generic/connector/app/server/data_source_factory.go b/ydb/library/yql/providers/generic/connector/app/server/data_source_factory.go
index 4d832873f67..32decc0f870 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/data_source_factory.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/data_source_factory.go
@@ -6,9 +6,9 @@ import (
 	"github.com/ydb-platform/ydb/library/go/core/log"
 	api_common "github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/api/common"
 	data_source "github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource"
-	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/rdbms"
-	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse"
-	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql"
+	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms"
+	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse"
+	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql"
 	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/utils"
 )
 
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/connection_manager.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/connection_manager.go
index 0934984be90..0934984be90 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/connection_manager.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/connection_manager.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/doc.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/doc.go
index aeeb567bdb7..aeeb567bdb7 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/doc.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/doc.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/sql_formatter.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/sql_formatter.go
index e18647c476d..e18647c476d 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/sql_formatter.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/sql_formatter.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/sql_formatter_test.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/sql_formatter_test.go
index 0ecb148eca7..0ecb148eca7 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/sql_formatter_test.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/sql_formatter_test.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/type_mapper.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/type_mapper.go
index 529d05b1f7b..529d05b1f7b 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/type_mapper.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/type_mapper.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/ut/ya.make b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/ut/ya.make
index 88b0763c7ea..4f4c779bb01 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/ut/ya.make
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/ut/ya.make
@@ -1,4 +1,4 @@
-GO_TEST_FOR(ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql)
+GO_TEST_FOR(ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse)
 
 SIZE(SMALL)
 
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/ya.make b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/ya.make
index 46287aade56..46287aade56 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/ya.make
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse/ya.make
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/data_source.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/data_source.go
index 96b48cf4c97..96b48cf4c97 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/data_source.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/data_source.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/data_source_test.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/data_source_test.go
index b52fcbf793c..8595c96d182 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/data_source_test.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/data_source_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 	api_common "github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/api/common"
+	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql"
 	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/paging"
-	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql"
 	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/utils"
 	api_service_protos "github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/libgo/service/protos"
 )
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/doc.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/doc.go
index 4261e7ef333..4261e7ef333 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/doc.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/doc.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/connection_manager.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/connection_manager.go
index d61d29ab19c..d61d29ab19c 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/connection_manager.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/connection_manager.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/doc.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/doc.go
index 9df86d415c1..9df86d415c1 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/doc.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/doc.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/sql_formatter.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/sql_formatter.go
index 3b26e8679d4..3b26e8679d4 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/sql_formatter.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/sql_formatter.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/sql_formatter_test.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/sql_formatter_test.go
index d97d64a73ea..d97d64a73ea 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/sql_formatter_test.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/sql_formatter_test.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/type_mapper.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/type_mapper.go
index 42aa4b725a0..42aa4b725a0 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/type_mapper.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/type_mapper.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/ut/ya.make b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/ut/ya.make
index c5d3c3d55f6..ec9d305cee1 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/ut/ya.make
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/ut/ya.make
@@ -1,4 +1,4 @@
-GO_TEST_FOR(ydb/library/yql/providers/generic/connector/app/server/rdbms)
+GO_TEST_FOR(ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql)
 
 SIZE(SMALL)
 
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/ya.make b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/ya.make
index 46287aade56..46287aade56 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql/ya.make
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql/ya.make
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/schema_builder.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/schema_builder.go
index eccca8bb5b2..eccca8bb5b2 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/schema_builder.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/schema_builder.go
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/schema_builder_test.go b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/schema_builder_test.go
index fbff2754cd0..e924f21e9d4 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/schema_builder_test.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/schema_builder_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
-	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse"
-	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/rdbms/postgresql"
+	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse"
+	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/postgresql"
 	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/utils"
 	"google.golang.org/protobuf/proto"
 )
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/ut/ya.make b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/ut/ya.make
index e3da8fc7b59..02d67573bee 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse/ut/ya.make
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/ut/ya.make
@@ -1,4 +1,4 @@
-GO_TEST_FOR(ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse)
+GO_TEST_FOR(ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms)
 
 SIZE(SMALL)
 
diff --git a/ydb/library/yql/providers/generic/connector/app/server/rdbms/ya.make b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/ya.make
index 31ec80170c3..31ec80170c3 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/rdbms/ya.make
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/ya.make
diff --git a/ydb/library/yql/providers/generic/connector/app/server/datasource/ya.make b/ydb/library/yql/providers/generic/connector/app/server/datasource/ya.make
index 9458c7026a0..fb36efe6620 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/datasource/ya.make
+++ b/ydb/library/yql/providers/generic/connector/app/server/datasource/ya.make
@@ -7,3 +7,7 @@ SRCS(
 )
 
 END()
+
+RECURSE(
+    rdbms
+)
diff --git a/ydb/library/yql/providers/generic/connector/app/server/streaming/streamer_test.go b/ydb/library/yql/providers/generic/connector/app/server/streaming/streamer_test.go
index eedddddd996..27519f9fb0e 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/streaming/streamer_test.go
+++ b/ydb/library/yql/providers/generic/connector/app/server/streaming/streamer_test.go
@@ -16,9 +16,9 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 	"github.com/ydb-platform/ydb/library/go/core/log"
 	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/config"
+	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms"
+	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/datasource/rdbms/clickhouse"
 	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/paging"
-	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/rdbms"
-	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/rdbms/clickhouse"
 	"github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/app/server/utils"
 	api_service "github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/libgo/service"
 	api_service_protos "github.com/ydb-platform/ydb/ydb/library/yql/providers/generic/connector/libgo/service/protos"
diff --git a/ydb/library/yql/providers/generic/connector/app/server/ya.make b/ydb/library/yql/providers/generic/connector/app/server/ya.make
index 49806958a2d..2588035af2c 100644
--- a/ydb/library/yql/providers/generic/connector/app/server/ya.make
+++ b/ydb/library/yql/providers/generic/connector/app/server/ya.make
@@ -19,7 +19,6 @@ END()
 RECURSE(
     datasource
     paging
-    rdbms
     streaming
     utils
 )