summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-04-27 21:19:54 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2016-04-27 21:19:54 +0100
commit972b694a6dd3c62dcc2fb3d293413ed98f5149c4 (patch)
treeac8d80f681d8f3757527006ed91d1b95ad056666
parentIngest grouped use flags (diff)
downloadgentoobrowse-api-972b694a6dd3c62dcc2fb3d293413ed98f5149c4.tar.bz2
gentoobrowse-api-972b694a6dd3c62dcc2fb3d293413ed98f5149c4.tar.xz
gentoobrowse-api-972b694a6dd3c62dcc2fb3d293413ed98f5149c4.zip
Rename badly named SQL expression
-rw-r--r--gentoobrowse-api/service/maintenance/useLocalProcessor.cpp6
-rw-r--r--gentoobrowse-api/service/sql/maintenance/useLocalMap.sql (renamed from gentoobrowse-api/service/sql/maintenance/rawUseLocalDesc.sql)2
2 files changed, 4 insertions, 4 deletions
diff --git a/gentoobrowse-api/service/maintenance/useLocalProcessor.cpp b/gentoobrowse-api/service/maintenance/useLocalProcessor.cpp
index 4ce5d55..065022e 100644
--- a/gentoobrowse-api/service/maintenance/useLocalProcessor.cpp
+++ b/gentoobrowse-api/service/maintenance/useLocalProcessor.cpp
@@ -5,7 +5,7 @@
#include "utils/fileUtils.h"
#include "utils/dbUtils.h"
#include <glibmm/regex.h>
-#include "sql/maintenance/rawUseLocalDesc.sql.h"
+#include "sql/maintenance/useLocalMap.sql.h"
using namespace Gentoo::Utils::File;
@@ -25,14 +25,14 @@ namespace Gentoo {
UseLocalProcessor::modified(DB::Connection * dbc, const boost::filesystem::path &, const boost::filesystem::path & path) const
{
DB::TablePatch p;
- auto tempTable = Utils::Database::namedTemp(dbc, "rawuselocaldesc", {
+ auto tempTable = Utils::Database::namedTemp(dbc, "tmp_uselocalraw", {
{ "category", "text" },
{ "package", "text" },
{ "use", "text" },
{ "description", "text" }
});
p.dest = "gentoobrowse.use_local";
- DB::StaticSqlWriter srcExpr(sql::maintenance::rawUseLocalDesc::sql);
+ DB::StaticSqlWriter srcExpr(sql::maintenance::useLocalMap::sql);
p.srcExpr = &srcExpr;
p.pk = { "packageId", "use" };
p.cols = { "packageId", "use", "description" };
diff --git a/gentoobrowse-api/service/sql/maintenance/rawUseLocalDesc.sql b/gentoobrowse-api/service/sql/maintenance/useLocalMap.sql
index dedfbc8..2d12184 100644
--- a/gentoobrowse-api/service/sql/maintenance/rawUseLocalDesc.sql
+++ b/gentoobrowse-api/service/sql/maintenance/useLocalMap.sql
@@ -1,6 +1,6 @@
(
SELECT p.packageId, d.use, d.description
- FROM gentoobrowse.categories c, gentoobrowse.packages p, rawuselocaldesc d
+ FROM gentoobrowse.categories c, gentoobrowse.packages p, tmp_uselocalraw d
WHERE c.categoryId = p.categoryId
AND c.name = d.category
AND p.name = d.package