From 5c7947ce606e1cb5e79bd10ce4222c84068d8409 Mon Sep 17 00:00:00 2001
From: AdRiley <riley.ad@gmail.com>
Date: Wed, 14 Feb 2024 09:11:52 +0000
Subject: [PATCH] Rename database column to DB_Column (#9046)

Rename database column to DB_Column to avoid name collisions as part of https://github.com/enso-org/enso/issues/8981
---
 .../builtin/visualization/java_script/sql.js  |   5 +-
 .../visualizations/SQLVisualization.vue       |   3 +-
 .../Redshift/Internal/Redshift_Dialect.enso   |   4 +-
 .../src/Data/{Column.enso => DB_Column.enso}  | 196 +++++++++---------
 .../Database/0.0.0-dev/src/Data/Dialect.enso  |   4 +-
 .../Database/0.0.0-dev/src/Data/SQL_Type.enso |   2 -
 .../Database/0.0.0-dev/src/Data/Table.enso    |  70 +++----
 .../0.0.0-dev/src/Data/Take_Drop_Helpers.enso |   1 -
 .../0.0.0-dev/src/Internal/Helpers.enso       |   6 +-
 .../Internal/Postgres/Postgres_Dialect.enso   |  10 +-
 .../src/Internal/SQLite/SQLite_Dialect.enso   |   6 +-
 .../Internal/SQLite/SQLite_Type_Mapping.enso  |   4 +-
 .../0.0.0-dev/src/Internal/Table_Helpers.enso |   2 +-
 .../0.0.0-dev/src/Table/Visualization.enso    |   6 +-
 .../Column_Operations_Spec.enso               |   6 +-
 .../Common_Table_Operations/Nothing_Spec.enso |   2 +-
 .../src/Database/Postgres_Spec.enso           |   4 +-
 .../Table_Tests/src/Database/SQLite_Spec.enso |   1 -
 test/Table_Tests/src/Util.enso                |   2 +-
 19 files changed, 167 insertions(+), 167 deletions(-)
 rename distribution/lib/Standard/Database/0.0.0-dev/src/Data/{Column.enso => DB_Column.enso} (93%)

diff --git a/app/gui/view/graph-editor/src/builtin/visualization/java_script/sql.js b/app/gui/view/graph-editor/src/builtin/visualization/java_script/sql.js
index 723512bafc18..7d023ea68a84 100644
--- a/app/gui/view/graph-editor/src/builtin/visualization/java_script/sql.js
+++ b/app/gui/view/graph-editor/src/builtin/visualization/java_script/sql.js
@@ -81,8 +81,9 @@ loadScript('https://cdnjs.cloudflare.com/ajax/libs/sql-formatter/4.0.2/sql-forma
  */
 class SqlVisualization extends Visualization {
     // TODO Change the type below once #837 is done:
-    // 'Standard.Database.Data.Table.Table | Standard.Database.Data.Column.Column'
-    static inputType = 'Standard.Database.Data.Table.Table | Standard.Database.Data.Column.Column'
+    // 'Standard.Database.Data.Table.Table | Standard.Database.Data.DB_Column.DB_Column'
+    static inputType =
+        'Standard.Database.Data.Table.Table | Standard.Database.Data.DB_Column.DB_Column'
     static label = 'SQL Query'
 
     constructor(api) {
diff --git a/app/gui2/src/components/visualizations/SQLVisualization.vue b/app/gui2/src/components/visualizations/SQLVisualization.vue
index f212ab57e087..c0d7a6487b18 100644
--- a/app/gui2/src/components/visualizations/SQLVisualization.vue
+++ b/app/gui2/src/components/visualizations/SQLVisualization.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
 export const name = 'SQL Query'
 export const icon = 'braces'
-export const inputType = 'Standard.Database.Data.Table.Table | Standard.Database.Data.Column.Column'
+export const inputType =
+  'Standard.Database.Data.Table.Table | Standard.Database.Data.DB_Column.DB_Column'
 export const defaultPreprocessor = [
   'Standard.Visualization.SQL.Visualization',
   'prepare_visualization',
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 a9021cb13173..2a87ac08db25 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
@@ -3,7 +3,7 @@ from Standard.Base import all
 from Standard.Table import Aggregate_Column, Value_Type
 
 import Standard.Database.Connection.Connection.Connection
-import Standard.Database.Data.Column.Column
+import Standard.Database.Data.DB_Column.DB_Column
 import Standard.Database.Data.Dialect
 import Standard.Database.Data.SQL_Statement.SQL_Statement
 import Standard.Database.Data.SQL_Type.SQL_Type
@@ -177,7 +177,7 @@ type Redshift_Dialect
         Dialect.default_fetch_primary_key connection table_name
 
     ## PRIVATE
-    value_type_for_upload_of_existing_column : Column -> Value_Type
+    value_type_for_upload_of_existing_column : DB_Column -> Value_Type
     value_type_for_upload_of_existing_column self column =
         ## TODO special behaviour for big integer columns should be added here, once we start testing this dialect again
            See: https://docs.aws.amazon.com/redshift/latest/dg/r_Numeric_types201.html#r_Numeric_types201-decimal-or-numeric-type
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/DB_Column.enso
similarity index 93%
rename from distribution/lib/Standard/Database/0.0.0-dev/src/Data/Column.enso
rename to distribution/lib/Standard/Database/0.0.0-dev/src/Data/DB_Column.enso
index 29daa99e0b82..6b28940ae361 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/DB_Column.enso
@@ -32,7 +32,7 @@ import project.Internal.Replace_Params.Replace_Params
 import project.Internal.SQL_Type_Reference.SQL_Type_Reference
 from project.Errors import Integrity_Error, Unsupported_Database_Operation
 
-type Column
+type DB_Column
     ## PRIVATE
 
        Represents a single column backed by a database.
@@ -185,14 +185,14 @@ type Column
          is always passed as the first argument).
        - new_name: The name of the resulting column.
        - metadata: Optional metadata for the `SQL_Expression.Operation`.
-    make_op : Text -> Vector Text -> (Text | Nothing) -> (Any | Nothing) -> Column
+    make_op : Text -> Vector Text -> (Text | Nothing) -> (Any | Nothing) -> DB_Column
     make_op self op_kind operands new_name metadata=Nothing =
         checked_support = if self.connection.dialect.is_supported op_kind then True else
             Error.throw (Unsupported_Database_Operation.Error "The operation "+op_kind+" is not supported by this backend.")
         checked_support.if_not_error <|
             type_mapping = self.connection.dialect.get_type_mapping
             prepare_operand operand = case operand of
-                other_column : Column ->
+                other_column : DB_Column ->
                     if Helpers.check_integrity self other_column then other_column.expression else
                         Error.throw <| Unsupported_Database_Operation.Error "Cannot use columns coming from different contexts in one expression without a join."
                 sql_expression : SQL_Expression ->
@@ -206,7 +206,7 @@ type Column
             infer_from_database_callback expression =
                 SQL_Type_Reference.new self.connection self.context expression
             new_type_ref = type_mapping.infer_return_type infer_from_database_callback op_kind [self]+operands new_expr
-            Column.Value new_name self.connection new_type_ref new_expr self.context
+            DB_Column.Value new_name self.connection new_type_ref new_expr self.context
 
     ## PRIVATE
 
@@ -216,7 +216,7 @@ type Column
        - op_kind: The kind of binary operator.
        - operand: The right operand to the binary operator.
        - new_name: The name of the resulting column.
-    make_binary_op : Text -> Text -> (Text | Nothing) -> Column
+    make_binary_op : Text -> Text -> (Text | Nothing) -> DB_Column
     make_binary_op self op_kind operand new_name=Nothing =
         effective_new_name = new_name.if_nothing <|
             self.naming_helper.binary_operation_name op_kind self operand
@@ -230,7 +230,7 @@ type Column
        - op_kind: The kind of the unary operator.
        - new_name: The name of the resulting column. If nothing, will create a
          name based on the operator.
-    make_unary_op : Text -> Text|Nothing -> Column
+    make_unary_op : Text -> Text|Nothing -> DB_Column
     make_unary_op self op_kind new_name=Nothing =
         effective_new_name = new_name.if_nothing <|
             self.naming_helper.function_name op_kind [self]
@@ -285,7 +285,7 @@ type Column
              import Standard.Examples
 
              example_eq = Examples.integer_column == 1
-    == : Column | Any -> Column
+    == : DB_Column | Any -> DB_Column
     == self other =
         make_equality_check_with_floating_point_handling self other "=="
 
@@ -302,7 +302,7 @@ type Column
        Returns a column with results of comparing this column's elements against
        `other`.
     @locale Locale.default_widget
-    equals_ignore_case : Column | Any -> Locale -> Column
+    equals_ignore_case : DB_Column | Any -> Locale -> DB_Column
     equals_ignore_case self other locale=Locale.default =
         Value_Type.expect_text self <|
             Value_Type.expect_text other <|
@@ -342,7 +342,7 @@ type Column
              import Standard.Examples
 
              example_neq = Examples.integer_column != 1
-    != : Column | Any -> Column
+    != : DB_Column | Any -> DB_Column
     != self other =
         make_equality_check_with_floating_point_handling self other "!="
 
@@ -357,7 +357,7 @@ type Column
        Returns a column with results of comparing this column's elements against
        `other`.  If `other` is a column, the comparison is performed pairwise
        between corresponding elements of `self` and `other`.
-    >= : Column | Any -> Column
+    >= : DB_Column | Any -> DB_Column
     >= self other = Value_Type.expect_comparable self other <|
         self.make_binary_op ">=" other
 
@@ -372,7 +372,7 @@ type Column
        Returns a column with results of comparing this column's elements against
        `other`.  If `other` is a column, the comparison is performed pairwise
        between corresponding elements of `self` and `other`.
-    <= : Column | Any -> Column
+    <= : DB_Column | Any -> DB_Column
     <= self other = Value_Type.expect_comparable self other <|
         self.make_binary_op "<=" other
 
@@ -387,7 +387,7 @@ type Column
        Returns a column with results of comparing this column's elements against
        `other`.  If `other` is a column, the comparison is performed pairwise
        between corresponding elements of `self` and `other`.
-    > : Column | Any -> Column
+    > : DB_Column | Any -> DB_Column
     > self other = Value_Type.expect_comparable self other <|
         self.make_binary_op ">" other
 
@@ -402,7 +402,7 @@ type Column
        Returns a column with results of comparing this column's elements against
        `other`.  If `other` is a column, the comparison is performed pairwise
        between corresponding elements of `self` and `other`.
-    < : Column | Any -> Column
+    < : DB_Column | Any -> DB_Column
     < self other = Value_Type.expect_comparable self other <|
         self.make_binary_op "<" other
 
@@ -420,7 +420,7 @@ type Column
 
        Returns a column with boolean values indicating whether values of this
        column fit between the lower and upper bounds (both ends inclusive).
-    between : (Column | Any) -> (Column | Any) -> Column
+    between : (DB_Column | Any) -> (DB_Column | Any) -> DB_Column
     between self lower upper =
         Value_Type.expect_comparable self lower <|
             Value_Type.expect_comparable self upper <|
@@ -448,7 +448,7 @@ type Column
          `Arithmetic_Overflow` warning. The behaviour in Database backends is
          not specified and will depend on the particular database - it may
          cause a hard error, the value may be truncated or wrap-around etc.
-    + : Column | Any -> Column
+    + : DB_Column | Any -> DB_Column
     + self other =
         op = case Value_Type_Helpers.resolve_addition_kind self other of
             Value_Type_Helpers.Addition_Kind.Numeric_Add -> "ADD_NUMBER"
@@ -478,7 +478,7 @@ type Column
          `Arithmetic_Overflow` warning. The behaviour in Database backends is
          not specified and will depend on the particular database - it may
          cause a hard error, the value may be truncated or wrap-around etc.
-    - : Column | Any -> Column
+    - : DB_Column | Any -> DB_Column
     - self other =
         case Value_Type_Helpers.resolve_subtraction_kind self other of
             Value_Type_Helpers.Subtraction_Kind.Numeric_Subtract ->
@@ -506,7 +506,7 @@ type Column
          `Arithmetic_Overflow` warning. The behaviour in Database backends is
          not specified and will depend on the particular database - it may
          cause a hard error, the value may be truncated or wrap-around etc.
-    * : Column | Any -> Column
+    * : DB_Column | Any -> DB_Column
     * self other =
         Value_Type_Helpers.check_binary_numeric_op self other <|
             self.make_binary_op "*" other
@@ -551,7 +551,7 @@ type Column
              import Standard.Examples
 
              example_div = Examples.integer_column / 10
-    / : Column | Any -> Column
+    / : DB_Column | Any -> DB_Column
     / self other =
         Value_Type_Helpers.check_binary_numeric_op self other <|
             self.make_binary_op "/" other
@@ -587,7 +587,7 @@ type Column
              import Standard.Examples
 
              example_mod = Examples.integer_column % 3
-    % : Column | Any -> Column
+    % : DB_Column | Any -> DB_Column
     % self other =
         Value_Type_Helpers.check_binary_numeric_op self other <|
             other_type = Value_Type_Helpers.find_argument_type other
@@ -631,7 +631,7 @@ type Column
              import Standard.Examples
 
              example_div = Examples.decimal_column ^ Examples.integer_column
-    ^ : Column | Any -> Column
+    ^ : DB_Column | Any -> DB_Column
     ^ self other =
         Value_Type_Helpers.check_binary_numeric_op self other <|
             self.make_binary_op '^' other
@@ -648,7 +648,7 @@ type Column
        `other` and each element of `self`.  If `other` is a column, the
        operation is performed pairwise between corresponding elements of `self`
        and `other`.
-    && : Column | Any -> Column
+    && : DB_Column | Any -> DB_Column
     && self other =
         Value_Type_Helpers.check_binary_boolean_op self other <|
             new_name = self.naming_helper.binary_operation_name "&&" self other
@@ -666,7 +666,7 @@ type Column
        `other` and each element of `self`.  If `other` is a column, the
        operation is performed pairwise between corresponding elements of `self`
        and `other`.
-    || : Column | Any -> Column
+    || : DB_Column | Any -> DB_Column
     || self other =
         Value_Type_Helpers.check_binary_boolean_op self other <|
             new_name = self.naming_helper.binary_operation_name "||" self other
@@ -675,7 +675,7 @@ type Column
     ## GROUP Standard.Base.Logical
        ICON operators
        Boolean negation of each element in this column.
-    not : Column
+    not : DB_Column
     not self =
         Value_Type.expect_boolean self <|
             new_name = self.naming_helper.concat ["not", self.naming_helper.to_expression_text self]
@@ -691,7 +691,7 @@ type Column
        Arguments:
        - when_true: value or column when `self` is `True`.
        - when_false: value or column when `self` is `False`.
-    iif : Any -> Any -> Column
+    iif : Any -> Any -> DB_Column
     iif self when_true when_false =
         Value_Type.expect_boolean self <|
             common_type = Value_Type_Helpers.find_common_type_for_arguments [when_true, when_false]
@@ -718,7 +718,7 @@ type Column
          Create a column of the value 42
 
          column.const 42
-    const : Any -> Column
+    const : Any -> DB_Column
     const self value = self.to_table.make_constant_column value
 
     ## GROUP Standard.Base.Math
@@ -760,7 +760,7 @@ type Column
              import Standard.Examples
 
              example_round = Examples.decimal_column.round 2
-    round : Integer -> Boolean -> Column | Illegal_Argument | Invalid_Value_Type
+    round : Integer -> Boolean -> DB_Column | Illegal_Argument | Invalid_Value_Type
     round self (decimal_places:Integer = 0) (use_bankers:Boolean = False) =
         Rounding_Helpers.check_decimal_places decimal_places <| Value_Type.expect_numeric self <|
             if self.should_use_builtin_round decimal_places use_bankers then self.round_builtin decimal_places else
@@ -791,7 +791,7 @@ type Column
 
     ## PRIVATE
        Round a float-like column using the backend's builtin ROUND function.
-    round_builtin : Integer -> Column
+    round_builtin : Integer -> DB_Column
     round_builtin self decimal_places =
         new_name = self.naming_helper.function_name "round" [self]
         case decimal_places == 0 of
@@ -802,7 +802,7 @@ type Column
 
     ## PRIVATE
        Round a float-like column.
-    round_float : Integer -> Boolean -> Column
+    round_float : Integer -> Boolean -> DB_Column
     round_float self decimal_places use_bankers =
         new_name = self.naming_helper.function_name "round" [self]
         scale = 10 ^ decimal_places
@@ -817,7 +817,7 @@ type Column
 
     ## PRIVATE
        Round a float-like column.
-    round_decimal : Integer -> Boolean -> Column
+    round_decimal : Integer -> Boolean -> DB_Column
     round_decimal self decimal_places use_bankers =
         # Construct a constant Decimal column.
         k x = self.const x . cast Value_Type.Decimal
@@ -834,7 +834,7 @@ type Column
 
     ## PRIVATE
        Round an integer column.
-    round_integer : Integer -> Boolean -> Column
+    round_integer : Integer -> Boolean -> DB_Column
     round_integer self decimal_places use_bankers =
         new_name = self.naming_helper.function_name "round" [self]
         scale = 10 ^ -decimal_places
@@ -872,7 +872,7 @@ type Column
              import Standard.Examples
 
              example_truncate = Examples.decimal_column.truncate
-    truncate : Column ! Invalid_Value_Type
+    truncate : DB_Column ! Invalid_Value_Type
     truncate self =
         new_name = self.naming_helper.function_name "truncate" [self]
         precise_value_type = self.inferred_precise_value_type
@@ -904,7 +904,7 @@ type Column
              import Standard.Examples
 
              example_ceil = Examples.decimal_column.ceil
-    ceil : Column ! Invalid_Value_Type
+    ceil : DB_Column ! Invalid_Value_Type
     ceil self =
         Value_Type.expect_numeric self <| self.short_circuit_special_floating_point <|
             new_name = self.naming_helper.function_name "ceil" [self]
@@ -924,7 +924,7 @@ type Column
              import Standard.Examples
 
              example_floor = Examples.decimal_column.floor
-    floor : Column ! Invalid_Value_Type
+    floor : DB_Column ! Invalid_Value_Type
     floor self =
         Value_Type.expect_numeric self <| self.short_circuit_special_floating_point <|
             new_name = self.naming_helper.function_name "floor" [self]
@@ -932,7 +932,7 @@ type Column
 
     ## PRIVATE
        `/` for decimals.
-    decimal_div : Column -> Column ! Invalid_Value_Type
+    decimal_div : DB_Column -> DB_Column ! Invalid_Value_Type
     decimal_div self other =
         Value_Type.expect_numeric self <| Value_Type.expect_numeric other <|
             new_name = self.naming_helper.function_name "decimal_div" [self, other]
@@ -940,7 +940,7 @@ type Column
 
     ## PRIVATE
        `mod` for decimals.
-    decimal_mod : Column -> Column ! Invalid_Value_Type
+    decimal_mod : DB_Column -> DB_Column ! Invalid_Value_Type
     decimal_mod self other =
         Value_Type.expect_numeric self <| Value_Type.expect_numeric other <|
             new_name = self.naming_helper.function_name "decimal_mod" [self, other]
@@ -960,7 +960,7 @@ type Column
              import Standard.Examples
 
              example_coalesce = Examples.decimal_column.coalesce Examples.integer_column
-    coalesce : (Any | Vector Any) -> Column
+    coalesce : (Any | Vector Any) -> DB_Column
     coalesce self values =
         vec = Vector.unify_vector_or_element values
         args_with_self = [self]+vec
@@ -984,7 +984,7 @@ type Column
              import Standard.Examples
 
              example_min = Examples.decimal_column.min Examples.integer_column
-    min : (Any | Vector Any) -> Column
+    min : (Any | Vector Any) -> DB_Column
     min self values =
         Value_Type_Helpers.check_multi_argument_comparable_op self values <|
             args = Vector.unify_vector_or_element values
@@ -1005,7 +1005,7 @@ type Column
              import Standard.Examples
 
              example_max = Examples.decimal_column.max Examples.integer_column
-    max : (Any | Vector Any) -> Column
+    max : (Any | Vector Any) -> DB_Column
     max self values =
         Value_Type_Helpers.check_multi_argument_comparable_op self values <|
             args = Vector.unify_vector_or_element values
@@ -1016,7 +1016,7 @@ type Column
        ICON preparation
        Returns a column of booleans, with `True` items at the positions where
        this column contains a `Nothing`.
-    is_nothing : Column
+    is_nothing : DB_Column
     is_nothing self =
         new_name = self.naming_helper.concat [self.naming_helper.to_expression_text self, "is Nothing"]
         self.make_unary_op "IS_NULL" new_name
@@ -1025,7 +1025,7 @@ type Column
        ICON math
        Returns a column of booleans, with `True` items at the positions where
        this column contains a NaN. This is only applicable to double columns.
-    is_nan : Column
+    is_nan : DB_Column
     is_nan self = Value_Type.expect_numeric self <|
         new_name = self.naming_helper.function_name "is_nan" [self]
         self.make_unary_op "IS_NAN" new_name
@@ -1035,7 +1035,7 @@ type Column
        Returns a column of booleans, with `True` items at the positions where
        this column contains a +Inf/-Inf. This is only applicable to double
        columns.
-    is_infinite : Column
+    is_infinite : DB_Column
     is_infinite self = Value_Type.expect_numeric self <|
         new_name = self.naming_helper.function_name "is_infinite" [self]
         self.make_unary_op "IS_INF" new_name
@@ -1043,7 +1043,7 @@ type Column
     ## PRIVATE
        Returns a column of booleans, with `True` items at the positions where
        this column contains an empty string or `Nothing`.
-    is_empty : Column
+    is_empty : DB_Column
     is_empty self = Value_Type.expect_text self <|
         new_name = self.naming_helper.concat [self.naming_helper.to_expression_text self, "is empty"]
         self.make_unary_op "IS_EMPTY" new_name
@@ -1059,7 +1059,7 @@ type Column
              import Standard.Examples
 
              example_is_present = Examples.decimal_column.is_present
-    is_present : Column
+    is_present : DB_Column
     is_present self =
         new_name = self.naming_helper.function_name "is_present" [self]
         self.is_nothing.not . rename new_name
@@ -1074,7 +1074,7 @@ type Column
 
        ? Blank values
          Blank values are `Nothing`, `""` and depending on setting `Number.nan`.
-    is_blank : Boolean -> Column
+    is_blank : Boolean -> DB_Column
     is_blank self treat_nans_as_blank=False =
         new_name = self.naming_helper.function_name "is_blank" [self]
         self_type = self.value_type
@@ -1108,7 +1108,7 @@ type Column
 
              example_fill_nothing = Examples.decimal_column.fill_nothing 20.5
     @default (self-> Widget_Helpers.make_fill_default_value_selector add_number=(self.value_type.is_numeric || self.value_type==Value_Type.Mixed) add_boolean=(self.value_type.is_boolean || self.value_type==Value_Type.Mixed) add_text=(self.value_type.is_text || self.value_type==Value_Type.Mixed))
-    fill_nothing : Column | Previous_Value | Any -> Column
+    fill_nothing : DB_Column | Previous_Value | Any -> DB_Column
     fill_nothing self default =
         if Previous_Value == default then Error.throw (Unsupported_Database_Operation.Error "The Previous_Value argument is currently not supported in the database backend.") else
             common_type = Value_Type_Helpers.find_common_type_for_arguments [self, default]
@@ -1137,7 +1137,7 @@ type Column
 
              example_fill_empty = Examples.text_column_1.fill_empty "hello"
     @default (Widget_Helpers.make_fill_default_value_selector add_text=True)
-    fill_empty : Column | Previous_Value | Any -> Column
+    fill_empty : DB_Column | Previous_Value | Any -> DB_Column
     fill_empty self default =
         if Previous_Value == default then Error.throw (Unsupported_Database_Operation.Error "The Previous_Value argument is currently not supported in the database backend.") else
             Value_Type.expect_text self <| Value_Type.expect_text default <|
@@ -1158,9 +1158,9 @@ type Column
              import Standard.Examples
 
              example_rename = Examples.integer_column.rename "My Numbers"
-    rename : Text -> Column ! Illegal_Argument
+    rename : Text -> DB_Column ! Illegal_Argument
     rename self name = self.naming_helper.ensure_name_is_valid name <|
-        Column.Value name self.connection self.sql_type_reference self.expression self.context
+        DB_Column.Value name self.connection self.sql_type_reference self.expression self.context
 
     ## ALIAS order_by
        GROUP Standard.Base.Selections
@@ -1181,7 +1181,7 @@ type Column
        > Example
          Sorting `column` in descending order.
              column.sort Sort_Direction.Descending
-    sort : Sort_Direction -> Column
+    sort : Sort_Direction -> DB_Column
     sort self order=Sort_Direction.Ascending =
         self.to_table.order_by [Sort_Column.Index 0 order] . at 0
 
@@ -1194,19 +1194,19 @@ type Column
        Arguments:
        - range: The selection of rows from the table to return.
     @range Index_Sub_Range.default_widget
-    take : (Index_Sub_Range | Range | Integer) -> Column
+    take : (Index_Sub_Range | Range | Integer) -> DB_Column
     take self range=(First 1) = self.to_table.take range . at 0
 
     ## ALIAS skip
        GROUP Standard.Base.Selections
        ICON select_row
-       Creates a new Column from the input with the specified range of rows
+       Creates a new column from the input with the specified range of rows
        removed.
 
        Arguments:
        - range: The selection of rows from the table to remove.
     @range Index_Sub_Range.default_widget
-    drop : (Index_Sub_Range | Range | Integer) -> Column
+    drop : (Index_Sub_Range | Range | Integer) -> DB_Column
     drop self range=(First 1) = self.to_table.drop range . at 0
 
     ## GROUP Standard.Base.Text
@@ -1222,7 +1222,7 @@ type Column
        corresponding elements of `self` and `other`.  If the argument is a
        missing value (a Nothing or a column with missing values), the behaviour
        on these missing values is vendor specific.
-    starts_with : Column | Text -> Case_Sensitivity -> Column
+    starts_with : DB_Column | Text -> Case_Sensitivity -> DB_Column
     starts_with self other case_sensitivity=Case_Sensitivity.Default =
         new_name = self.naming_helper.function_name "starts_with" [self, other]
         make_text_case_op self "starts_with" other case_sensitivity new_name
@@ -1240,7 +1240,7 @@ type Column
        corresponding elements of `self` and `other`.  If the argument is a
        missing value (a Nothing or a column with missing values), the behaviour
        on these missing values is vendor specific.
-    ends_with : Column | Text -> Case_Sensitivity -> Column
+    ends_with : DB_Column | Text -> Case_Sensitivity -> DB_Column
     ends_with self other case_sensitivity=Case_Sensitivity.Default =
         new_name = self.naming_helper.function_name "ends_with" [self, other]
         make_text_case_op self "ends_with" other case_sensitivity new_name
@@ -1259,7 +1259,7 @@ type Column
 
              example_text_length =
                 Examples.text_column_1.text_length
-    text_length : Column
+    text_length : DB_Column
     text_length self =
         Value_Type.expect_text self <|
             new_name = self.naming_helper.function_name "text_length" [self]
@@ -1279,7 +1279,7 @@ type Column
 
              example_text_length =
                 Examples.text_column_1.text_left 5
-    text_left : Column|Integer -> Column
+    text_left : DB_Column|Integer -> DB_Column
     text_left self n =
         Value_Type.expect_text self <| Value_Type.expect_integer n <|
             n2 = n.max 0
@@ -1300,7 +1300,7 @@ type Column
 
              example_text_length =
                 Examples.text_column_1.text_right 5
-    text_right : Column|Integer -> Column
+    text_right : DB_Column|Integer -> DB_Column
     text_right self n =
         Value_Type.expect_text self <| Value_Type.expect_integer n <|
             n2 = n.max 0
@@ -1320,7 +1320,7 @@ type Column
        corresponding elements of `self` and `other`.  If the argument is a
        missing value (a Nothing or a column with missing values), the behaviour
        on these missing values is vendor specific.
-    contains : Column | Text -> Case_Sensitivity -> Column
+    contains : DB_Column | Text -> Case_Sensitivity -> DB_Column
     contains self other case_sensitivity=Case_Sensitivity.Default =
         new_name = self.naming_helper.function_name "contains" [self, other]
         make_text_case_op self "contains" other case_sensitivity new_name
@@ -1342,7 +1342,7 @@ type Column
              import Standard.Examples
 
              example_contains = Examples.text_column_1.like "F%."
-    like : Column | Text -> Column
+    like : DB_Column | Text -> DB_Column
     like self pattern =
         Value_Type.expect_text self <|
             Value_Type.expect_text pattern <|
@@ -1357,9 +1357,9 @@ type Column
        Arguments:
        - where: The location of where to trim the input. By default, this
          function trims both ends of the input.
-       - what: A `Text` (or text `Column`) containing characters that should be
+       - what: A `Text` (or text `DB_Column`) containing characters that should be
          removed. By default, spaces, tabs, returns and new lines are removed.
-    trim : Location -> Column | Text -> Column
+    trim : Location -> DB_Column | Text -> DB_Column
     trim self where=Location.Both what='' =
         Value_Type.expect_text self <|
             Value_Type.expect_text what <|
@@ -1369,7 +1369,7 @@ type Column
                     Location.Start -> "LTRIM"
                     Location.End -> "RTRIM"
                 if self.connection.dialect.is_supported operator then self.make_binary_op operator what new_name else
-                    Error.throw (Unsupported_Database_Operation.Error ("`Column.trim "+where.to_text+"` is not supported by this connection."))
+                    Error.throw (Unsupported_Database_Operation.Error ("`DB_Column.trim "+where.to_text+"` is not supported by this connection."))
 
     ## GROUP Standard.Base.Text
        ICON dataframe_map_column
@@ -1435,7 +1435,7 @@ type Column
 
              column.text_replace '"(.*?)"'.to_regex '($1)'
     @term make_regex_text_widget
-    text_replace : Text | Regex | Column -> Text | Column -> Case_Sensitivity -> Boolean -> Column ! Unsupported_Database_Operation
+    text_replace : Text | Regex | DB_Column -> Text | DB_Column -> Case_Sensitivity -> Boolean -> DB_Column ! Unsupported_Database_Operation
     text_replace self term="" new_text="" case_sensitivity=Case_Sensitivity.Default only_first=False =
         Value_Type.expect_text self <| case_sensitivity.disallow_non_default_locale <|
             input_type = Meta.type_of term
@@ -1453,7 +1453,7 @@ type Column
 
        Applies only to columns that hold the `Date` or `Date_Time` types.
        Returns a column of `Integer` type.
-    year : Column ! Invalid_Value_Type
+    year : DB_Column ! Invalid_Value_Type
     year self = Value_Type.expect_has_date self <|
         simple_unary_op self "year"
 
@@ -1463,7 +1463,7 @@ type Column
 
        Applies only to columns that hold the `Date` or `Date_Time` types.
        Returns a column of `Integer` type.
-    month : Column ! Invalid_Value_Type
+    month : DB_Column ! Invalid_Value_Type
     month self = Value_Type.expect_has_date self <|
         simple_unary_op self "month"
 
@@ -1474,7 +1474,7 @@ type Column
 
        Applies only to columns that hold the `Date` or `Date_Time` types.
        Returns a column of `Integer` type.
-    day : Column ! Invalid_Value_Type
+    day : DB_Column ! Invalid_Value_Type
     day self = Value_Type.expect_has_date self <|
         simple_unary_op self "day"
 
@@ -1484,7 +1484,7 @@ type Column
 
        Applies only to columns that hold the `Time_Of_Day` or `Date_Time` types.
        Returns a column of `Integer` type.
-    hour : Column ! Invalid_Value_Type
+    hour : DB_Column ! Invalid_Value_Type
     hour self = Value_Type.expect_has_time self <|
         simple_unary_op self "hour"
 
@@ -1494,7 +1494,7 @@ type Column
 
        Applies only to columns that hold the `Time_Of_Day` or `Date_Time` types.
        Returns a column of `Integer` type.
-    minute : Column ! Invalid_Value_Type
+    minute : DB_Column ! Invalid_Value_Type
     minute self = Value_Type.expect_has_time self <|
         simple_unary_op self "minute"
 
@@ -1504,7 +1504,7 @@ type Column
 
        Applies only to columns that hold the `Time_Of_Day` or `Date_Time` types.
        Returns a column of `Integer` type.
-    second : Column ! Invalid_Value_Type
+    second : DB_Column ! Invalid_Value_Type
     second self = Value_Type.expect_has_time self <|
         simple_unary_op self "second"
 
@@ -1514,7 +1514,7 @@ type Column
 
        Returns a column of `Integer` type.
     @period Date_Time_Helpers.make_period_selector_for_column
-    date_part : Date_Period | Time_Period -> Column ! Invalid_Value_Type | Illegal_Argument
+    date_part : Date_Period | Time_Period -> DB_Column ! Invalid_Value_Type | Illegal_Argument
     date_part self period =
         Date_Time_Helpers.make_date_part_function self period simple_unary_op self.naming_helper
 
@@ -1543,7 +1543,7 @@ type Column
          differences in time calculations between backends, especially around
          unusual events like DST.
     @period Date_Time_Helpers.make_period_selector_for_column
-    date_diff : (Column | Date | Date_Time | Time_Of_Day) -> Date_Period | Time_Period -> Column ! Invalid_Value_Type | Illegal_Argument
+    date_diff : (DB_Column | Date | Date_Time | Time_Of_Day) -> Date_Period | Time_Period -> DB_Column ! Invalid_Value_Type | Illegal_Argument
     date_diff self end (period : Date_Period | Time_Period) =
         Value_Type.expect_type self .is_date_or_time "date/time" <|
             my_type = self.inferred_precise_value_type
@@ -1573,7 +1573,7 @@ type Column
          differences in time calculations between backends, especially around
          unusual events like DST.
     @period Date_Time_Helpers.make_period_selector_for_column
-    date_add : (Column | Integer) -> Date_Period | Time_Period -> Column ! Invalid_Value_Type | Illegal_Argument
+    date_add : (DB_Column | Integer) -> Date_Period | Time_Period -> DB_Column ! Invalid_Value_Type | Illegal_Argument
     date_add self amount (period : Date_Period | Time_Period = default_date_period self) =
         Value_Type.expect_type self .is_date_or_time "date/time" <|
             my_type = self.inferred_precise_value_type
@@ -1599,7 +1599,7 @@ type Column
              import Standard.Examples
 
              example_contains = Examples.text_column_1.is_in [1, 2, 5]
-    is_in : Column | Vector -> Column
+    is_in : DB_Column | Vector -> DB_Column
     is_in self vector =
         new_name = self.naming_helper.binary_operation_name "in" self vector
         case vector of
@@ -1618,14 +1618,14 @@ type Column
                 result = self.make_op "IS_IN" operands=vector new_name=new_name
                 result.rename new_name
             _ : Array -> self.is_in (Vector.from_polyglot_array vector)
-            column : Column -> if Helpers.check_connection self column . not then (Error.throw (Integrity_Error.Error "Column "+column.name)) else
+            column : DB_Column -> if Helpers.check_connection self column . not then (Error.throw (Integrity_Error.Error "DB_Column "+column.name)) else
                 in_subquery = Query.Select [Pair.new column.name column.expression] column.context
                 new_expr = SQL_Expression.Operation "IS_IN_COLUMN" [self.expression, in_subquery]
                 # This mapping should never be imprecise, if there are errors we need to amend the implementation.
                 sql_type = self.connection.dialect.get_type_mapping.value_type_to_sql Value_Type.Boolean Problem_Behavior.Report_Error
                 new_type_ref = SQL_Type_Reference.from_constant sql_type . catch Inexact_Type_Coercion _->
                     Error.throw (Illegal_State.Error "The dialect "+self.connection.dialect.name+" does not support a boolean type. The implementation of `is_in` should be revised to account for this. This is an internal issue with the Database library.")
-                Column.Value new_name self.connection new_type_ref new_expr self.context
+                DB_Column.Value new_name self.connection new_type_ref new_expr self.context
 
     ## GROUP Standard.Base.Conversions
        ICON convert
@@ -1665,7 +1665,7 @@ type Column
            does not support customization, an `Unsupported_Database_Operation`
            error is reported.
     @type (Widget_Helpers.parse_type_selector include_auto=False)
-    parse : Value_Type | Auto -> Text | Data_Formatter | Nothing -> Problem_Behavior -> Column
+    parse : Value_Type | Auto -> Text | Data_Formatter | Nothing -> Problem_Behavior -> DB_Column
     parse self type format=Nothing on_problems=Report_Warning =
         check_parameters =
             if type == Auto then Error.throw (Unsupported_Database_Operation.Error "The `Auto` parse type is not supported by the Database backend. Either pick a specific type or materialize the table to memory using `.read`.") else
@@ -1683,10 +1683,10 @@ type Column
        ICON convert
        Formatting values is not supported in database columns.
     @locale Locale.default_widget
-    format : Text | Date_Time_Formatter | Column | Nothing -> Locale -> Column ! Illegal_Argument
-    format self format:(Text | Date_Time_Formatter | Column | Nothing)=Nothing locale=Locale.default =
+    format : Text | Date_Time_Formatter | DB_Column | Nothing -> Locale -> DB_Column ! Illegal_Argument
+    format self format:(Text | Date_Time_Formatter | DB_Column | Nothing)=Nothing locale=Locale.default =
         _ = [format, locale]
-        Error.throw <| Unsupported_Database_Operation.Error "`Column.format` is not implemented yet for the Database backends."
+        Error.throw <| Unsupported_Database_Operation.Error "`DB_Column.format` is not implemented yet for the Database backends."
 
     ## GROUP Standard.Base.Conversions
        ICON convert
@@ -1736,7 +1736,7 @@ type Column
          The `parse` method should be used to convert text values into other
          types. Due to this, a Mixed column containing values `[2, "3"]` will
          actually be converted into `[2, Nothing]` when casting to Integer type.
-    cast : Value_Type -> Problem_Behavior -> Column ! Illegal_Argument | Inexact_Type_Coercion | Conversion_Failure
+    cast : Value_Type -> Problem_Behavior -> DB_Column ! Illegal_Argument | Inexact_Type_Coercion | Conversion_Failure
     cast self value_type on_problems=Problem_Behavior.Report_Warning =
         check_cast_compatibility self.value_type value_type <|
             self.internal_do_cast value_type on_problems
@@ -1747,14 +1747,14 @@ type Column
        contents.
 
        This operation is currently not available in the Database backend.
-    auto_value_type : Boolean -> Column
+    auto_value_type : Boolean -> DB_Column
     auto_value_type self shrink_types=False =
         _ = shrink_types
-        Error.throw <| Unsupported_Database_Operation.Error "`Column.auto_value_type` is not supported in the Database backends."
+        Error.throw <| Unsupported_Database_Operation.Error "`DB_Column.auto_value_type` is not supported in the Database backends."
 
     ## PRIVATE
        Shares the core CAST logic between `cast` and `parse`.
-    internal_do_cast : Value_Type -> Problem_Behavior -> Column
+    internal_do_cast : Value_Type -> Problem_Behavior -> DB_Column
     internal_do_cast self value_type on_problems =
         dialect = self.connection.dialect
         type_mapping = dialect.get_type_mapping
@@ -1763,7 +1763,7 @@ type Column
             infer_from_database new_expression =
                 SQL_Type_Reference.new self.connection self.context new_expression
             new_column = dialect.make_cast self.as_internal target_sql_type infer_from_database
-            Column.Value new_column.name self.connection new_column.sql_type_reference new_column.expression self.context
+            DB_Column.Value new_column.name self.connection new_column.sql_type_reference new_column.expression self.context
 
     ## ALIAS transform column
        ICON dataframe_map_column
@@ -1794,10 +1794,10 @@ type Column
              import Standard.Examples
 
              example_map = Examples.integer_column.map (x -> x * x)
-    map : (Any -> Any) -> Boolean -> Value_Type | Auto -> Column ! Invalid_Value_Type
+    map : (Any -> Any) -> Boolean -> Value_Type | Auto -> DB_Column ! Invalid_Value_Type
     map self function skip_nothing=True expected_value_type=Auto =
         _ = [function, skip_nothing, expected_value_type]
-        Error.throw <| Unsupported_Database_Operation.Error "`Column.map` is not supported in the Database backends."
+        Error.throw <| Unsupported_Database_Operation.Error "`DB_Column.map` is not supported in the Database backends."
 
     ## ALIAS combine, join by row position, merge
        ICON dataframes_join
@@ -1834,10 +1834,10 @@ type Column
 
              example_zip =
                 Examples.integer_column.zip Examples.text_column_1 [_, _]
-    zip : Column -> (Any -> Any -> Any) -> Boolean -> Value_Type | Auto -> Column ! Invalid_Value_Type
-    zip self that:Column function skip_nothing=True expected_value_type=Auto =
+    zip : DB_Column -> (Any -> Any -> Any) -> Boolean -> Value_Type | Auto -> DB_Column ! Invalid_Value_Type
+    zip self that:DB_Column function skip_nothing=True expected_value_type=Auto =
         _ = [that, function, skip_nothing, expected_value_type]
-        Error.throw <| Unsupported_Database_Operation.Error "`Column.zip` is not supported in the Database backends."
+        Error.throw <| Unsupported_Database_Operation.Error "`DB_Column.zip` is not supported in the Database backends."
 
     ## PRIVATE
     as_internal : Internal_Column
@@ -1865,7 +1865,7 @@ type Column
        If the column is NaN/Inf, return it immediately as the value; otherwise
        return the expression. If returning immediately, rename to the expression's
        name. If the column is not floating point, just return the expression.
-    short_circuit_special_floating_point : Column -> Column
+    short_circuit_special_floating_point : DB_Column -> DB_Column
     short_circuit_special_floating_point self exp =
         self_is_nan = if self.connection.dialect.supports_separate_nan then self.is_nan else self.is_nothing
         if self.value_type.is_floating_point.not then exp else
@@ -1878,26 +1878,26 @@ make_text_case_op left op other case_sensitivity new_name =
         Case_Sensitivity.Sensitive ->
             make_sensitive column =
                 column.make_unary_op "MAKE_CASE_SENSITIVE" "MAKE_CASE_SENSITIVE"
-            cs_other = if other.is_a Column then make_sensitive other else other
+            cs_other = if other.is_a DB_Column then make_sensitive other else other
             (make_sensitive left) . make_binary_op op cs_other
         Case_Sensitivity.Insensitive locale -> Helpers.assume_default_locale locale <|
             fold_case column =
                 column.make_unary_op "FOLD_CASE" "FOLD_CASE"
-            ci_other = if other.is_a Column then fold_case other else other.to_case Case.Lower
+            ci_other = if other.is_a DB_Column then fold_case other else other.to_case Case.Lower
             (fold_case left) . make_binary_op op ci_other
     result.rename new_name
 
 ## PRIVATE
 make_equality_check_with_floating_point_handling column other op =
     other_name = case other of
-        other_column : Column -> "["+other_column.name+"]"
+        other_column : DB_Column -> "["+other_column.name+"]"
         _ -> other.to_text
     location = "["+column.name+"] "+op+" "+other_name
     Java_Problems.with_map_operation_problem_aggregator location Problem_Behavior.Report_Warning problem_builder->
         if column.value_type.is_floating_point then
             problem_builder.reportFloatingPointEquality -1
         case other of
-            other_column : Column ->
+            other_column : DB_Column ->
                 if other_column.value_type.is_floating_point then
                     problem_builder.reportFloatingPointEquality -1
             _ : Float ->
@@ -1906,13 +1906,13 @@ make_equality_check_with_floating_point_handling column other op =
         column.make_binary_op op other
 
 ## PRIVATE
-adapt_unified_column : Column -> Value_Type -> Column
+adapt_unified_column : DB_Column -> Value_Type -> DB_Column
 adapt_unified_column column expected_type =
     dialect = column.connection.dialect
     infer_return_type expression =
         SQL_Type_Reference.new column.connection column.context expression
     adapted = dialect.adapt_unified_column column.as_internal expected_type infer_return_type
-    Column.Value name=column.name connection=column.connection sql_type_reference=adapted.sql_type_reference expression=adapted.expression context=column.context
+    DB_Column.Value name=column.name connection=column.connection sql_type_reference=adapted.sql_type_reference expression=adapted.expression context=column.context
 
 ## PRIVATE
    A shorthand to be able to share the implementations between in-memory and
@@ -1920,12 +1920,12 @@ adapt_unified_column column expected_type =
 simple_unary_op column op_kind = column.make_unary_op op_kind
 
 ## PRIVATE
-Materialized_Column.from (that:Column) =
+Materialized_Column.from (that:DB_Column) =
     _ = [that]
     Error.throw (Illegal_Argument.Error "Currently cross-backend operations are not supported. Materialize the column using `.read` before mixing it with an in-memory Table.")
 
 ## PRIVATE
    Conversion method to a Column to a Vector.
-Vector.from (that:Column) =
+Vector.from (that:DB_Column) =
     _ = [that]
     Error.throw (Illegal_Argument.Error "To convert from a Database column to a vector you must first call `read` on the column.")
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso
index b7b5ef533b3c..ff296b5608d4 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso
@@ -5,7 +5,7 @@ import Standard.Table.Internal.Problem_Builder.Problem_Builder
 from Standard.Table import Aggregate_Column, Join_Kind, Value_Type
 
 import project.Connection.Connection.Connection
-import project.Data.Column.Column
+import project.Data.DB_Column.DB_Column
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
 import project.Data.Table.Table
@@ -237,7 +237,7 @@ type Dialect
 
        This will usually just be `column.value_type`, but it allows the database
        to do custom fallback handling for datatypes that are not supported.
-    value_type_for_upload_of_existing_column : Column -> Value_Type
+    value_type_for_upload_of_existing_column : DB_Column -> Value_Type
     value_type_for_upload_of_existing_column self column =
         _ = column
         Unimplemented.throw "This is an interface only."
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 6c7f0d76eb77..da56ef37615b 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
 
-import project.Data.Column.Column
-
 polyglot java import java.sql.ResultSetMetaData
 polyglot java import java.sql.Types
 
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 100f05bc7a40..2ef74dc54482 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
@@ -47,7 +47,7 @@ from Standard.Table.Errors import all
 from Standard.Table.Internal.Filter_Condition_Helpers import make_filter_column
 
 import project.Connection.Connection.Connection
-import project.Data.Column.Column
+import project.Data.DB_Column.DB_Column
 import project.Data.SQL_Query.SQL_Query
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
@@ -124,7 +124,7 @@ type Table
        Arguments:
        - selector: The name or index of the column to get.
     @selector Widget_Helpers.make_column_name_selector
-    at : Text | Integer -> Column ! No_Such_Column | Index_Out_Of_Bounds
+    at : Text | Integer -> DB_Column ! No_Such_Column | Index_Out_Of_Bounds
     at self selector=0 = case selector of
         _ : Integer -> self.make_column (self.internal_columns.at selector)
         _ -> self.get selector (Error.throw (No_Such_Column.Error selector))
@@ -136,7 +136,7 @@ type Table
        - selector: The name or index of the column being looked up.
        - if_missing: The value to use if the selector isn't present.
     @selector Widget_Helpers.make_column_name_selector
-    get : Text | Integer -> Any -> Column | Any
+    get : Text | Integer -> Any -> DB_Column | Any
     get self selector=0 ~if_missing=Nothing =
         internal_column = case selector of
             _ : Integer -> self.internal_columns.get selector if_missing=Nothing
@@ -147,19 +147,19 @@ type Table
     ## GROUP Standard.Base.Selections
        ICON select_column
        Gets the first column.
-    first_column : Column ! Index_Out_Of_Bounds
+    first_column : DB_Column ! Index_Out_Of_Bounds
     first_column self = self.at 0
 
     ## GROUP Standard.Base.Selections
        ICON select_column
        Gets the second column
-    second_column : Column ! Index_Out_Of_Bounds
+    second_column : DB_Column ! Index_Out_Of_Bounds
     second_column self = self.at 1
 
     ## GROUP Standard.Base.Selections
        ICON select_column
        Gets the last column
-    last_column : Column ! Index_Out_Of_Bounds
+    last_column : DB_Column ! Index_Out_Of_Bounds
     last_column self = self.at -1
 
     ## GROUP Standard.Base.Metadata
@@ -516,12 +516,12 @@ type Table
 
        If instead of a name, a column is provided, it is returned as-is as long
        as it comes from the same context.
-    resolve : Text | Column -> Column
+    resolve : Text | DB_Column -> DB_Column
     resolve self column = case column of
         _ : Text -> Panic.rethrow (self.at column)
         _ ->
             if Helpers.check_integrity self column then column else
-                Panic.throw (Integrity_Error.Error "Column "+column.name)
+                Panic.throw (Integrity_Error.Error "DB_Column "+column.name)
 
     ## ALIAS filter rows, where
        GROUP Standard.Base.Selections
@@ -574,12 +574,12 @@ type Table
              people.filter "age" (age -> (age%10 == 0))
     @column Widget_Helpers.make_column_name_selector
     @filter Widget_Helpers.make_filter_condition_selector
-    filter : (Column | Text | Integer) -> (Filter_Condition | (Any -> Boolean)) -> Problem_Behavior -> Table ! No_Such_Column | Index_Out_Of_Bounds | Invalid_Value_Type
+    filter : (DB_Column | Text | Integer) -> (Filter_Condition | (Any -> Boolean)) -> Problem_Behavior -> Table ! No_Such_Column | Index_Out_Of_Bounds | Invalid_Value_Type
     filter self column (filter : Filter_Condition | (Any -> Boolean) = Filter_Condition.Equal True) on_problems=Report_Warning = case column of
-       _ : Column ->
+       _ : DB_Column ->
            mask filter_column = case Helpers.check_integrity self filter_column of
                False ->
-                   Error.throw (Integrity_Error.Error "Column "+filter_column.name)
+                   Error.throw (Integrity_Error.Error "DB_Column "+filter_column.name)
                True ->
                    new_filters = self.context.where_filters + [filter_column.expression]
                    new_ctx = self.context.set_where_filters new_filters
@@ -858,7 +858,7 @@ type Table
                  table.set double_inventory new_name="total_stock"
                  table.set "2 * [total_stock]" new_name="total_stock_expr"
     @new_name Widget_Helpers.make_column_name_selector
-    set : Column | Text | Array | Vector | Range | Date_Range | Constant_Column | Column_Operation -> Text -> Set_Mode -> Problem_Behavior -> Table ! Existing_Column | Missing_Column | No_Such_Column | Expression_Error
+    set : DB_Column | Text | Array | Vector | Range | Date_Range | Constant_Column | Column_Operation -> Text -> Set_Mode -> Problem_Behavior -> Table ! Existing_Column | Missing_Column | No_Such_Column | Expression_Error
     set self column (new_name : Text = "") (set_mode : Set_Mode = Set_Mode.Add_Or_Update) (on_problems : Problem_Behavior = Report_Warning) =
         problem_builder = Problem_Builder.new
         unique = self.column_naming_helper.create_unique_name_strategy
@@ -866,7 +866,7 @@ type Table
 
         resolved = case column of
             _ : Text -> self.evaluate_expression column on_problems
-            _ : Column ->
+            _ : DB_Column ->
                 if Helpers.check_integrity self column then column else
                     Error.throw (Integrity_Error.Error "Column "+column.name)
             _ : Constant_Column -> self.make_constant_column column
@@ -878,11 +878,11 @@ type Table
             _ -> Error.throw (Illegal_Argument.Error "Unsupported type for `Table.set`.")
 
         ## If `new_name` was specified, use that. Otherwise, if `column` is a
-           `Column`, use its name. In these two cases, do not make it unique.
+           `DB_Column`, use its name. In these two cases, do not make it unique.
            Otherwise, make it unique. If set_mode is Update, however, do not
            make it unique.
         new_column_name = if new_name != "" then new_name else
-            if column.is_a Column || set_mode==Set_Mode.Update || set_mode==Set_Mode.Add_Or_Update then resolved.name else unique.make_unique resolved.name
+            if column.is_a DB_Column || set_mode==Set_Mode.Update || set_mode==Set_Mode.Add_Or_Update then resolved.name else unique.make_unique resolved.name
         renamed = resolved.rename new_column_name
         renamed.if_not_error <| self.column_naming_helper.check_ambiguity self.column_names renamed.name <|
             index = self.internal_columns.index_of (c -> c.name == renamed.name)
@@ -921,10 +921,10 @@ type Table
              an `Arithmetic_Error`.
            - If more than 10 rows encounter computation issues,
              an `Additional_Warnings`.
-    evaluate_expression : Text -> Problem_Behavior -> Column ! No_Such_Column | Invalid_Value_Type | Expression_Error
+    evaluate_expression : Text -> Problem_Behavior -> DB_Column ! No_Such_Column | Invalid_Value_Type | Expression_Error
     evaluate_expression self expression on_problems=Report_Warning =
         get_column name = self.at name
-        new_column = Expression.evaluate expression get_column self.make_constant_column "Standard.Database.Data.Column" "Column" Column.var_args_functions
+        new_column = Expression.evaluate expression get_column self.make_constant_column "Standard.Database.Data.DB_Column" "DB_Column" DB_Column.var_args_functions
         problems = Warning.get_all new_column . map .value
         result = new_column.rename (self.connection.base_connection.column_naming_helper.sanitize_name expression)
         on_problems.attach_problems_before problems <|
@@ -933,9 +933,9 @@ type Table
     ## PRIVATE
 
        Create a constant column from a value.
-    make_constant_column : Any -> Column ! Illegal_Argument
+    make_constant_column : Any -> DB_Column ! Illegal_Argument
     make_constant_column self value =
-        if Table_Helpers.is_column value then Error.throw (Illegal_Argument.Error "A constant value may only be created from a scalar, not a Column") else
+        if Table_Helpers.is_column value then Error.throw (Illegal_Argument.Error "A constant value may only be created from a scalar, not a DB_Column") else
             type_mapping = self.connection.dialect.get_type_mapping
             argument_value_type = Value_Type_Helpers.find_argument_type value
             sql_type = case argument_value_type of
@@ -943,7 +943,7 @@ type Table
                 _ -> type_mapping.value_type_to_sql argument_value_type Problem_Behavior.Ignore
             expr = SQL_Expression.Constant value
             new_type_ref = SQL_Type_Reference.from_constant sql_type
-            Column.Value value.pretty self.connection new_type_ref expr self.context
+            DB_Column.Value value.pretty self.connection new_type_ref expr self.context
 
     ## PRIVATE
        Create a unique temporary column name.
@@ -952,8 +952,8 @@ type Table
 
     ## PRIVATE
        Run a table transformer with a temporary column added.
-    with_temporary_column :  Column -> (Text -> Table -> Table) -> Table
-    with_temporary_column self new_column:Column f:(Text -> Table -> Table) =
+    with_temporary_column :  DB_Column -> (Text -> Table -> Table) -> Table
+    with_temporary_column self new_column:DB_Column f:(Text -> Table -> Table) =
         new_column_name = self.make_temp_column_name
         with_new_column = self.set new_column new_column_name set_mode=Set_Mode.Add
         modified_table = f new_column_name with_new_column
@@ -962,13 +962,13 @@ type Table
     ## PRIVATE
        Filter a table on a boolean column. The column does not have to be part
        of the table, but it must be derived from it and share a context.
-    filter_on_predicate_column : Column -> Table
+    filter_on_predicate_column : DB_Column -> Table
     filter_on_predicate_column self predicate_column =
         self.with_temporary_column predicate_column name-> table->
             table.filter name Filter_Condition.Is_True
 
     ## Returns the vector of columns contained in this table.
-    columns : Vector Column
+    columns : Vector DB_Column
     columns self = Vector.from_polyglot_array <|
         Array_Proxy.new self.internal_columns.length i->
             self.make_column (self.internal_columns.at i)
@@ -2026,8 +2026,8 @@ type Table
 
     ## GROUP Standard.Base.Conversions
        ICON convert
-       Formats `Column`s within a `Table` using a format string,
-       `Date_Time_Formatter`, or `Column` of format strings.
+       Formats `DB_Column`s within a `Table` using a format string,
+       `Date_Time_Formatter`, or `DB_Column` of format strings.
 
        Arguments:
        - columns: The columns to format. The columns can have different types,
@@ -2035,7 +2035,7 @@ type Table
        - format: The type-dependent format string to use to format the values.
          If `format` is `""` or `Nothing`, .to_text is used to format the value.
          In case of date/time columns, the format can also be a
-         `Date_Time_Formatter`. If `format` is a `Column`, it must be a text
+         `Date_Time_Formatter`. If `format` is a `DB_Column`, it must be a text
          column.
        - locale: The locale in which the format should be interpreted.
          If a `Date_Time_Formatter` is provided for `format` and the `locale` is
@@ -2099,8 +2099,8 @@ type Table
              table.format
     @columns Widget_Helpers.make_column_name_vector_selector
     @locale Locale.default_widget
-    format : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Text | Date_Time_Formatter | Column | Nothing -> Locale -> Boolean -> Problem_Behavior -> Table ! Date_Time_Format_Parse_Error | Illegal_Argument
-    format self columns format:(Text | Date_Time_Formatter | Column | Nothing)=Nothing locale=Locale.default error_on_missing_columns=True on_problems=Report_Warning =
+    format : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Text | Date_Time_Formatter | DB_Column | Nothing -> Locale -> Boolean -> Problem_Behavior -> Table ! Date_Time_Format_Parse_Error | Illegal_Argument
+    format self columns format:(Text | Date_Time_Formatter | DB_Column | Nothing)=Nothing locale=Locale.default error_on_missing_columns=True on_problems=Report_Warning =
         _ = [columns, format, locale, error_on_missing_columns, on_problems]
         Error.throw (Unsupported_Database_Operation.Error "Table.format is not implemented yet for the Database backends.")
 
@@ -2470,9 +2470,9 @@ type Table
 
        Arguments:
        - internal: The internal column to use for creating a column.
-    make_column : Internal_Column -> Column
+    make_column : Internal_Column -> DB_Column
     make_column self internal =
-        Column.Value internal.name self.connection internal.sql_type_reference internal.expression self.context
+        DB_Column.Value internal.name self.connection internal.sql_type_reference internal.expression self.context
 
     ## PRIVATE
     columns_helper : Table_Column_Helper
@@ -2644,7 +2644,7 @@ type Table
              fill_nothing = table.fill_nothing ["col0", "col1"] 20.5
     @columns Widget_Helpers.make_column_name_vector_selector
     @default (self -> Widget_Helpers.make_fill_default_value_selector column_source=self add_text=True add_number=True add_boolean=True)
-    fill_nothing : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Column | Column_Ref | Previous_Value | Any -> Table
+    fill_nothing : Vector (Integer | Text | Regex) | Text | Integer | Regex -> DB_Column | Column_Ref | Previous_Value | Any -> Table
     fill_nothing self (columns : Vector | Text | Integer | Regex) default =
         resolved_default = (self:Table_Ref).resolve default
         transformer col = col.fill_nothing resolved_default
@@ -2672,7 +2672,7 @@ type Table
              fill_empty = table.fill_empty ["col0", "col1"] "hello"
     @columns Widget_Helpers.make_column_name_vector_selector
     @default (self -> Widget_Helpers.make_fill_default_value_selector column_source=self add_text=True)
-    fill_empty : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Column | Column_Ref | Previous_Value | Any -> Table
+    fill_empty : Vector (Integer | Text | Regex) | Text | Integer | Regex -> DB_Column | Column_Ref | Previous_Value | Any -> Table
     fill_empty self (columns : Vector | Text | Integer | Regex) default =
         resolved_default = (self:Table_Ref).resolve default
         transformer col = col.fill_empty resolved_default
@@ -2713,8 +2713,8 @@ type Table
     @columns Widget_Helpers.make_column_name_vector_selector
     @term (Widget_Helpers.make_column_ref_by_name_selector add_regex=True add_text=True)
     @new_text (Widget_Helpers.make_column_ref_by_name_selector add_text=True)
-    text_replace : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Text | Column | Column_Ref | Regex -> Text | Column | Column_Ref -> Case_Sensitivity -> Boolean -> Column
-    text_replace self columns (term : Text | Column | Column_Ref | Regex = "") (new_text : Text | Column | Column_Ref = "") case_sensitivity=Case_Sensitivity.Sensitive only_first=False =
+    text_replace : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Text | DB_Column | Column_Ref | Regex -> Text | DB_Column | Column_Ref -> Case_Sensitivity -> Boolean -> DB_Column
+    text_replace self columns (term : Text | DB_Column | Column_Ref | Regex = "") (new_text : Text | DB_Column | Column_Ref = "") case_sensitivity=Case_Sensitivity.Sensitive only_first=False =
         table_ref = Table_Ref.from self
         resolved_term = table_ref.resolve term
         resolved_new_text = table_ref.resolve new_text
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Take_Drop_Helpers.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Take_Drop_Helpers.enso
index c53ea035a95f..ed56d1e108ea 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Take_Drop_Helpers.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Take_Drop_Helpers.enso
@@ -8,7 +8,6 @@ from Standard.Base.Data.Index_Sub_Range import normalize_ranges, resolve_ranges,
 
 from Standard.Table import Set_Mode
 
-import project.Data.Column.Column
 import project.Data.Table.Table
 from project.Errors import Unsupported_Database_Operation
 
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Helpers.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Helpers.enso
index 4c894621f25c..a1e3e019a79b 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Helpers.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Helpers.enso
@@ -2,7 +2,7 @@ from Standard.Base import all
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 from Standard.Base.Runtime import assert
 
-import project.Data.Column.Column
+import project.Data.DB_Column.DB_Column
 import project.Data.Table.Table
 import project.Internal.IR.Internal_Column.Internal_Column
 from project.Errors import Unsupported_Database_Operation
@@ -20,7 +20,7 @@ polyglot java import java.util.regex.Pattern
 
    To combine different objects they need to satisfy this requirement, otherwise
    the combination would be ill-formed.
-check_integrity : (Table | Column) -> (Table | Column) -> Boolean
+check_integrity : (Table | DB_Column) -> (Table | DB_Column) -> Boolean
 check_integrity entity1 entity2 =
     ctx = entity1.context == entity2.context
     ctx && (check_connection entity1 entity2)
@@ -32,7 +32,7 @@ check_integrity entity1 entity2 =
    Arguments:
    - entity1: The entity to check against the second.
    - entity2: The entity to check against the first.
-check_connection : (Table | Column) -> (Table | Column) -> Boolean
+check_connection : (Table | DB_Column) -> (Table | DB_Column) -> Boolean
 check_connection entity1 entity2 =
     # The `if_not_error` is needed `Meta.is_same_object` does not forward dataflow errors.
     entity1.if_not_error <| entity2.if_not_error <|
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 3f8072ee0310..39297d8daeea 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
@@ -12,7 +12,7 @@ from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all
 from Standard.Table.Errors import Inexact_Type_Coercion
 
 import project.Connection.Connection.Connection
-import project.Data.Column.Column
+import project.Data.DB_Column.DB_Column
 import project.Data.Dialect
 import project.Data.SQL.SQL_Builder
 import project.Data.SQL.SQL_Fragment
@@ -263,10 +263,10 @@ type Postgres_Dialect
 
 
     ## PRIVATE
-    value_type_for_upload_of_existing_column : Column -> Value_Type
+    value_type_for_upload_of_existing_column : DB_Column -> Value_Type
     value_type_for_upload_of_existing_column self column = case column of
         # Return the type as-is for database columns.
-        _ : Column -> column.value_type
+        _ : DB_Column -> column.value_type
         _ : Materialized_Column ->
             base_type = column.value_type
             case base_type of
@@ -553,7 +553,7 @@ supported_replace_params =
     e1 = [Replace_Params.Value Text Case_Sensitivity.Sensitive True, Replace_Params.Value Text Case_Sensitivity.Insensitive False, Replace_Params.Value Text Case_Sensitivity.Insensitive True]
     e2 = [Replace_Params.Value Regex Case_Sensitivity.Default False, Replace_Params.Value Regex Case_Sensitivity.Default True, Replace_Params.Value Regex Case_Sensitivity.Sensitive False]
     e3 = [Replace_Params.Value Regex Case_Sensitivity.Sensitive True, Replace_Params.Value Regex Case_Sensitivity.Insensitive False, Replace_Params.Value Regex Case_Sensitivity.Insensitive True]
-    e4 = [Replace_Params.Value Column Case_Sensitivity.Default False, Replace_Params.Value Column Case_Sensitivity.Sensitive False]
+    e4 = [Replace_Params.Value DB_Column Case_Sensitivity.Default False, Replace_Params.Value DB_Column Case_Sensitivity.Sensitive False]
     Set.from_vector <| e0 + e1 + e2 + e3 + e4
 
 ## PRIVATE
@@ -596,7 +596,7 @@ replace args metadata =
                         SQL_Builder.code "REGEXP_REPLACE(" ++ input ++ ", " ++ pattern_string ++ ", " ++ replacement ++ ", 'i')"
                     _ ->
                         SQL_Builder.code "REGEXP_REPLACE(" ++ input ++ ", " ++ pattern_string ++ ", " ++ replacement ++ ")"
-        Column ->
+        DB_Column ->
             case replace_params.only_first of
                 False -> case replace_params.case_sensitivity of
                     Case_Sensitivity.Insensitive _ ->
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 57deac60864d..10bac679c697 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
@@ -8,7 +8,7 @@ from Standard.Table import Aggregate_Column, Value_Type
 from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all
 
 import project.Connection.Connection.Connection
-import project.Data.Column.Column
+import project.Data.DB_Column.DB_Column
 import project.Data.Dialect
 import project.Data.SQL.SQL_Builder
 import project.Data.SQL_Statement.SQL_Statement
@@ -277,7 +277,7 @@ type SQLite_Dialect
         if supported_replace_params.contains replace_params then action else replace_params.throw_unsupported "SQLite"
 
     ## PRIVATE
-    value_type_for_upload_of_existing_column : Column -> Value_Type
+    value_type_for_upload_of_existing_column : DB_Column -> Value_Type
     value_type_for_upload_of_existing_column self column = column.value_type
 
 ## PRIVATE
@@ -444,7 +444,7 @@ replace args metadata =
 
     replace_params = metadata.at 1
 
-    expression = case replace_params.input_type == Text || replace_params.input_type == Column of
+    expression = case replace_params.input_type == Text || replace_params.input_type == DB_Column of
         True ->
             ## To use REGEXP_REPLACE on a non-regex, we have to escape it.
             case replace_params.only_first of
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Type_Mapping.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Type_Mapping.enso
index 0924b7b5acd6..af87faaca7c9 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Type_Mapping.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Type_Mapping.enso
@@ -8,7 +8,7 @@ import Standard.Table.Data.Type.Value_Type.Value_Type
 import Standard.Table.Data.Type.Value_Type_Helpers
 from Standard.Table.Errors import Inexact_Type_Coercion
 
-import project.Data.Column.Column
+import project.Data.DB_Column.DB_Column
 import project.Data.SQL_Type.SQL_Type
 import project.Internal.IR.Internal_Column.Internal_Column
 import project.Internal.IR.SQL_Expression.SQL_Expression
@@ -142,7 +142,7 @@ name_based_workarounds = Map.from_vector <|
 operations_map : Map Text (Vector -> SQL_Type)
 operations_map =
     find_type arg = case arg of
-        column : Column -> column.value_type
+        column : DB_Column -> column.value_type
         internal_column : Internal_Column ->
             SQLite_Type_Mapping.sql_type_to_value_type internal_column.sql_type_reference.get
         enso_value -> Enso_Types.most_specific_value_type enso_value use_smallest=True
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 8fda22dab323..e3222ef7d562 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
@@ -466,7 +466,7 @@ filter_blank_rows table when treat_nans_as_blank =
    Currently, it relies on a hack - it checks if the object has a method
    `is_table` and if it returns `True`.
 is_column obj =
-    known_types = ["Standard.Table.Data.Column.Column", "Standard.Database.Data.Column.Column"]
+    known_types = ["Standard.Table.Data.Column.Column", "Standard.Database.Data.DB_Column.DB_Column"]
     known_types.contains (Meta.get_qualified_type_name obj)
 
 ## PRIVATE
diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
index 62a9c20a058b..2588ca1e6115 100644
--- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
+++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
@@ -5,7 +5,7 @@ import Standard.Table.Data.Column.Column as Dataframe_Column
 import Standard.Table.Data.Row.Row
 import Standard.Table.Data.Table.Table as Dataframe_Table
 
-import Standard.Database.Data.Column.Column as Database_Column
+import Standard.Database.Data.DB_Column.DB_Column
 import Standard.Database.Data.Table.Table as Database_Table
 
 import project.Helpers
@@ -37,7 +37,7 @@ prepare_visualization y max_rows=1000 =
             all_rows_count = x.row_count
             index = Dataframe_Column.from_vector "#" (Vector.new dataframe.row_count i->i)
             make_json_for_table dataframe [index] all_rows_count
-        _ : Database_Column -> prepare_visualization x.to_table max_rows
+        _ : DB_Column -> prepare_visualization x.to_table max_rows
         _ : Database_Table ->
             dataframe = x.read max_rows warn_if_more_rows=False
             all_rows_count = x.row_count
@@ -185,7 +185,7 @@ make_json_for_value val level=0 = case val of
             prepared = if val.length > 5 then truncated + ["… " + (val.length - 5).to_text+ " items"] else truncated
             "{" + (prepared.join ", ") + "}"
     _ : Dataframe_Column -> make_json_for_value val.to_table level
-    _ : Database_Column -> make_json_for_value val.to_table level
+    _ : DB_Column -> make_json_for_value val.to_table level
     _ : Dataframe_Table ->
         if level != 0 then "Table{" + val.row_count + " rows x " + val.column_count + " columns}" else
             truncated = val.columns.take 5 . map _.name
diff --git a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
index 61a4eefec212..ffbf334a4de2 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
@@ -4,7 +4,7 @@ import Standard.Base.Errors.Common.Arithmetic_Error
 import Standard.Base.Errors.Common.Incomparable_Values
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Meta.Type
-import Standard.Database.Data.Column.Column
+import Standard.Database.Data.DB_Column.DB_Column
 import Standard.Database.Internal.Replace_Params.Replace_Params
 
 from Standard.Table import Value_Type, Column_Ref
@@ -707,6 +707,8 @@ add_specs suite_builder setup =
 
         group_builder.specify "should report error if incomparable types are compared" <|
             t = table_builder [["X", [1, 2]], ["Y", ["a", "b"]], ["Z", [True, False]]]
+            r42 = (t.at "X") < (t.at "Y")
+            r42.should_fail_with Invalid_Value_Type
 
             [(<), (<=), (>), (>=)].each op->
                 r1 = op (t.at "X") (t.at "Y")
@@ -1483,7 +1485,7 @@ add_specs suite_builder setup =
                 col.text_replace 'hello' 'bye' . name . should_equal 'replace([x], \'hello\', \'bye\')'
             if supported_replace_params.contains (Replace_Params.Value Regex Case_Sensitivity.Default False) then
                 col.text_replace 'a[bcd]'.to_regex 'hey' . name . should_equal 'replace([x], \'a[bcd]\', \'hey\')'
-            if supported_replace_params.contains (Replace_Params.Value Column Case_Sensitivity.Default False) then
+            if supported_replace_params.contains (Replace_Params.Value DB_Column Case_Sensitivity.Default False) then
                 col.text_replace patterns replacements . name . should_equal 'replace([x], [patterns], [replacements])'
 
     suite_builder.group prefix+"Column Operations - Text Replace (in-memory only)" group_builder->
diff --git a/test/Table_Tests/src/Common_Table_Operations/Nothing_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Nothing_Spec.enso
index 0b484a889291..2d7d7065f9f8 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Nothing_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Nothing_Spec.enso
@@ -2,7 +2,7 @@ from Standard.Base import all
 
 from Standard.Table import all
 
-import Standard.Database.Data.Column.Column as Database_Column
+import Standard.Database.Data.DB_Column.DB_Column as Database_Column
 
 from Standard.Test import Test
 import Standard.Test.Extensions
diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso
index fd2aa299721e..a4ac969c2339 100644
--- a/test/Table_Tests/src/Database/Postgres_Spec.enso
+++ b/test/Table_Tests/src/Database/Postgres_Spec.enso
@@ -7,7 +7,7 @@ import Standard.Table.Data.Type.Value_Type.Bits
 from Standard.Table import Table, Value_Type, Aggregate_Column
 from Standard.Table.Errors import Invalid_Column_Names, Inexact_Type_Coercion, Duplicate_Output_Column_Names
 
-import Standard.Database.Data.Column.Column
+import Standard.Database.Data.DB_Column.DB_Column
 import Standard.Database.Data.SQL_Type.SQL_Type
 import Standard.Database.Internal.Postgres.Pgpass
 import Standard.Database.Internal.Postgres.Postgres_Entity_Naming_Properties
@@ -644,7 +644,7 @@ supported_replace_params =
     e1 = [Replace_Params.Value Text Case_Sensitivity.Sensitive True, Replace_Params.Value Text Case_Sensitivity.Insensitive False, Replace_Params.Value Text Case_Sensitivity.Insensitive True]
     e2 = [Replace_Params.Value Regex Case_Sensitivity.Default False, Replace_Params.Value Regex Case_Sensitivity.Default True, Replace_Params.Value Regex Case_Sensitivity.Sensitive False]
     e3 = [Replace_Params.Value Regex Case_Sensitivity.Sensitive True, Replace_Params.Value Regex Case_Sensitivity.Insensitive False, Replace_Params.Value Regex Case_Sensitivity.Insensitive True]
-    e4 = [Replace_Params.Value Column Case_Sensitivity.Default False, Replace_Params.Value Column Case_Sensitivity.Sensitive False]
+    e4 = [Replace_Params.Value DB_Column Case_Sensitivity.Default False, Replace_Params.Value DB_Column Case_Sensitivity.Sensitive False]
     Set.from_vector <| e0 + e1 + e2 + e3 + e4
 
 add_table_specs suite_builder =
diff --git a/test/Table_Tests/src/Database/SQLite_Spec.enso b/test/Table_Tests/src/Database/SQLite_Spec.enso
index 6a247fb7db05..7589333c2709 100644
--- a/test/Table_Tests/src/Database/SQLite_Spec.enso
+++ b/test/Table_Tests/src/Database/SQLite_Spec.enso
@@ -9,7 +9,6 @@ import Standard.Table.Data.Type.Value_Type.Bits
 from Standard.Table import Table, Value_Type
 from Standard.Table.Errors import Invalid_Column_Names, Duplicate_Output_Column_Names
 
-import Standard.Database.Data.Column.Column
 import Standard.Database.Internal.Replace_Params.Replace_Params
 from Standard.Database import all
 from Standard.Database.Errors import SQL_Error, Unsupported_Database_Operation
diff --git a/test/Table_Tests/src/Util.enso b/test/Table_Tests/src/Util.enso
index 1d896e51341b..6f22bf7744da 100644
--- a/test/Table_Tests/src/Util.enso
+++ b/test/Table_Tests/src/Util.enso
@@ -1,7 +1,7 @@
 from Standard.Base import all
 
 import Standard.Database.Data.Table.Table as Database_Table
-import Standard.Database.Data.Column.Column as Database_Column
+import Standard.Database.Data.DB_Column.DB_Column as Database_Column
 import Standard.Table.Data.Table.Table as In_Memory_Table
 import Standard.Table.Data.Column.Column as In_Memory_Column