Merge remote-tracking branch 'origin/develop' into wip/kw/collapsed-n…

…ames1
enso-org · Dec 20, 2024 · 8204d29 · 8204d29
2 parents 8db6c6e + e5a1c5a
commit 8204d29
Show file tree

Hide file tree

Showing 19 changed files with 66 additions and 44 deletions.
diff --git a/.github/workflows/engine-pull-request.yml b/.github/workflows/engine-pull-request.yml
@@ -36,7 +36,7 @@ jobs:
     secrets: inherit
 
   required-checks:
-    name: Required Checks
+    name: Engine Required Checks
     runs-on: ubuntu-latest
     needs: [engine-checks]
     if: always()

diff --git a/.github/workflows/gui-changed-files.yml b/.github/workflows/gui-changed-files.yml
@@ -36,9 +36,8 @@ jobs:
             .prettierrc.js
             .prettierignore
             vitest.workspace.ts
-            .github/workflows/gui-changed-files.yml
-            .github/workflows/gui-checks.yml
-            .github/workflows/gui-pull-request.yml
+            .github/workflows/gui*
+            .github/workflows/ide*
             .github/workflows/storybook.yml
           files_ignore: |
             app/ide-desktop/**

diff --git a/.github/workflows/gui-pull-request.yml b/.github/workflows/gui-pull-request.yml
@@ -79,7 +79,7 @@ jobs:
     secrets: inherit
 
   required-checks:
-    name: Required Checks
+    name: GUI Required Checks
     runs-on: ubuntu-latest
     needs: [prettier, gui-checks, storybook]
     if: always()

diff --git a/.github/workflows/gui-packaging-optional.yml → .github/workflows/ide-packaging-optional.yml b/.github/workflows/gui-packaging-optional.yml → .github/workflows/ide-packaging-optional.yml
@@ -1,7 +1,7 @@
 # This file is auto-generated. Do not edit it manually!
 # Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.
 
-name: GUI Packaging (Optional)
+name: IDE Packaging (Optional)
 on:
   workflow_dispatch:
     inputs:
@@ -12,7 +12,7 @@ on:
         default: false
   workflow_call: {}
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging-optional
+  group: ${{ github.workflow }}-${{ github.ref }}-ide-packaging-optional
   cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
 jobs:
   enso-build-ci-gen-job-build-backend-macos-amd64:

diff --git a/.github/workflows/gui-packaging.yml → .github/workflows/ide-packaging.yml b/.github/workflows/gui-packaging.yml → .github/workflows/ide-packaging.yml
@@ -1,7 +1,7 @@
 # This file is auto-generated. Do not edit it manually!
 # Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.
 
-name: GUI Packaging
+name: IDE Packaging
 on:
   workflow_dispatch:
     inputs:
@@ -12,7 +12,7 @@ on:
         default: false
   workflow_call: {}
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging
+  group: ${{ github.workflow }}-${{ github.ref }}-ide-packaging
   cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
 jobs:
   enso-build-ci-gen-job-build-backend-linux-amd64:

diff --git a/.../workflows/gui-packaging-pull-request.yml → .github/workflows/ide-pull-request.yml b/.../workflows/gui-packaging-pull-request.yml → .github/workflows/ide-pull-request.yml
@@ -1,6 +1,6 @@
 # This file is not auto-generated. Feel free to edit it.
 
-name: ✨ GUI Packaging
+name: ✨ IDE
 
 on:
   push:
@@ -9,7 +9,7 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging-pull-request
+  group: ${{ github.workflow }}-${{ github.ref }}-ide-pull-request
   cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
 
 jobs:
@@ -23,31 +23,31 @@ jobs:
     uses: ./.github/workflows/engine-changed-files.yml
     secrets: inherit
 
-  gui-packaging:
+  ide-packaging:
     name: 📦 Package
-    uses: ./.github/workflows/gui-packaging.yml
+    uses: ./.github/workflows/ide-packaging.yml
     needs: [gui-changed-files, engine-changed-files]
     if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
     secrets: inherit
 
-  gui-packaging-optional:
+  ide-packaging-optional:
     name: 📦 Package (Optional)
-    uses: ./.github/workflows/gui-packaging-optional.yml
+    uses: ./.github/workflows/ide-packaging-optional.yml
     needs: [gui-changed-files, engine-changed-files]
     if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
     secrets: inherit
 
   required-checks:
-    name: Required Checks
+    name: IDE Required Checks
     runs-on: ubuntu-latest
-    needs: [gui-packaging]
+    needs: [ide-packaging]
     if: always()
     steps:
       - name: Checks Summary
         run: |
-          echo "GUI Packaging: ${{ needs.gui-packaging.result }}"
+          echo "IDE: ${{ needs.ide-packaging.result }}"
 
-          if [[ "${{ needs.gui-packaging.result }}" == "failure" ]]; then
+          if [[ "${{ needs.ide-packaging.result }}" == "failure" ]]; then
             exit 1
           fi
 

diff --git a/.github/workflows/wasm-pull-request.yml b/.github/workflows/wasm-pull-request.yml
@@ -26,7 +26,7 @@ jobs:
     secrets: inherit
 
   required-checks:
-    name: Required Checks
+    name: WASM Required Checks
     runs-on: ubuntu-latest
     needs: [wasm-checks]
     if: always()

diff --git a/build/build/paths.yaml b/build/build/paths.yaml
@@ -11,8 +11,8 @@
       engine-checks-optional.yml:
       engine-checks.yml:
       extra-nightly-tests.yml:
-      gui-packaging-optional.yml:
-      gui-packaging.yml:
+      ide-packaging-optional.yml:
+      ide-packaging.yml:
       nightly.yml:
       promote.yml:
       release.yml:

diff --git a/build/build/src/ci_gen.rs b/build/build/src/ci_gen.rs
@@ -687,15 +687,15 @@ pub fn typical_check_triggers() -> Event {
     }
 }
 
-pub fn gui_packaging() -> Result<Workflow> {
+pub fn ide_packaging() -> Result<Workflow> {
     let on = Event {
         workflow_dispatch: Some(manual_workflow_dispatch()),
         workflow_call: Some(default()),
         ..default()
     };
     let mut workflow = Workflow {
-        name: "GUI Packaging".into(),
-        concurrency: Some(concurrency("gui-packaging")),
+        name: "IDE Packaging".into(),
+        concurrency: Some(concurrency("ide-packaging")),
         on,
         ..default()
     };
@@ -710,15 +710,15 @@ pub fn gui_packaging() -> Result<Workflow> {
     Ok(workflow)
 }
 
-pub fn gui_packaging_optional() -> Result<Workflow> {
+pub fn ide_packaging_optional() -> Result<Workflow> {
     let on = Event {
         workflow_dispatch: Some(manual_workflow_dispatch()),
         workflow_call: Some(default()),
         ..default()
     };
     let mut workflow = Workflow {
-        name: "GUI Packaging (Optional)".into(),
-        concurrency: Some(concurrency("gui-packaging-optional")),
+        name: "IDE Packaging (Optional)".into(),
+        concurrency: Some(concurrency("ide-packaging-optional")),
         on,
         ..default()
     };
@@ -906,8 +906,8 @@ pub fn generate(
         (repo_root.engine_checks_optional_yml.to_path_buf(), engine_checks_optional()?),
         (repo_root.engine_checks_nightly_yml.to_path_buf(), engine_checks_nightly()?),
         (repo_root.extra_nightly_tests_yml.to_path_buf(), extra_nightly_tests()?),
-        (repo_root.gui_packaging_yml.to_path_buf(), gui_packaging()?),
-        (repo_root.gui_packaging_optional_yml.to_path_buf(), gui_packaging_optional()?),
+        (repo_root.ide_packaging_yml.to_path_buf(), ide_packaging()?),
+        (repo_root.ide_packaging_optional_yml.to_path_buf(), ide_packaging_optional()?),
         (repo_root.wasm_checks_yml.to_path_buf(), wasm_checks()?),
         (repo_root.engine_benchmark_yml.to_path_buf(), engine_benchmark()?),
         (repo_root.std_libs_benchmark_yml.to_path_buf(), std_libs_benchmark()?),

diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
@@ -198,8 +198,10 @@ type Redshift_Dialect
             Dialect_Flag.Supports_Infinity -> True
             Dialect_Flag.Case_Sensitive_Text_Comparison -> True
             Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
-            Dialect_Flag.Case_Insensitive_Ordering -> False
+            Dialect_Flag.Supports_Case_Insensitive_Ordering -> False
             Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> True
+            Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> True
+            Dialect_Flag.Case_Insensitive_Ordering_By_Default -> True
             Dialect_Flag.Allows_Mixed_Type_Comparisons -> False
             Dialect_Flag.Supports_Unicode_Normalization -> False
             Dialect_Flag.NaN_Non_Comparable -> True

diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect_Flag.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect_Flag.enso
@@ -34,10 +34,16 @@ type Dialect_Flag
     Supports_Sort_Digits_As_Numbers
     ## PRIAVTE
        Specifies if the backend supports case insensitive ordering.
-    Case_Insensitive_Ordering
+    Supports_Case_Insensitive_Ordering
     ## PRIVATE
-       Specifies if the backend supports unicode normalization in its default ordering.
+       Specifies if the backend uses case insensitive sort in its default ordering.
+    Case_Insensitive_Ordering_By_Default
+    ## PRIVATE
+       Specifies if the backend uses unicode normalization in its default ordering.
     Order_By_Unicode_Normalization_By_Default
+    ## PRIVATE
+       Specifies if the backend uses unicode normalization when doing case insentive ordering.
+    Order_By_Unicode_Normalization_When_Case_Insensitive
     ## PRIVATE
        Specifies if mixed operations comparing
        mixed types are allowed by a given backend. Some backends will allow

diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
@@ -270,8 +270,10 @@ type Postgres_Dialect
             Dialect_Flag.Supports_Infinity -> True
             Dialect_Flag.Case_Sensitive_Text_Comparison -> True
             Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
-            Dialect_Flag.Case_Insensitive_Ordering -> True
+            Dialect_Flag.Supports_Case_Insensitive_Ordering -> True
             Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> True
+            Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> True
+            Dialect_Flag.Case_Insensitive_Ordering_By_Default -> True
             Dialect_Flag.Allows_Mixed_Type_Comparisons -> False
             Dialect_Flag.Supports_Unicode_Normalization -> False
             Dialect_Flag.NaN_Non_Comparable -> False

diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
@@ -281,8 +281,10 @@ type SQLite_Dialect
             Dialect_Flag.Supports_Infinity -> True
             Dialect_Flag.Case_Sensitive_Text_Comparison -> True
             Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
-            Dialect_Flag.Case_Insensitive_Ordering -> False
+            Dialect_Flag.Supports_Case_Insensitive_Ordering -> True
             Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> False
+            Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> False
+            Dialect_Flag.Case_Insensitive_Ordering_By_Default -> False
             Dialect_Flag.Allows_Mixed_Type_Comparisons -> True
             Dialect_Flag.Supports_Unicode_Normalization -> False
             Dialect_Flag.NaN_Non_Comparable -> True

diff --git a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso
@@ -259,8 +259,10 @@ type SQLServer_Dialect
             Dialect_Flag.Supports_Infinity -> False
             Dialect_Flag.Case_Sensitive_Text_Comparison -> False
             Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
-            Dialect_Flag.Case_Insensitive_Ordering -> True
+            Dialect_Flag.Supports_Case_Insensitive_Ordering -> True
             Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> True
+            Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> True
+            Dialect_Flag.Case_Insensitive_Ordering_By_Default -> True
             Dialect_Flag.Allows_Mixed_Type_Comparisons -> False
             Dialect_Flag.Supports_Unicode_Normalization -> False
             Dialect_Flag.NaN_Non_Comparable -> True

diff --git a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso
@@ -259,8 +259,10 @@ type Snowflake_Dialect
             Dialect_Flag.Supports_Infinity -> True
             Dialect_Flag.Case_Sensitive_Text_Comparison -> True
             Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
-            Dialect_Flag.Case_Insensitive_Ordering -> True
-            Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> True
+            Dialect_Flag.Supports_Case_Insensitive_Ordering -> True
+            Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> False
+            Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> True
+            Dialect_Flag.Case_Insensitive_Ordering_By_Default -> False
             Dialect_Flag.Allows_Mixed_Type_Comparisons -> False
             Dialect_Flag.Supports_Unicode_Normalization -> False
             Dialect_Flag.NaN_Non_Comparable -> False

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/typecheck/AbstractTypeCheckNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/typecheck/AbstractTypeCheckNode.java
@@ -1,7 +1,9 @@
 package org.enso.interpreter.node.typecheck;
 
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import java.util.List;
 import org.enso.interpreter.node.ExpressionNode;
@@ -29,11 +31,16 @@ abstract Object executeCheckOrConversion(
 
   abstract String expectedTypeMessage();
 
+  @ExplodeLoop
   final boolean isAllTypes() {
     Node p = this;
+    CompilerAsserts.compilationConstant(p);
     for (; ; ) {
       if (p instanceof TypeCheckValueNode vn) {
-        return vn.isAllTypes();
+        CompilerAsserts.compilationConstant(vn);
+        var allTypes = vn.isAllTypes();
+        CompilerAsserts.compilationConstant(allTypes);
+        return allTypes;
       }
       p = p.getParent();
     }

diff --git a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso
@@ -267,9 +267,9 @@ add_order_specs suite_builder setup =
             t2.at "delta" . to_vector . should_equal ["a03", "a1", "a10", "a2"]
             t2.at "alpha" . to_vector . should_equal [0, 2, 3, 1]
 
-        if setup.flagged ..Case_Insensitive_Ordering then group_builder.specify "should support case insensitive ordering" <|
+        if setup.flagged ..Supports_Case_Insensitive_Ordering then group_builder.specify "should support case insensitive ordering" <|
             t1 = data.table.sort [..Name "eta"] text_ordering=(..Case_Insensitive)
-            expected = case setup.flagged ..Order_By_Unicode_Normalization_By_Default of
+            expected = case setup.flagged ..Order_By_Unicode_Normalization_When_Case_Insensitive of
                 False -> ["Aleph", "alpha", "Beta", "bądź"]
                 True -> ["Aleph", "alpha", "bądź", "Beta"]
             t1.at "eta" . to_vector . should_equal expected
@@ -298,7 +298,7 @@ add_order_specs suite_builder setup =
             t3.at "psi" . to_vector . should_equal [Nothing, "c01", "c10", "C2"]
 
             t4 = data.table.sort [..Name "psi"]
-            case setup.flagged ..Case_Insensitive_Ordering of
+            case setup.flagged ..Case_Insensitive_Ordering_By_Default of
                 True -> t4.at "psi" . to_vector . should_equal [Nothing, "c01", "c10", "C2"]
                 False -> t4.at "psi" . to_vector . should_equal [Nothing, "C2", "c01", "c10"]
 

diff --git a/test/Table_Tests/src/Database/Upload_Spec.enso b/test/Table_Tests/src/Database/Upload_Spec.enso
@@ -242,7 +242,7 @@ add_specs suite_builder setup make_new_connection persistent_connector=True =
         group_builder.specify "should not issue a DELETE statement for the original table name in dry run mode, even if the table does not exist" <|
             original_table_name = Name_Generator.random_name "no-delete-test"
 
-            log_file = enso_project.data / "transient" / "sql.log"
+            log_file = (Project_Description.new enso_dev.Table_Tests).data / "transient" / "sql.log"
             log_file.delete_if_exists
             Test_Environment.unsafe_with_environment_override "ENSO_SQL_LOG_PATH" log_file.absolute.path <|
                 Context.Output.with_disabled <|

diff --git a/test/Table_Tests/src/In_Memory/Common_Spec.enso b/test/Table_Tests/src/In_Memory/Common_Spec.enso
@@ -41,7 +41,7 @@ in_memory_setup =
         True
     flagged_fn flag:Dialect_Flag =
         case flag of
-            Dialect_Flag.Case_Insensitive_Ordering -> False
+            Dialect_Flag.Case_Insensitive_Ordering_By_Default -> False
             Dialect_Flag.Removes_Trailing_Whitespace_Casting_From_Char_To_Varchar -> False
             _ -> True