From 9487ebbf52eeba8bc7c1565f1c6db0bb346abfa9 Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 31 Oct 2008 14:01:38 +0000 Subject: [PATCH] SqlId::operator[](SqlId) as alternative to .Of git-svn-id: svn://ultimatepp.org/upp/trunk@584 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Sql/SqlVal.cpp | 5 +++++ uppsrc/Sql/Sqlexp.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/uppsrc/Sql/SqlVal.cpp b/uppsrc/Sql/SqlVal.cpp index cd1f0de1a..55a2a7781 100644 --- a/uppsrc/Sql/SqlVal.cpp +++ b/uppsrc/Sql/SqlVal.cpp @@ -12,6 +12,11 @@ SqlCol SqlId::Of(SqlId id) const return id.IsNull() ? ToString() : id.ToString() + '.' + ToString(); } +SqlId SqlId::operator[](const SqlId& id) const +{ + return id.IsNull() ? ToString() : ToString() + '.' + id.ToString(); +} + SqlId SqlId::As(const char *as) const { return id.IsNull() ? ToString() : ToString() + SqlCase(MSSQL | PGSQL, " as ")(" ") + as; diff --git a/uppsrc/Sql/Sqlexp.h b/uppsrc/Sql/Sqlexp.h index 445e30436..f692f4fac 100644 --- a/uppsrc/Sql/Sqlexp.h +++ b/uppsrc/Sql/Sqlexp.h @@ -106,8 +106,9 @@ public: SqlCol Of(SqlId id) const; SqlId As(const char *as) const; SqlId As(SqlId id) const { return As(~~id); } - SqlId operator [] (int i) const; + SqlId operator[](int i) const; SqlId operator&(const SqlId& s) const; + SqlId operator[](const SqlId& id) const; SqlId() {} SqlId(const char *s) : id(s) {}