Merge pull request #395 from ydb-platform/Add-DECLARE

fix: add DECLARE that is still required by YDB 24.1
ydb-platform · Jul 4, 2024 · 149d5dc · 149d5dc
2 parents 63efa94 + 8920fee
commit 149d5dc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/examples/basic-example-v2-with-query-service/index.ts b/examples/basic-example-v2-with-query-service/index.ts
@@ -143,6 +143,10 @@ async function selectWithParameters(driver: Driver, data: ThreeIds[], logger: Lo
                         '$episodeId': episode.getTypedValue('episodeId')
                     },
                     text: `
+                        DECLARE $seriesId AS Uint64;
+                        DECLARE $seasonId AS Uint64;
+                        DECLARE $episodeId AS Uint64;
+
                         SELECT title,
                                air_date
                         FROM episodes
@@ -173,6 +177,10 @@ async function explicitTcl(driver: Driver, ids: ThreeIds, logger: Logger) {
                     '$episodeId': episode.getTypedValue('episodeId')
                 },
                 text: `
+                    DECLARE $seriesId AS Uint64;
+                    DECLARE $seasonId AS Uint64;
+                    DECLARE $episodeId AS Uint64;
+
                     UPDATE episodes
                     SET air_date = CurrentUtcDate()
                     WHERE series_id = $seriesId
@@ -200,6 +208,10 @@ async function transactionPerWholeDo(driver: Driver, ids: ThreeIds, logger: Logg
                     '$episodeId': episode.getTypedValue('episodeId')
                 },
                 text: `
+                    DECLARE $seriesId AS Uint64;
+                    DECLARE $seasonId AS Uint64;
+                    DECLARE $episodeId AS Uint64;
+
                     UPDATE episodes
                     SET air_date = CurrentUtcDate()
                     WHERE series_id = $seriesId
@@ -221,6 +233,10 @@ async function fillTablesWithData(driver: Driver, _logger: Logger) {
                     '$episodesData': getEpisodesData()
                 },
                 text: `
+                    DECLARE $seriesData AS List<Struct<series_id: Uint64, title: Utf8, release_date: Date, series_info: Utf8>>;
+                    DECLARE $seasonsData AS List<Struct<series_id: Uint64, season_id: Uint64, title: Utf8, first_aired: Date, last_aired: Date>>;
+                    DECLARE $episodesData AS List<Struct<series_id: Uint64, season_id: Uint64, episode_id: Uint64, title: Utf8, air_date: Date>>;
+
                     REPLACE
                     INTO
                     ${SERIES_TABLE}

diff --git a/src/__tests__/e2e/query-service/method-execute.ts b/src/__tests__/e2e/query-service/method-execute.ts
@@ -156,8 +156,9 @@ describe('Query.execute()', () => {
 
         await session.execute({
             text: `
+                DECLARE $table AS List<Struct<id: Uint64, title: Utf8, time: Datetime,>>;
                 UPSERT INTO ${TABLE_NAME} (id, title, time)
-                SELECT id, title, time FROM AS_TABLE($table)
+                SELECT id, title, time FROM AS_TABLE($table);
             `,
             parameters: {
                 '$table': Row.asTypedCollection([...dataGenerator(generatedRowsCount)]),
@@ -196,9 +197,15 @@ describe('Query.execute()', () => {
                 '$title1': TypedValues.text('Some title1'),
                 '$id2': TypedValues.uint64(2),
                 '$title2': TypedValues.text('Some title2'),
-                '$timestamp': TypedValues.timestamp(new Date()),
+                '$timestamp': TypedValues.datetime(new Date()),
             },
             text: `
+                DECLARE $id1 AS Uint64;
+                DECLARE $title1 AS Utf8;
+                DECLARE $id2 AS Uint64;
+                DECLARE $title2 AS Utf8;
+                DECLARE $timestamp AS Datetime;
+
                 INSERT INTO ${TABLE_NAME} (id, title, time)
                 VALUES ($id1, $title1, $timestamp);
                 INSERT INTO ${TABLE_NAME} (id, title, time)

diff --git a/src/__tests__/e2e/query-service/rows-conversion.ts b/src/__tests__/e2e/query-service/rows-conversion.ts
@@ -115,9 +115,15 @@ describe('Rows conversion', () => {
                 '$title1': TypedValues.text('Some title1'),
                 '$id2': TypedValues.uint64(2),
                 '$title2': TypedValues.text('Some title2'),
-                '$timestamp': TypedValues.timestamp(new Date()),
+                '$timestamp': TypedValues.datetime(new Date()),
             },
             text: `
+                DECLARE $id1 AS Uint64;
+                DECLARE $title1 AS Utf8;
+                DECLARE $id2 AS Uint64;
+                DECLARE $title2 AS Utf8;
+                DECLARE $timestamp AS Datetime;
+
                 INSERT INTO ${TABLE_NAME} (id, row_title, time)
                 VALUES ($id1, $title1, $timestamp);
                 INSERT INTO ${TABLE_NAME} (id, row_title, time)

diff --git a/src/__tests__/e2e/table-service/types.test.ts b/src/__tests__/e2e/table-service/types.test.ts
@@ -16,7 +16,7 @@ describe('Types', () => {
 
     describe('Convert from native to YDB value', () => {
         describe('Primitive values', () => {
-            it.only('Numeric values', () => {
+            it('Numeric values', () => {
                 expect(TypedValues.bool(true)).toEqual({
                     type: {typeId: Ydb.Type.PrimitiveTypeId.BOOL},
                     value: {boolValue: true},