Fix all

Author: shangyian

datajunction-server/datajunction_server/database/column.py

@@ -168,7 +168,6 @@ def copy(self) -> "Column":
         """
         Returns a full copy of the column
         """
-        print("Copying column:", self.name, self.type)
         return Column(
             order=self.order,
             name=self.name,

datajunction-server/datajunction_server/models/column.py

@@ -8,7 +8,6 @@
 from sqlalchemy import TypeDecorator
 from sqlalchemy.types import Text
 
-from datajunction_server.sql.parsing.backends.exceptions import DJParseException
 from datajunction_server.enum import StrEnum
 from datajunction_server.sql.parsing.types import ColumnType
 
@@ -37,12 +36,7 @@ def process_bind_param(self, value: ColumnType, dialect):
     def process_result_value(self, value, dialect):
         from datajunction_server.sql.parsing.backends.antlr4 import parse_rule
 
-        if not value:
-            return value
-        try:
-            return parse_rule(value, "dataType")
-        except DJParseException:
-            return value
+        return parse_rule(value, "dataType")
 
 
 class ColumnAttributeInput(BaseModel):

datajunction-server/datajunction_server/models/cube.py

@@ -48,15 +48,19 @@ def type_string(cls, values):
         Extracts the type as a string
         """
         if isinstance(values, dict):
-            data = values
-        else:
-            data = values.__dict__ if hasattr(values, "__dict__") else values
+            return values
 
-        if "node_revision" in data:
-            data["node_name"] = data["node_revision"].name
+        # Create a new dict, don't modify the original object or it could
+        # overwrite the SQLAlchemy model
+        data = {}
+        if hasattr(values, "__dict__"):
+            data.update(values.__dict__)
+
+        if hasattr(values, "node_revision"):
+            data["node_name"] = values.node_revision.name
             data["type"] = (
-                data["node_revision"].type
-                if data["node_revision"].type == NodeType.METRIC
+                values.node_revision.type
+                if values.node_revision.type == NodeType.METRIC
                 else NodeType.DIMENSION
             )
         return data

datajunction-server/datajunction_server/models/node.py

@@ -701,7 +701,6 @@ class ColumnOutput(BaseModel):
 
     @field_validator("type", mode="before")
     def extract_type(cls, raw):
-        print("ColumnOutput type raw:", raw)
         return str(raw)