Switch back to druid-query-toolkit (#318)

Author: jgoz

extra/prefix.js

@@ -29,7 +29,7 @@ var moment = Chronoshift.moment;
 var isDate = Chronoshift.isDate;
 var parseISODate = Chronoshift.parseISODate;
 
-var druidQueryToolkit = require('@druid-toolkit/query');
+var druidQueryToolkit = require('druid-query-toolkit');
 var SqlColumn = druidQueryToolkit.SqlColumn;
 var SqlExpression = druidQueryToolkit.SqlExpression;
 var SqlFunction = druidQueryToolkit.SqlFunction;

package-lock.json

@@ -45,9 +45,9 @@
     "npm": "6.14.12"
   },
   "dependencies": {
-    "@druid-toolkit/query": "^0.19.1",
     "chronoshift": "^0.10.0",
     "druid.d.ts": "^0.12.1",
+    "druid-query-toolkit": "^1.0.0",
     "has-own-prop": "^1.0.1",
     "immutable-class": "^0.11.1",
     "moment-timezone": "^0.5.26",

package.json

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { SqlExpression } from '@druid-toolkit/query';
+import { SqlExpression } from 'druid-query-toolkit';
 
 import { PlywoodValue } from '../datatypes';
 import { SQLDialect } from '../dialect/baseDialect';

src/expressions/sqlAggregateExpression.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { SqlExpression, SqlFunction } from '@druid-toolkit/query';
+import { SqlExpression, SqlFunction } from 'druid-query-toolkit';
 
 import { ComputeFn, Datum, PlywoodValue } from '../datatypes';
 import { SQLDialect } from '../dialect';

src/expressions/sqlRefExpression.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Column, Introspect, QueryResult, SqlColumn, SqlQuery } from '@druid-toolkit/query';
+import { Column, Introspect, QueryResult, SqlColumn, SqlQuery } from 'druid-query-toolkit';
 import { PlywoodRequester } from 'plywood-base-api';
 import * as toArray from 'stream-to-array';
 

src/external/druidSqlExternal.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const { SqlExpression } = require('@druid-toolkit/query');
+const { SqlExpression } = require('druid-query-toolkit');
 const { expect } = require('chai');
 
 const plywood = require('../plywood');