From 5744baa2d68a7c063837f0d412e7acc67518ac36 Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Thu, 15 Dec 2016 12:59:59 +0100
Subject: [PATCH] refactor to the new generate-sqlquery

---
 qa/layer_freq.sh           | 4 ++--
 qa/layer_numvar_analyze.sh | 4 ++--
 qa/layer_toplength.sh      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qa/layer_freq.sh b/qa/layer_freq.sh
index b62ba33..1ba1a90 100755
--- a/qa/layer_freq.sh
+++ b/qa/layer_freq.sh
@@ -13,11 +13,11 @@ do
 echo " "
 echo "## $layerid z$z  - freq" 
 
-SQL=$(generate-sqlquery  layers/${layerid}/${layerid}.yaml $z ) 
+SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools generate-sqlquery  layers/${layerid}/${layerid}.yaml $z ) 
 
 SQLCODE=$(cat <<-END
 select $classvars , count(*) as _count_ from
-$SQL 
+( $SQL ) as t
 GROUP BY $classvars
 ORDER BY $classvars
 ;
diff --git a/qa/layer_numvar_analyze.sh b/qa/layer_numvar_analyze.sh
index ad15510..e786724 100755
--- a/qa/layer_numvar_analyze.sh
+++ b/qa/layer_numvar_analyze.sh
@@ -13,7 +13,7 @@ do
 echo " "
 echo "## $layerid z$z - $var "
 
-SQL=$(generate-sqlquery  layers/${layerid}/${layerid}.yaml $z ) 
+SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools generate-sqlquery  layers/${layerid}/${layerid}.yaml $z ) 
 
 SQLCODE=$(cat <<-END
 SELECT 
@@ -24,7 +24,7 @@ SELECT
   ,stddev($var)   as stddev 
   ,variance($var) as variance 
 FROM  
-  $SQL 
+( $SQL ) as t
 ;
 END
 )
diff --git a/qa/layer_toplength.sh b/qa/layer_toplength.sh
index e92e25c..a72e902 100755
--- a/qa/layer_toplength.sh
+++ b/qa/layer_toplength.sh
@@ -11,11 +11,11 @@ do
 echo " "
 echo "## $layerid z$z   max length ($classvar)"
 
-SQL=$(generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
+SQL=$(docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools generate-sqlquery  layers/${layerid}/${layerid}.yaml $z ) 
 
 SQLCODE=$(cat <<-END
 SELECT DISTINCT $classvar , length( $classvar ) AS _length_ from
-$SQL
+( $SQL ) as t
 WHERE length( $classvar ) > 0
 ORDER BY length( $classvar ) DESC NULLS LAST
 LIMIT 30