diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Column.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Column.enso index 19ab8485a3698..322d64ad50283 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Column.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Column.enso @@ -3,12 +3,12 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Table import Sort_Column, Data_Formatter -import Standard.Table.Data.Value_Type.Value_Type +import Standard.Table.Data.Type.Value_Type.Value_Type import Standard.Table.Data.Column.Column as Materialized_Column import Standard.Table.Internal.Java_Problems import Standard.Table.Internal.Problem_Builder.Problem_Builder import Standard.Table.Internal.Widget_Helpers -from Standard.Table.Data.Value_Type import Value_Type, Auto +from Standard.Table.Data.Type.Value_Type import Value_Type, Auto from Standard.Table.Errors import Floating_Point_Equality import project.Data.SQL_Statement.SQL_Statement diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/SQL_Type.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/SQL_Type.enso index 693e2a0f726e4..4b04ae0052a27 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/SQL_Type.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/SQL_Type.enso @@ -1,8 +1,6 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument -from Standard.Base.Data.Ordering import all - import project.Data.Column.Column polyglot java import java.sql.Types @@ -15,7 +13,12 @@ type SQL_Type Arguments: - typeid: a numerical type id, as defined in `java.sql.Types`. - name: a database-specific type name, used for pretty printing. - Value typeid name + - precision: For character types, specifies their length. + See `ResultSetMetaData.getPrecision`. + - nullable: Specifies if the given column is nullable. May be `Nothing` + if that is unknown / irrelevant for the type. + TODO: the precise meaning of this will be revised with #5872. + Value (typeid : Integer) (name : Text) (precision : Nothing | Integer = Nothing) (nullable : Boolean | Nothing = Nothing) ## The SQL representation of `Boolean` type. boolean : SQL_Type @@ -184,13 +187,3 @@ merge_number_type left right = if left.is_definitely_integer then merge_number_t if right_index.is_nothing then left else new_index = left_index.max right_index [SQL_Type.numeric, SQL_Type.decimal, SQL_Type.real, SQL_Type.real, SQL_Type.double].at new_index - -## PRIVATE -type SQL_Type_Comparator - compare x y = - if x.typeid == y.typeid then Ordering.Equal else - Nothing - - hash x = x.typeid.hashCode - -Comparable.from (_:SQL_Type) = SQL_Type_Comparator diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso index a4bb034c7203f..22fe04eaef7ce 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso @@ -16,8 +16,8 @@ import Standard.Table.Data.Join_Kind.Join_Kind import Standard.Table.Data.Report_Unmatched.Report_Unmatched import Standard.Table.Data.Row.Row import Standard.Table.Data.Table.Table as Materialized_Table -import Standard.Table.Data.Value_Type.Auto -import Standard.Table.Data.Value_Type.Value_Type +import Standard.Table.Data.Type.Value_Type.Auto +import Standard.Table.Data.Type.Value_Type.Value_Type import Standard.Table.Internal.Aggregate_Column_Helper import Standard.Table.Internal.Java_Exports import Standard.Table.Internal.Table_Helpers diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso index 97a988acf44f9..705112fa11401 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso @@ -2,13 +2,14 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Runtime.Managed_Resource.Managed_Resource -import Standard.Table.Data.Storage.Storage +import Standard.Table.Data.Type.Storage.Storage import Standard.Table.Data.Table.Table as Materialized_Table import project.Data.SQL.Builder import project.Data.SQL_Statement.SQL_Statement import project.Data.SQL_Type.SQL_Type import project.Internal.Base_Generator +import project.Internal.SQL_Type_Mapping import project.Data.Table.Table as Database_Table @@ -92,10 +93,10 @@ type JDBC_Connection metadata = stmt.executeQuery.getMetaData resolve_column ix = - name = metadata.getColumnName ix+1 - typeid = metadata.getColumnType ix+1 - typename = metadata.getColumnTypeName ix+1 - [name, SQL_Type.Value typeid typename] + # Todo test edge case with AS + name = metadata.getColumnLabel ix+1 + sql_type = SQL_Type_Mapping.from_metadata metadata ix+1 + [name, sql_type] Vector.new metadata.getColumnCount resolve_column diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Result_Set.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Result_Set.enso index 8a90950227708..e16f4e90b974d 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Result_Set.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Result_Set.enso @@ -5,6 +5,7 @@ import Standard.Table.Data.Column.Column as Materialized_Column import Standard.Table.Internal.Java_Exports import project.Data.SQL_Type.SQL_Type +import project.Internal.SQL_Type_Mapping polyglot java import java.sql.ResultSet @@ -32,9 +33,7 @@ result_set_to_table result_set expected_types=Nothing last_row_only=False = column_names = Vector.new ncols ix-> metadata.getColumnName ix+1 column_types = if expected_types.is_nothing.not then expected_types else Vector.new ncols ix-> - typeid = metadata.getColumnType ix+1 - name = metadata.getColumnTypeName ix+1 - SQL_Type.Value typeid name + SQL_Type_Mapping.from_metadata metadata ix+1 column_builders = column_types.map create_builder case last_row_only of True -> diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQL_Type_Mapping.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQL_Type_Mapping.enso new file mode 100644 index 0000000000000..c8ea00e81db5f --- /dev/null +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQL_Type_Mapping.enso @@ -0,0 +1,44 @@ +from Standard.Base import all + +import project.Data.SQL_Type.SQL_Type + +polyglot java import java.sql.ResultSetMetaData + +type SQL_Type_Mapping + ## Converts the given Value_Type to its corresponding SQL_Type. + + Some SQL dialects may not support all Value_Types (in fact most will + have at least a few exceptions, and some like SQLite may have very + limited support). If an SQL_Type that matches the Value_Type cannot be + found, a closest approximate match is returned instead. If an exact match + cannot be found, an `Inexact_Type_???` warning is reported according to + the `on_problems` setting. + + If the conversion is exact, it should be reversible, i.e. + `sql_type_to_value_type (value_type_to_sql x) = x`. + value_type_to_sql : Value_Type -> Problem_Behavior -> SQL_Type + value_type_to_sql = + unimplemented "This is an interface only." + + ## Converts the given SQL_Type to its corresponding Value_Type. + sql_type_to_value_type : SQL_Type -> Value_Type + sql_type_to_value_type = + unimplemented "This is an interface only." + + # TODO not sure if this is needed, instead we could allow to construct SQL types only in context of a specific dialect, then the correct typename would be baked into the type + to_dialect_specific_name : SQL_Type -> Text + to_dialect_specific_name = + unimplemented "This is an interface only." + +## PRIVATE +from_metadata metadata ix = + typeid = metadata.getColumnType ix + typename = metadata.getColumnTypeName ix + precision = case metadata.getPrecision ix of + 0 -> Nothing + p : Integer -> p + nullable_id = + nullable = if nullable_id == ResultSetMetaData.columnNoNulls then False else + if nullable_id == ResultSetMetaData.columnNullable then True else + Nothing + SQL_Type.Value typeid typename precision nullable diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso index 52513de31548a..1b7b5606649a0 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso @@ -7,16 +7,16 @@ import Standard.Base.Errors.Illegal_State.Illegal_State import Standard.Base.Data.Index_Sub_Range as Index_Sub_Range_Module import project.Data.Data_Formatter.Data_Formatter -import project.Data.Storage.Storage +import project.Data.Type.Storage.Storage import project.Data.Table.Table -import project.Data.Value_Type.Value_Type +import project.Data.Type.Value_Type.Value_Type import project.Internal.Java_Problems import project.Internal.Naming_Helpers.Naming_Helpers import project.Internal.Parse_Values_Helper import project.Internal.Widget_Helpers from project.Data.Table import print_table -from project.Data.Value_Type import Auto, ensure_valid_parse_target +from project.Data.Type.Value_Type import Auto, ensure_valid_parse_target from project.Errors import No_Index_Set_Error, Floating_Point_Equality polyglot java import org.enso.table.data.column.operation.map.MapOperationProblemBuilder diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Data_Formatter.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Data_Formatter.enso index 0165d5847f9f0..c2ae6fe23a99f 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Data_Formatter.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Data_Formatter.enso @@ -1,8 +1,8 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument -import project.Data.Value_Type.Auto -import project.Data.Storage.Storage +import project.Data.Type.Value_Type.Auto +import project.Data.Type.Storage.Storage import project.Internal.Parse_Values_Helper polyglot java import org.enso.table.parsing.IntegerParser diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Table.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Table.enso index 9d10a741f8987..4bb7115721f68 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Table.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Table.enso @@ -23,8 +23,8 @@ import project.Data.Report_Unmatched.Report_Unmatched import project.Data.Row.Row import project.Data.Set_Mode.Set_Mode import project.Data.Sort_Column.Sort_Column -import project.Data.Storage.Storage -import project.Data.Value_Type.Value_Type +import project.Data.Type.Storage.Storage +import project.Data.Type.Value_Type.Value_Type import project.Internal.Aggregate_Column_Helper import project.Internal.Java_Problems import project.Internal.Join_Helpers @@ -39,7 +39,7 @@ import project.Data.Expression.Expression import project.Data.Expression.Expression_Error import project.Delimited.Delimited_Format.Delimited_Format -from project.Data.Value_Type import Auto, ensure_valid_parse_target +from project.Data.Type.Value_Type import Auto, ensure_valid_parse_target from project.Internal.Rows_View import Rows_View from project.Errors import all 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/Type/Storage.enso similarity index 89% rename from distribution/lib/Standard/Table/0.0.0-dev/src/Data/Storage.enso rename to distribution/lib/Standard/Table/0.0.0-dev/src/Data/Type/Storage.enso index 1b24c194661b6..682430caff75f 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Storage.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Type/Storage.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Illegal_State.Illegal_State -import Standard.Table.Data.Value_Type.Value_Type +import Standard.Table.Data.Type.Value_Type.Value_Type polyglot java import org.enso.table.data.column.builder.object.Builder polyglot java import org.enso.table.data.column.storage.Storage as Java_Storage @@ -65,13 +65,13 @@ type Storage Converts this storage type to a value type closest representing it. to_approximate_value_type : Value_Type to_approximate_value_type self = case self of - Storage.Text -> Value_Type.Char - Storage.Integer -> Value_Type.Integer - Storage.Decimal -> Value_Type.Float + Storage.Text -> Value_Type.Char size=Nothing variable=True + Storage.Integer -> Value_Type.Integer Bits.Bits_64 + Storage.Decimal -> Value_Type.Float Bits.Bits_64 Storage.Boolean -> Value_Type.Boolean Storage.Date -> Value_Type.Date Storage.Time_Of_Day -> Value_Type.Time - Storage.Date_Time -> Value_Type.Date_Time + Storage.Date_Time -> Value_Type.Date_Time with_timezone=True Storage.Any -> Value_Type.Mixed ## PRIVATE diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Type/Utils.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Type/Utils.enso new file mode 100644 index 0000000000000..2eff38afbd57b --- /dev/null +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Type/Utils.enso @@ -0,0 +1,7 @@ +## PRIVATE + Checks if the given `value` fits the provided `value_type` without + conversions other than numeric widening. +fits : Value_Type -> Any -> Boolean +fits value_type value = case value_type of + ## FIXME!!! + _ -> False diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Value_Type.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Type/Value_Type.enso similarity index 100% rename from distribution/lib/Standard/Table/0.0.0-dev/src/Data/Value_Type.enso rename to distribution/lib/Standard/Table/0.0.0-dev/src/Data/Type/Value_Type.enso diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Delimited_Writer.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Delimited_Writer.enso index aff9ded2fdf49..5fa6a410db2d2 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Delimited_Writer.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Delimited_Writer.enso @@ -6,7 +6,7 @@ import Standard.Base.System.File.Output_Stream import project.Data.Table.Table import project.Data.Data_Formatter.Data_Formatter import project.Data.Match_Columns.Match_Columns -import project.Data.Storage.Storage +import project.Data.Type.Storage.Storage import project.Delimited.Delimited_Format.Delimited_Format import project.Delimited.Quote_Style.Quote_Style import project.Internal.Delimited_Reader diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Filter_Condition_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Filter_Condition_Helpers.enso index c38694937c7fd..395a6e4c2029c 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Filter_Condition_Helpers.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Filter_Condition_Helpers.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Common.No_Such_Method import Standard.Base.Errors.Common.Type_Error -import project.Data.Value_Type.Value_Type +import project.Data.Type.Value_Type.Value_Type from Standard.Base.Data.Filter_Condition.Filter_Condition import all diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Join_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Join_Helpers.enso index aceaabc7667a3..f748fb6cc27c0 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Join_Helpers.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Join_Helpers.enso @@ -4,7 +4,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State from project.Errors import Invalid_Value_Type, No_Such_Column, Missing_Input_Columns, Column_Indexes_Out_Of_Range import project.Data.Join_Condition.Join_Condition -import project.Data.Value_Type.Value_Type +import project.Data.Type.Value_Type.Value_Type import project.Internal.Problem_Builder.Problem_Builder type Join_Condition_Resolver diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso index 658312609de8c..1fe859310bafb 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso @@ -7,7 +7,7 @@ import project.Data.Column_Selector.Column_Selector import project.Data.Position.Position import project.Data.Sort_Column.Sort_Column import project.Data.Table.Table -import project.Data.Value_Type.Value_Type +import project.Data.Type.Value_Type.Value_Type import project.Internal.Problem_Builder.Problem_Builder import project.Internal.Unique_Name_Strategy.Unique_Name_Strategy diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso index 51a3414f7c343..99e2e2954c6d0 100644 --- a/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso +++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso @@ -3,7 +3,7 @@ from Standard.Base import all import project.Data.Aggregate_Column.Aggregate_Column import project.Data.Column.Column import project.Data.Column_Selector.Column_Selector -import project.Data.Value_Type.Auto +import project.Data.Type.Value_Type.Auto import project.Data.Data_Formatter.Data_Formatter import project.Data.Join_Condition.Join_Condition import project.Data.Join_Kind.Join_Kind @@ -24,7 +24,7 @@ import project.Excel.Excel_Workbook.Excel_Workbook export project.Data.Aggregate_Column.Aggregate_Column export project.Data.Column.Column export project.Data.Column_Selector.Column_Selector -export project.Data.Value_Type.Auto +export project.Data.Type.Value_Type.Auto export project.Data.Data_Formatter.Data_Formatter export project.Data.Join_Condition.Join_Condition export project.Data.Join_Kind.Join_Kind diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Helpers.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Helpers.enso index c8f910d880f9e..11b8bffcc3591 100644 --- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Helpers.enso +++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Helpers.enso @@ -4,7 +4,7 @@ from Standard.Base.Data.Json import render from Standard.Table import Table, Column import Standard.Table.Data.Row.Row -import Standard.Table.Data.Storage.Storage +import Standard.Table.Data.Type.Storage.Storage import project.Id.Id from project.Text import get_lazy_visualisation_text_window diff --git a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso index ca7c137f16f37..94822c58c9eab 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso @@ -5,7 +5,7 @@ import Standard.Base.Errors.Common.Type_Error import Standard.Base.Errors.Illegal_Argument.Illegal_Argument import Standard.Base.Errors.Illegal_State.Illegal_State -import Standard.Table.Data.Value_Type.Value_Type +import Standard.Table.Data.Type.Value_Type.Value_Type import Standard.Table.Data.Expression.Expression_Error from Standard.Table.Errors import all diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso index c433b8f94a6f1..da45f4e13f019 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Table import all hiding Table from Standard.Table.Errors import all -import Standard.Table.Data.Value_Type.Value_Type +import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso index 8f55aa8af022c..26d7fc7e15f07 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Table import all from Standard.Table.Errors import all -import Standard.Table.Data.Value_Type.Value_Type +import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso index 3f418f83ac3b5..9dac13bb47e61 100644 --- a/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso +++ b/test/Table_Tests/src/Common_Table_Operations/Join/Zip_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State from Standard.Table import all hiding Table from Standard.Table.Errors import all -import Standard.Table.Data.Value_Type.Value_Type +import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Database.Errors import Unsupported_Database_Operation diff --git a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso index d326f46bdb196..d6043991feb39 100644 --- a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso +++ b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table import Table, Data_Formatter, Column, Column_Selector -from Standard.Table.Data.Value_Type import Auto, Value_Type +from Standard.Table.Data.Type.Value_Type import Auto, Value_Type from Standard.Table.Errors import all from Standard.Test import Test, Test_Suite, Problems diff --git a/test/Table_Tests/src/In_Memory/Column_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Spec.enso index 16cfe99c1eabb..73ff8c25e7861 100644 --- a/test/Table_Tests/src/In_Memory/Column_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Column_Spec.enso @@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table import Column -import Standard.Table.Data.Storage.Storage +import Standard.Table.Data.Type.Storage.Storage import Standard.Examples diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso index 299b1ee1db1d3..d0740041fed01 100644 --- a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Table import Table, Column, Delimited, Data_Formatter import Standard.Table.Data.Table_Conversions -import Standard.Table.Data.Storage.Storage +import Standard.Table.Data.Type.Storage.Storage from Standard.Test import Test, Test_Suite import Standard.Test.Extensions diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso index 946f42a6183be..66856b5963334 100644 --- a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Table import Table, Delimited, Column, Data_Formatter import Standard.Table.Data.Table_Conversions -import Standard.Table.Data.Storage.Storage +import Standard.Table.Data.Type.Storage.Storage from Standard.Test import Test, Test_Suite import Standard.Test.Extensions diff --git a/test/Table_Tests/src/In_Memory/Table_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Spec.enso index 9c1763d6845a0..33c08070bbbd0 100644 --- a/test/Table_Tests/src/In_Memory/Table_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Spec.enso @@ -7,8 +7,8 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument from Standard.Table import Table, Column, Sort_Column, Column_Selector, Aggregate_Column import Standard.Table.Main as Table_Module from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all hiding First, Last -from Standard.Table.Data.Storage import Storage -import Standard.Table.Data.Value_Type.Value_Type +from Standard.Table.Data.Type.Storage import Storage +import Standard.Table.Data.Type.Value_Type.Value_Type from Standard.Table.Errors import Invalid_Output_Column_Names, Duplicate_Output_Column_Names, No_Input_Columns_Selected, Missing_Input_Columns, No_Such_Column, Floating_Point_Equality, Invalid_Value_Type import Standard.Visualization diff --git a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso index d98f40642f9a4..3a5d237083228 100644 --- a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso +++ b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso @@ -2,7 +2,7 @@ from Standard.Base import all from Standard.Table import Table, Delimited, Column, Data_Formatter import Standard.Table.Data.Table_Conversions -import Standard.Table.Data.Storage.Storage +import Standard.Table.Data.Type.Storage.Storage from Standard.Test import Test, Test_Suite import Standard.Test.Extensions