Moving graph_filter to graph

Author: GavinMendelGleason

lib/query/woqlQuery.js

@@ -130,17 +130,17 @@ WOQLQuery.prototype.or = function(...queries) {
     return this
 }
 
-WOQLQuery.prototype.from = function(graph_filter, query) {
-    //if (graph_filter && graph_filter == 'args')
-    //return ['graph_filter', 'query']
+WOQLQuery.prototype.from = function(graph, query) {
+    //if (graph && graph == 'args')
+    //return ['graph', 'query']
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     this.cursor['@type'] = 'From'
-    if (!graph_filter || typeof graph_filter != 'string') {
+    if (!graph || typeof graph != 'string') {
         return this.parameterError(
             'The first parameter to from must be a Graph Filter Expression (string)',
         )
     }
-    this.cursor['graph_filter'] = graph_filter
+    this.cursor['graph'] = graph
     return this.addSubQuery(query)
 }
 
@@ -195,7 +195,7 @@ WOQLQuery.prototype.quad = function(a, b, c, g) {
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     let args = this.triple(a, b, c)
     //if (a && a == 'args') 
-    //return args.concat(['graph_filter'])
+    //return args.concat(['graph'])
     if (!g)
         return this.parameterError('Quad takes four parameters, the last should be a graph filter')
     this.cursor['@type'] = 'Triple'
@@ -207,23 +207,23 @@ WOQLQuery.prototype.added_quad = function(a, b, c, g) {
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     let args = this.triple(a, b, c)
     //if (a && a == 'args') 
-    //return args.concat(['graph_filter'])
+    //return args.concat(['graph'])
     if (!g)
         return this.parameterError('Quad takes four parameters, the last should be a graph filter')
     this.cursor['@type'] = 'AddedQuad'
-    this.cursor['graph_filter'] = this.cleanGraph(g)
+    this.cursor['graph'] = this.cleanGraph(g)
     return this
 }
 
 WOQLQuery.prototype.removed_quad = function(a, b, c, g) {
     if (this.cursor['@type']) this.wrapCursorWithAnd()
     let args = this.triple(a, b, c)
     //if (a && a == 'args')
-    //return args.concat(['graph_filter'])
+    //return args.concat(['graph'])
     if (!g)
         return this.parameterError('Quad takes four parameters, the last should be a graph filter')
     this.cursor['@type'] = 'RemovedQuad'
-    this.cursor['graph_filter'] = this.cleanGraph(g)
+    this.cursor['graph'] = this.cleanGraph(g)
     return this
 }
 
@@ -953,4 +953,4 @@ WOQLQuery.prototype.type_of = function(a, b) {
     return this
 }
 
-module.exports = WOQLQuery
+module.exports = WOQLQuery

test/woql.spec.js

@@ -143,7 +143,7 @@ describe('woql queries', function () {
     const woqlObject=WOQL.from("http://dburl", WOQLQuery);
     const jsonObj={
                     "@type": "From",
-                    "graph_filter": "http://dburl",
+                    "graph": "http://dburl",
                     "query": {
                         "@type": "Limit",
                         "limit": 10,