Validate where/or/and statement by checking also $prepared (#167)

* Validate where/or/and statement by checking also $prepared

* 2.6.57

* revert where statement

data-queryable.js

@@ -994,7 +994,7 @@ DataQueryable.prototype.join = function(model)
     });
  */
 DataQueryable.prototype.and = function(attr) {
-    Args.check(this.query.$where != null, new Error('The where expression has not been initialized.'));
+    Args.check(this.query.$where != null || this.query.$prepared!=null , new Error('The where expression has not been initialized.'));
     if (typeof attr === 'string' && /\//.test(attr)) {
         this.query.and(DataAttributeResolver.prototype.resolveNestedAttribute.call(this, attr));
         return this;
@@ -1017,7 +1017,7 @@ DataQueryable.prototype.and = function(attr) {
     });
  */
 DataQueryable.prototype.or = function(attr) {
-    Args.check(this.query.$where != null, new Error('The where expression has not been initialized.'));
+    Args.check(this.query.$where != null || this.query.$prepared!=null, new Error('The where expression has not been initialized.'));
     if (typeof attr === 'string' && /\//.test(attr)) {
         this.query.or(DataAttributeResolver.prototype.resolveNestedAttribute.call(this, attr));
         return this;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themost/data",
-  "version": "2.6.56",
+  "version": "2.6.57",
   "description": "MOST Web Framework Codename Blueshift - Data module",
   "main": "index.js",
   "types": "index.d.ts",