fixes after rebase

enso-org · Aug 31, 2022 · a37f2f5 · a37f2f5
1 parent 4d57672
commit a37f2f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Storage.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Storage.enso
@@ -14,13 +14,13 @@ type Type
     Boolean
 
     ## A column storing dates.
-    type Date
+    Date
 
     ## A column storing date-times.
-    type Date_Time
+    Date_Time
 
     ## A column storing time-of-day.
-    type Time_Of_Day
+    Time_Of_Day
 
     ## A column storing arbitrary data.
     Any
diff --git a/test/Table_Tests/src/Aggregate_Spec.enso b/test/Table_Tests/src/Aggregate_Spec.enso
@@ -39,7 +39,7 @@ spec =
      skip checks for backends which do not support particular features.
    - pending: An optional mark to disable all test groups. Can be used to
      indicate that some tests are disabled due to missing test setup.
-aggregate_spec prefix table empty_table table_builder materialize is_database test_selection=Test_Selection pending=Nothing =
+aggregate_spec prefix table empty_table table_builder materialize is_database test_selection=Test_Selection_Data pending=Nothing =
     expect_column_names names table =
         table.columns . map .name . should_equal names frames_to_skip=2
 

diff --git a/test/Table_Tests/src/Table_Spec.enso b/test/Table_Tests/src/Table_Spec.enso
@@ -88,7 +88,7 @@ spec =
             ints = ["ints", [Nothing, 1, 2, 4]]
             doubles = ["doubles", [0.0, 1.5, Nothing, 2.0]]
             doubles_and_ints = ["doubles_and_ints", [0, 1.5, Nothing, 2]]
-            custom_objects = ["custom_objects", [My 1 2, My 3 4, Nothing, Nothing]]
+            custom_objects = ["custom_objects", [My_Data 1 2, My_Data 3 4, Nothing, Nothing]]
             dates = ["dates", [Nothing, Date.new 2000, Date.new 2022 8 20, Date.new 1999 1 1]]
             times = ["times", [Time_Of_Day.new 18 00, Time_Of_Day.new 1 2 34, Nothing, Time_Of_Day.new]]
             datetimes = ["datetimes", [Date_Time.new 2000, Date_Time.new 1999 1 2 3 4 5, Nothing, Date_Time.new 2022 8 27 11 22 25]]