Merge pull request #487 from atelier-saulx/feature/remove-pg

Remove timeseries

Author: nfrade

client/package.json

@@ -69,8 +69,6 @@
   },
   "dependencies": {
     "@saulx/validators": "^1.1.0",
-    "pg": "8.7.1",
-    "pg-native": "3.0.0",
     "squel": "^5.13.0",
     "data-record": "^1.0.0",
     "@saulx/selva-query-ast-parser": "^4.0.2",

client/src/get/executeGetOperations/index.ts

@@ -10,7 +10,7 @@ import { GetOptions } from '../'
 import find from './find'
 import aggregate from './aggregate'
 import inherit from './inherit'
-import timeseries from './timeseries'
+// import timeseries from './timeseries'
 import { Rpn, bfsExpr2rpn } from '@saulx/selva-query-ast-parser'
 import { FieldSchemaArrayLike, Schema } from '~selva/schema'
 import { ServerDescriptor } from '~selva/types'
@@ -548,11 +548,7 @@ export function typeCast(
   }
 
   if (fs.timeseries) {
-    const vIdx = x.findIndex((el) => {
-      return el === '_value'
-    })
-
-    x = x[vIdx + 1]
+    console.warn('Timeseries not is discontinued in this version.')
   }
 
   const cast = TYPE_CASTS[fs.type]
@@ -895,17 +891,14 @@ export const executeGetOperation = async (
     )
   } else if (op.type === 'find') {
     if (op.isTimeseries) {
-      return timeseries(client, op, lang, ctx)
-    } else {
-      return find(client, op, lang, ctx, schema)
+      console.warn('Timeseries not is discontinued in this version.')
     }
+    return find(client, op, lang, ctx, schema)
   } else if (op.type === 'aggregate') {
     if (op.isTimeseries) {
-      // add this later...
-      return timeseries(client, op, lang, ctx)
-    } else {
-      return aggregate(client, op, lang, ctx, schema)
+      console.warn('Timeseries not is discontinued in this version.')
     }
+    return aggregate(client, op, lang, ctx, schema)
   } else if (op.type === 'inherit') {
     return inherit(client, op, lang, ctx, schema)
   } else if (op.type === 'raw') {

client/src/get/executeGetOperations/timeseries.ts

@@ -23,7 +23,6 @@ import { updateSchema } from './schema/updateSchema'
 import { getSchema } from './schema/getSchema'
 import conformToSchema from './schema/conformToSchema'
 import initializeSchema from './schema/initializeSchema'
-import { TimeseriesClient } from './timeseries'
 import { GetOptions, ObserveEventOptions, GetResult, get } from './get'
 import { SetOptions, set, setWithMeta } from './set'
 import { IdOptions } from 'lua/src/id'
@@ -49,7 +48,6 @@ let clientId = 0
 
 export class SelvaClient extends EventEmitter {
   public redis: Redis
-  public pg: TimeseriesClient
 
   public selvaId: string
 
@@ -143,7 +141,6 @@ export class SelvaClient extends EventEmitter {
     this.selvaId = ++clientId + ''
     this.redis = new Redis(this)
     connectRegistry(this, opts)
-    this.pg = new TimeseriesClient(this)
   }
 
   connect(opts: ConnectOptions) {