database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'develop' into remove-infinidb

Browse Source
This commit is contained in:
Roman Nozdrin
2019-08-13 12:32:01 +03:00
committed by GitHub
parent 9d83b49fca 6cdca1330b
commit b1bc995420
221 changed files with 649 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/execplan/simplecolumn.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -212,9 +212,9 @@ const string SimpleColumn::data() const
if (!fData.empty())
return fData;
else if (!fTableAlias.empty())
return string(fSchemaName + '.' + fTableAlias + '.' + fColumnName);
return string("`" + fSchemaName + "`.`" + fTableAlias + "`.`" + fColumnName + "`");
return string(fSchemaName + '.' + fTableName + '.' + fColumnName);
return string("`" + fSchemaName + "`.`" + fTableName + "`.`" + fColumnName + "`");
}
SimpleColumn& SimpleColumn::operator=(const SimpleColumn& rhs)