Add Comext reference database

Author: ahuarte47

CHANGES.rst

@@ -1,6 +1,11 @@
 Release history
 ---------------
 
+0.3.0
+++++++++++++++++++
+
+- Add Comext reference database (https://ec.europa.eu/eurostat/web/user-guides/data-browser/api-data-access/api-getting-started/comext-database).
+
 0.2.1
 ++++++++++++++++++
 

src/eurostat/eurostat.hpp

@@ -12,23 +12,27 @@ struct Endpoint {
 	std::string organization; // (aka agency)
 	std::string description;
 	std::string api_url;
+	std::string source_id;
 };
 
 //! API Endpoints
 static const std::unordered_map<std::string, Endpoint> ENDPOINTS = {
-    {"ESTAT", {"EUROSTAT", "EUROSTAT database", "https://ec.europa.eu/eurostat/api/dissemination/sdmx/2.1/"}},
+    {"COMEXT",
+     {"COMEXT", "Comext reference database", "https://ec.europa.eu/eurostat/api/comext/dissemination/sdmx/2.1/",
+      "ESTAT"}},
+    {"ESTAT", {"EUROSTAT", "EUROSTAT database", "https://ec.europa.eu/eurostat/api/dissemination/sdmx/2.1/", "ESTAT"}},
     {"ECFIN",
      {"DG ECFIN", "Economic and Financial Affairs",
-      "https://webgate.ec.europa.eu/ecfin/redisstat/api/dissemination/sdmx/2.1/"}},
+      "https://webgate.ec.europa.eu/ecfin/redisstat/api/dissemination/sdmx/2.1/", "ECFIN"}},
     {"EMPL",
      {"DG EMPL", "Employment, Social Affairs and Inclusion",
-      "https://webgate.ec.europa.eu/empl/redisstat/api/dissemination/sdmx/2.1/"}},
+      "https://webgate.ec.europa.eu/empl/redisstat/api/dissemination/sdmx/2.1/", "EMPL"}},
     {"GROW",
      {"DG GROW", "Internal Market, Industry, Entrepreneurship and SMEs",
-      "https://webgate.ec.europa.eu/grow/redisstat/api/dissemination/sdmx/2.1/"}},
+      "https://webgate.ec.europa.eu/grow/redisstat/api/dissemination/sdmx/2.1/", "GROW"}},
     {"TAXUD",
      {"DG TAXUD", "Taxation and Customs Union",
-      "https://webgate.ec.europa.eu/taxation_customs/redisstat/api/dissemination/sdmx/2.1/"}},
+      "https://webgate.ec.europa.eu/taxation_customs/redisstat/api/dissemination/sdmx/2.1/", "TAXUD"}},
 };
 
 /**

src/eurostat/eurostat_info_functions.cpp

@@ -434,7 +434,7 @@ struct ES_Dataflows {
 			const auto it = eurostat::ENDPOINTS.find(provider_id);
 
 			for (const auto &dataflow_id : dataflows) {
-				string url = it->second.api_url + "dataflow/" + provider_id + "/" + dataflow_id +
+				string url = it->second.api_url + "dataflow/" + it->second.source_id + "/" + dataflow_id +
 				             "?format=JSON&compressed=true&lang=" + language;
 
 				if (req_count == 0) {
@@ -703,7 +703,7 @@ struct ES_DataStructure {
 		// Execute HTTP GET request
 
 		const auto it = eurostat::ENDPOINTS.find(provider_id);
-		string url = it->second.api_url + "dataflow/" + provider_id + "/" + dataflow_id +
+		string url = it->second.api_url + "dataflow/" + it->second.source_id + "/" + dataflow_id +
 		             "/latest?detail=referencepartial&references=descendants";
 
 		HttpSettings settings = HttpRequest::ExtractHttpSettings(context, url);
@@ -813,7 +813,7 @@ struct ES_DataStructure {
 		// Execute HTTP GET request
 
 		const auto it = eurostat::ENDPOINTS.find(provider_id);
-		string url = it->second.api_url + "contentconstraint/" + provider_id + "/" + dataflow_id;
+		string url = it->second.api_url + "contentconstraint/" + it->second.source_id + "/" + dataflow_id;
 
 		HttpSettings settings = HttpRequest::ExtractHttpSettings(context, url);
 		auto response = HttpRequest::ExecuteHttpRequest(settings, url, "GET", HttpHeaders(), "", "");

test/sql/eurostat.test

@@ -15,4 +15,4 @@ require eurostat
 query I
 SELECT count(*) FROM EUROSTAT_Endpoints()
 ----
-5
+6

test/sql/eurostat_endpoints.test

@@ -14,6 +14,7 @@ ORDER BY
     provider_id
 ;
 ----
+COMEXT	https://ec.europa.eu/eurostat/api/comext/dissemination/sdmx/2.1/
 ECFIN	https://webgate.ec.europa.eu/ecfin/redisstat/api/dissemination/sdmx/2.1/
 EMPL	https://webgate.ec.europa.eu/empl/redisstat/api/dissemination/sdmx/2.1/
 ESTAT	https://ec.europa.eu/eurostat/api/dissemination/sdmx/2.1/

test/sql/eurostat_read.test

@@ -42,3 +42,14 @@ ES	2003	F
 PT	2001	F
 PT	2002	F
 PT	2003	F
+
+query III
+SELECT
+    time_period, product, reporter
+FROM
+    EUROSTAT_Read('COMEXT', 'DS-059341') WHERE time_period = '2006-05' AND product = '0103' AND reporter = 'FR'
+LIMIT 2
+;
+----
+2006-05	0103	FR
+2006-05	0103	FR