Mercurial > hg > orthanc-databases

comparison Framework/Plugins/IndexBackend.cpp @ 310:f3eac614b32e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed two DatabaseManager::CachedStatement in the same scope
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 13 Jul 2021 17:23:54 +0200
parents 8de3a1ecac11
children 64763998cdff
comparison
equal deleted inserted replaced
309:d192bfd0e752 310:f3eac614b32e
124 !statement.IsDone()) 124 !statement.IsDone())
125 { 125 {
126 output.AnswerChange( 126 output.AnswerChange(
127 statement.ReadInteger64(0), 127 statement.ReadInteger64(0),
128 statement.ReadInteger32(1), 128 statement.ReadInteger32(1),
129 static_cast<OrthancPluginResourceType>(statement.ReadInteger32(3)), 129 static_cast<OrthancPluginResourceType>(statement.ReadInteger32(2)),
130 GetPublicId(manager, statement.ReadInteger64(2)), 130 statement.ReadString(3),
131 statement.ReadString(4)); 131 statement.ReadString(4));
132 132
133 statement.Next(); 133 statement.Next();
134 count++; 134 count++;
135 } 135 }
569 suffix = "LIMIT ${limit}"; 569 suffix = "LIMIT ${limit}";
570 } 570 }
571 571
572 DatabaseManager::CachedStatement statement( 572 DatabaseManager::CachedStatement statement(
573 STATEMENT_FROM_HERE, manager, 573 STATEMENT_FROM_HERE, manager,
574 "SELECT * FROM Changes WHERE seq>${since} ORDER BY seq " + suffix); 574 "SELECT Changes.seq, Changes.changeType, Changes.resourceType, Changes.date, "
575 "Resources.publicId FROM Changes INNER JOIN Resources "
576 "ON Changes.internalId = Resources.internalId WHERE seq>${since} ORDER BY seq " + suffix);
575 577
576 statement.SetReadOnly(true); 578 statement.SetReadOnly(true);
577 statement.SetParameterType("limit", ValueType_Integer64); 579 statement.SetParameterType("limit", ValueType_Integer64);
578 statement.SetParameterType("since", ValueType_Integer64); 580 statement.SetParameterType("since", ValueType_Integer64);
579 581
670 suffix = "LIMIT 1"; 672 suffix = "LIMIT 1";
671 } 673 }
672 674
673 DatabaseManager::CachedStatement statement( 675 DatabaseManager::CachedStatement statement(
674 STATEMENT_FROM_HERE, manager, 676 STATEMENT_FROM_HERE, manager,
675 "SELECT * FROM Changes ORDER BY seq DESC " + suffix); 677 "SELECT Changes.seq, Changes.changeType, Changes.resourceType, Changes.date, "
678 "Resources.publicId FROM Changes INNER JOIN Resources "
679 "ON Changes.internalId = Resources.internalId ORDER BY seq DESC " + suffix);
676 680
677 statement.SetReadOnly(true); 681 statement.SetReadOnly(true);
678 682
679 Dictionary args; 683 Dictionary args;
680 684
2009 2013
2010 virtual std::string FormatWildcardEscape() 2014 virtual std::string FormatWildcardEscape()
2011 { 2015 {
2012 switch (dialect_) 2016 switch (dialect_)
2013 { 2017 {
2018 case Dialect_MSSQL:
2014 case Dialect_SQLite: 2019 case Dialect_SQLite:
2015 case Dialect_PostgreSQL: 2020 case Dialect_PostgreSQL:
2016 return "ESCAPE '\\'"; 2021 return "ESCAPE '\\'";
2017 2022
2018 case Dialect_MySQL: 2023 case Dialect_MySQL: