github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-21 22:04:56 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Sql: MassInsert now allows empty EndRow (with possible delete) #409

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5841 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-02-19 21:18:28 +00:00
parent 508d22a426
commit 3cb7f8ecaf
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
uppsrc/Sql/MassInsert.cpp
View file

@ -29,6 +29,8 @@ SqlMassInsert& SqlMassInsert::operator()(SqlId col, const Value& val)
SqlMassInsert& SqlMassInsert::EndRow(SqlBool remove)
{
cache.Top().remove = remove;
if(pos == 0)
return *this;
if(cache.GetCount() && cache[0].value.GetCount() * cache.GetCount() > 5000)
Flush();
ASSERT(column.GetCount() == pos);
@ -66,15 +68,17 @@ void SqlMassInsert::Flush()
insert << ") values ";
for(int i = 0; i < cache.GetCount(); i++) {
Row& r = cache[i];
if(i)
insert << ", ";
insert << "(";
for(int i = 0; i < r.value.GetCount(); i++) {
if(r.value.GetCount()) {
if(i)
insert << ", ";
insert << SqlCompile(dialect, SqlFormat(r.value[i]));
insert << "(";
for(int i = 0; i < r.value.GetCount(); i++) {
if(i)
insert << ", ";
insert << SqlCompile(dialect, SqlFormat(r.value[i]));
}
insert << ")";
}
insert << ")";
}
}
else
@ -95,7 +99,7 @@ void SqlMassInsert::Flush()
bool nextsel = false;
for(int i = ii; i < cache.GetCount(); i++) {
Row& r = cache[i];
if(r.nulls == nulls) {
if(r.nulls == nulls && r.value.GetCount()) {
r.nulls = DONE;
if(nextsel)
insert << " union all";