From 02e9756b725a4655d0bf604f0bd7aa00f7920b0b Mon Sep 17 00:00:00 2001 From: Adam Riley Date: Fri, 20 Dec 2024 10:38:29 +0200 Subject: [PATCH] Rename flag to make code clearer --- .../src/Database/Redshift/Internal/Redshift_Dialect.enso | 2 +- .../lib/Standard/Database/0.0.0-dev/src/Dialect_Flag.enso | 2 +- .../0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso | 2 +- .../0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso | 2 +- .../Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso | 2 +- .../Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso | 2 +- .../src/Common_Table_Operations/Order_By_Spec.enso | 4 ++-- test/Table_Tests/src/In_Memory/Common_Spec.enso | 1 - 8 files changed, 8 insertions(+), 9 deletions(-) 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 index 2a753d901a8d..985e867efb85 100644 --- 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,7 +198,7 @@ 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.Allows_Mixed_Type_Comparisons -> False Dialect_Flag.Supports_Unicode_Normalization -> False 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 index 89f0e29ea453..b61518c0b5dc 100644 --- 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,7 +34,7 @@ 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. Order_By_Unicode_Normalization_By_Default 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 index 8ebd32a200e0..4c9edb2eb5e1 100644 --- 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,7 +270,7 @@ 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.Allows_Mixed_Type_Comparisons -> False Dialect_Flag.Supports_Unicode_Normalization -> 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 index 9e0bcca0a1fb..9e90f9847ad0 100644 --- 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,7 +281,7 @@ 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.Allows_Mixed_Type_Comparisons -> True Dialect_Flag.Supports_Unicode_Normalization -> False 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 index 781f2ce6e2bd..8b040ba0feff 100644 --- 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,7 +259,7 @@ 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.Allows_Mixed_Type_Comparisons -> False Dialect_Flag.Supports_Unicode_Normalization -> False 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 index 3db93b0615e2..66c363dea7c0 100644 --- 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,7 +259,7 @@ 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 -> False + Dialect_Flag.Supports_Case_Insensitive_Ordering -> True Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> False Dialect_Flag.Allows_Mixed_Type_Comparisons -> False Dialect_Flag.Supports_Unicode_Normalization -> False 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 index 8d4ead51daad..2560c06f78d3 100644 --- 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,7 +267,7 @@ 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 = ["Aleph", "alpha", "bądź", "Beta"] t1.at "eta" . to_vector . should_equal expected @@ -296,7 +296,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 ..Order_By_Unicode_Normalization_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/In_Memory/Common_Spec.enso b/test/Table_Tests/src/In_Memory/Common_Spec.enso index a3b1eae0711a..fb324850499c 100644 --- a/test/Table_Tests/src/In_Memory/Common_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Common_Spec.enso @@ -41,7 +41,6 @@ in_memory_setup = True flagged_fn flag:Dialect_Flag = case flag of - Dialect_Flag.Case_Insensitive_Ordering -> False Dialect_Flag.Removes_Trailing_Whitespace_Casting_From_Char_To_Varchar -> False _ -> True