Remove trailing semicolons from query strings

Hive and Impala don't play nice with them.

Author: xyu

src/ThriftSQL/Hive.php

@@ -81,10 +81,11 @@ public function connect() {
   public function queryAndFetchAll( $queryStr ) {
     try {
       $sleeper = new \ThriftSQL\Utils\Sleeper();
+      $queryCleaner = new \ThriftSQL\Utils\QueryCleaner();
 
       $TExecuteStatementResp = $this->_client->ExecuteStatement( new \ThriftSQL\TExecuteStatementReq( array(
         'sessionHandle' => $this->_sessionHandle,
-        'statement' => $queryStr,
+        'statement' => $queryCleaner->clean( $queryStr ),
         'runAsync' => true,
       ) ) );
 

src/ThriftSQL/Impala.php

@@ -53,9 +53,10 @@ public function connect() {
   public function queryAndFetchAll( $queryStr ) {
     try {
       $sleeper = new \ThriftSQL\Utils\Sleeper();
+      $queryCleaner = new \ThriftSQL\Utils\QueryCleaner();
 
       $QueryHandle = $this->_client->query( new \ThriftSQL\Query( array(
-        'query' => $queryStr,
+        'query' => $queryCleaner->clean( $queryStr ),
       ) ) );
 
       // Wait for results

src/ThriftSQL/Utils/QueryCleaner.php

@@ -0,0 +1,15 @@
+<?php
+namespace ThriftSQL\Utils;
+
+/**
+ * Util to clean up queries; e.g. remove trailing `;`.
+ */
+
+class QueryCleaner {
+
+  public function clean( $queryStr ) {
+    // Very simplistic
+    return trim( $queryStr, "; \t\n\r\0\x0B" );
+  }
+
+}

src/autoload_classmap.php

@@ -192,6 +192,7 @@
     'ThriftSQL\TTypeQualifiers'                                   => __DIR__ . '/Packages/TCLIService/Types.php',
     'ThriftSQL\TUnionTypeEntry'                                   => __DIR__ . '/Packages/TCLIService/Types.php',
     'ThriftSQL\TUserDefinedTypeEntry'                             => __DIR__ . '/Packages/TCLIService/Types.php',
+    'ThriftSQL\Utils\QueryCleaner'                                => __DIR__ . '/ThriftSQL/Utils/QueryCleaner.php',
     'ThriftSQL\Utils\Sleeper'                                     => __DIR__ . '/ThriftSQL/Utils/Sleeper.php',
     'Thrift\Base\TBase'                                           => __DIR__ . '/Thrift/Base/TBase.php',
     'Thrift\ClassLoader\ThriftClassLoader'                        => __DIR__ . '/Thrift/ClassLoader/ThriftClassLoader.php',