From 6ce467d6b4394bec9683dc92c46fc87467a468b1 Mon Sep 17 00:00:00 2001 From: Soham Bhattacharjee Date: Wed, 25 Sep 2024 16:00:34 +0530 Subject: [PATCH 1/3] Revert "Added test cases to test support for boolean exps in select statements" (#7194) (cherry picked from commit 1156ada565bcf97abec5b37b6d19e61a973173fc) --- ...-booleanExpsInSelect_2024-09-25-06-10.json | 10 ++++++++++ core/backend/src/test/ecdb/ECSqlAst.test.ts | 20 ------------------- 2 files changed, 10 insertions(+), 20 deletions(-) create mode 100644 common/changes/@itwin/core-backend/revert-7150-Soham-booleanExpsInSelect_2024-09-25-06-10.json diff --git a/common/changes/@itwin/core-backend/revert-7150-Soham-booleanExpsInSelect_2024-09-25-06-10.json b/common/changes/@itwin/core-backend/revert-7150-Soham-booleanExpsInSelect_2024-09-25-06-10.json new file mode 100644 index 000000000000..2a82e969e528 --- /dev/null +++ b/common/changes/@itwin/core-backend/revert-7150-Soham-booleanExpsInSelect_2024-09-25-06-10.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-backend", + "comment": "Removed added tests for boolean exps in select statement", + "type": "none" + } + ], + "packageName": "@itwin/core-backend" +} \ No newline at end of file diff --git a/core/backend/src/test/ecdb/ECSqlAst.test.ts b/core/backend/src/test/ecdb/ECSqlAst.test.ts index c5c96c65eb87..20fb152b0833 100644 --- a/core/backend/src/test/ecdb/ECSqlAst.test.ts +++ b/core/backend/src/test/ecdb/ECSqlAst.test.ts @@ -475,26 +475,6 @@ describe("ECSql Abstract Syntax Tree", () => { assert.equal(test.expectedECSql, await toNormalizeECSql(test.expectedECSql)); } }); - it("parse Boolean Exp in Select statements", async () => { - const tests = [ - { - orignalECSql: "select 1 < true", - expectedECSql: "SELECT (1 < TRUE)", - }, - { - orignalECSql: "select 2 IN(2,7)", - expectedECSql: "SELECT 2 IN (2, 7)", - }, - { - orignalECSql: "SELECT p.ECInstanceId=k.s FROM meta.ECClassDef p, (SELECT 1 s) k", - expectedECSql: "SELECT ([p].[ECInstanceId] = [k].[s]) FROM [ECDbMeta].[ECClassDef] [p], (SELECT 1 [s]) [k]", - }, - ]; - for (const test of tests) { - assert.equal(test.expectedECSql, await toNormalizeECSql(test.orignalECSql)); - assert.equal(test.expectedECSql, await toNormalizeECSql(test.expectedECSql)); - } - }); it("parse $, $->prop", async () => { const tests = [ { From 8eccaac372bd902b4e9cc7411c825fb1792728b3 Mon Sep 17 00:00:00 2001 From: Arun George Date: Wed, 25 Sep 2024 14:58:12 -0400 Subject: [PATCH 2/3] native@4.9.29 --- common/config/rush/pnpm-lock.yaml | 13 ++++++------- core/backend/package.json | 2 +- .../android/imodeljs-test-app/app/build.gradle | 2 +- .../imodeljs-test-app.xcodeproj/project.pbxproj | 2 +- .../core-test-runner.xcodeproj/project.pbxproj | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 8af72c580bd2..b793bfe94250 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -7,7 +7,7 @@ importers: ../../core/backend: specifiers: - '@bentley/imodeljs-native': 4.9.28 + '@bentley/imodeljs-native': 4.9.29 '@itwin/build-tools': workspace:* '@itwin/cloud-agnostic-core': ^2.2.4 '@itwin/core-bentley': workspace:* @@ -58,7 +58,7 @@ importers: webpack: ^5.76.0 ws: ^7.5.10 dependencies: - '@bentley/imodeljs-native': 4.9.28 + '@bentley/imodeljs-native': 4.9.29 '@itwin/cloud-agnostic-core': 2.2.4_scz6qrwecfbbxg4vskopkl3a7u '@itwin/core-telemetry': link:../telemetry '@itwin/object-storage-azure': 2.2.5_scz6qrwecfbbxg4vskopkl3a7u @@ -3709,8 +3709,8 @@ packages: resolution: {integrity: sha512-IIs1wDcY2oZ8tJ3EZRw0U51M+0ZL3MvwoDYYmhUXaa9/UZqpFoOyLBGaxjirQteWXqTIMm3mFvmC+Nbn1ok4Iw==} dev: false - /@bentley/imodeljs-native/4.9.28: - resolution: {integrity: sha512-CqmMTKaW6VBioI6xhdamPlDYSlZyfa45AUvEwJ1nNwxxJdiSIbWtSKChQG4XnyiC6Pa9vQoKHd8W58248LSQAA==} + /@bentley/imodeljs-native/4.9.29: + resolution: {integrity: sha512-7CRHaFcRxVMwjucSB8WGnKy/xRSXjX0PT6GSvOSDQETL/8Gkiya397U3XsLuJaUWO8nEnviaQCyRBQ88a7T83A==} requiresBuild: true dev: false @@ -4990,7 +4990,6 @@ packages: /@types/estree/1.0.5: resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} - dev: true /@types/events/3.0.3: resolution: {integrity: sha512-trOc4AAUThEz9hapPtSd7wf5tiQKvTtu5b371UxXdTuqzIh0ArcRspRP0i0Viu+LXstIQ1z96t1nsPxT9ol01g==} @@ -13230,7 +13229,7 @@ packages: optional: true dependencies: esbuild: 0.21.5 - postcss: 8.4.47 + postcss: 8.4.41 rollup: 4.22.4 optionalDependencies: fsevents: 2.3.3 @@ -13267,7 +13266,7 @@ packages: '@types/node': 18.16.20 esbuild: 0.21.5 postcss: 8.4.41 - rollup: 4.20.0 + rollup: 4.22.4 optionalDependencies: fsevents: 2.3.3 dev: true diff --git a/core/backend/package.json b/core/backend/package.json index 1d8998edda99..1ad9ce7433b3 100644 --- a/core/backend/package.json +++ b/core/backend/package.json @@ -98,7 +98,7 @@ "webpack": "^5.76.0" }, "dependencies": { - "@bentley/imodeljs-native": "4.9.28", + "@bentley/imodeljs-native": "4.9.29", "@itwin/cloud-agnostic-core": "^2.2.4", "@itwin/core-telemetry": "workspace:*", "@itwin/object-storage-azure": "^2.2.5", diff --git a/test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle b/test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle index c511c21c9f4d..4b7bdc0ef3dd 100644 --- a/test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle +++ b/test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle @@ -41,7 +41,7 @@ dependencies { implementation 'com.google.android.material:material:1.7.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.navigation:navigation-ui:2.5.3' - implementation 'com.github.itwin:mobile-native-android:4.9.28' + implementation 'com.github.itwin:mobile-native-android:4.9.29' implementation 'androidx.webkit:webkit:1.5.0' } diff --git a/test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj b/test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj index bb867393f485..837cf893c56c 100644 --- a/test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj +++ b/test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj @@ -453,7 +453,7 @@ repositoryURL = "/~https://github.com/iTwin/mobile-native-ios"; requirement = { kind = exactVersion; - version = 4.9.28; + version = 4.9.29; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj b/tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj index 73269f3b4910..825869ab0616 100644 --- a/tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj +++ b/tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj @@ -552,7 +552,7 @@ repositoryURL = "/~https://github.com/iTwin/mobile-native-ios"; requirement = { kind = exactVersion; - version = 4.9.28; + version = 4.9.29; }; }; /* End XCRemoteSwiftPackageReference section */ From 95724f8f1dc79d5fa0ff215da26e8236ef9aa4d9 Mon Sep 17 00:00:00 2001 From: Arun George Date: Wed, 25 Sep 2024 14:59:34 -0400 Subject: [PATCH 3/3] rush change --- ...gify-bp-release-4.9.x-pr-7194_2024-09-25-18-59.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@itwin/core-backend/mergify-bp-release-4.9.x-pr-7194_2024-09-25-18-59.json diff --git a/common/changes/@itwin/core-backend/mergify-bp-release-4.9.x-pr-7194_2024-09-25-18-59.json b/common/changes/@itwin/core-backend/mergify-bp-release-4.9.x-pr-7194_2024-09-25-18-59.json new file mode 100644 index 000000000000..99b35bb89b62 --- /dev/null +++ b/common/changes/@itwin/core-backend/mergify-bp-release-4.9.x-pr-7194_2024-09-25-18-59.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-backend", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-backend" +} \ No newline at end of file