1 files changed, 49 insertions, 1 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/common/column.cpp b/SQLiteStudio3/coreSQLiteStudio/common/column.cpp
index cc282e6..852ff45 100644
--- a/SQLiteStudio3/coreSQLiteStudio/common/column.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/common/column.cpp
@@ -32,7 +32,55 @@ void Column::setColumn(const QString& value)
     column = value;
 }
 
+QString Column::getDeclaredType() const
+{
+    return declaredType;
+}
+
+void Column::setDeclaredType(const QString& value)
+{
+    declaredType = value;
+}
+
 int qHash(Column column)
 {
-    return qHash(column.getDatabase() + "." + column.getTable() + "." + column.getColumn());
+    return qHash(column.getDatabase() + "." + column.getTable() + "." + column.getColumn() + "/" + column.getDeclaredType());
+}
+
+AliasedColumn::AliasedColumn()
+{
+}
+
+AliasedColumn::AliasedColumn(const QString& database, const QString& table, const QString& column, const QString& alias) :
+    Column(database, table, column)
+{
+    setAlias(alias);
+}
+
+AliasedColumn::AliasedColumn(const AliasedColumn& other) :
+    Column(other)
+{
+    alias = other.alias;
+}
+
+int AliasedColumn::operator ==(const AliasedColumn& other) const
+{
+    return Column::operator==(other) && alias == other.alias;
+
+}
+
+QString AliasedColumn::getAlias() const
+{
+    return alias;
+}
+
+void AliasedColumn::setAlias(const QString& value)
+{
+    alias = value;
+}
+
+int qHash(AliasedColumn column)
+{
+    return qHash(column.getDatabase() + "." + column.getTable() + "." + column.getColumn() + "/" + column.getDeclaredType()
+                 + "/" + column.getAlias());
 }