@@ -139,10 +139,10 @@ void CompareResults(const NQuery::TExecuteQueryResult& first, const NQuery::TExe
139139 CompareResults (first.GetResultSets (), second.GetResultSets ());
140140}
141141
142- void InitializeTablesAndSecondaryViews (TSession& session) {
142+ void InitializeTablesAndSecondaryViews (NQuery:: TSession& session) {
143143 const auto inputFolder = ArcadiaFromCurrentLocation (__SOURCE_FILE__, " input" );
144- ExecuteDataDefinitionQuery (session, ReadWholeFile (inputFolder + " /create_tables_and_secondary_views.sql" ));
145- ExecuteDataModificationQuery (session, ReadWholeFile (inputFolder + " /fill_tables.sql" ));
144+ ExecuteQuery (session, ReadWholeFile (inputFolder + " /create_tables_and_secondary_views.sql" ));
145+ ExecuteQuery (session, ReadWholeFile (inputFolder + " /fill_tables.sql" ));
146146}
147147
148148}
@@ -582,7 +582,7 @@ Y_UNIT_TEST_SUITE(TSelectFromViewTest) {
582582 Y_UNIT_TEST (ReadTestCasesFromFiles) {
583583 TKikimrRunner kikimr;
584584 EnableViewsFeatureFlag (kikimr);
585- auto session = kikimr.GetTableClient ().CreateSession ().GetValueSync ().GetSession ();
585+ auto session = kikimr.GetQueryClient ().GetSession ().ExtractValueSync ().GetSession ();
586586
587587 InitializeTablesAndSecondaryViews (session);
588588 EnableLogging ();
@@ -593,13 +593,13 @@ Y_UNIT_TEST_SUITE(TSelectFromViewTest) {
593593 TString testcase;
594594 while (testcase = testcases.Next ()) {
595595 const auto pathPrefix = TStringBuilder () << testcasesFolder << ' /' << testcase << ' /' ;
596- ExecuteDataDefinitionQuery (session, ReadWholeFile (pathPrefix + " create_view.sql" ));
596+ ExecuteQuery (session, ReadWholeFile (pathPrefix + " create_view.sql" ));
597597
598- const auto etalonResults = ExecuteDataModificationQuery (session, ReadWholeFile (pathPrefix + " etalon_query.sql" ));
599- const auto selectFromViewResults = ExecuteDataModificationQuery (session, ReadWholeFile (pathPrefix + " select_from_view.sql" ));
598+ const auto etalonResults = ExecuteQuery (session, ReadWholeFile (pathPrefix + " etalon_query.sql" ));
599+ const auto selectFromViewResults = ExecuteQuery (session, ReadWholeFile (pathPrefix + " select_from_view.sql" ));
600600 CompareResults (etalonResults, selectFromViewResults);
601601
602- ExecuteDataDefinitionQuery (session, ReadWholeFile (pathPrefix + " drop_view.sql" ));
602+ ExecuteQuery (session, ReadWholeFile (pathPrefix + " drop_view.sql" ));
603603 }
604604 }
605605
0 commit comments