From da042bf82c13986be533afcf8f6ad6a4754fb9d6 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 6 Nov 2014 09:27:54 +0000 Subject: [PATCH] Sql: SqlExp: SqlSetFrom(ValueArray..) git-svn-id: svn://ultimatepp.org/upp/trunk@7866 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Sql/SqlSet.cpp | 13 +++++++++++++ uppsrc/Sql/Sqlexp.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/uppsrc/Sql/SqlSet.cpp b/uppsrc/Sql/SqlSet.cpp index cf021f4f9..83d45ce1f 100644 --- a/uppsrc/Sql/SqlSet.cpp +++ b/uppsrc/Sql/SqlSet.cpp @@ -71,6 +71,19 @@ SqlSet::SqlSet(const SqlVal& p0) { priority = SET; } +SqlSet SqlSetFrom(const ValueArray& va, int pos, int count) +{ + SqlSet set; + for(int i = 0; i < count; i++) + set << va[pos + i]; + return set; +} + +SqlSet SqlSetFrom(const ValueArray& va) +{ + return SqlSetFrom(va, 0, va.GetCount()); +} + static inline void sCat(SqlSet& s, SqlVal v) { s.Cat(v); } #define E__Cat(I) sCat(*this, p##I) diff --git a/uppsrc/Sql/Sqlexp.h b/uppsrc/Sql/Sqlexp.h index 97020cd8e..5aabae6cd 100644 --- a/uppsrc/Sql/Sqlexp.h +++ b/uppsrc/Sql/Sqlexp.h @@ -511,6 +511,9 @@ SqlSet SqlSetFrom(const T& cont, int pos, int count) return set; } +SqlSet SqlSetFrom(const ValueArray& va, int pos, int count); +SqlSet SqlSetFrom(const ValueArray& va); + class SqlSetC : public SqlSet { public: SqlSetC(const String& s) { text = s; priority = SET; }