meadow 2.0.31 → 2.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/source/providers/Meadow-Provider-SQLite.js +6 -12
  3. package/test/Meadow-Provider-MSSQL_tests.js +6 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "meadow",
3
- "version": "2.0.31",
3
+ "version": "2.0.33",
4
4
  "description": "A data access library.",
5
5
  "main": "source/Meadow.js",
6
6
  "scripts": {
package/source/providers/Meadow-Provider-SQLite.js CHANGED
@@ -204,15 +204,14 @@ var MeadowProvider = function ()
204
204
  }
205
205
 
206
206
  tmpResult.executed = true;
207
- return fCallback();
208
207
  }
209
208
  catch (pError)
210
209
  {
211
210
  tmpResult.error = pError;
212
211
  tmpResult.value = false;
213
212
  tmpResult.executed = true;
214
- return fCallback();
215
213
  }
214
+ return fCallback();
216
215
  };
217
216
 
218
217
  var Read = function (pQuery, fCallback)
@@ -245,15 +244,14 @@ var MeadowProvider = function ()
245
244
  tmpResult.error = null;
246
245
  tmpResult.value = tmpRows;
247
246
  tmpResult.executed = true;
248
- return fCallback();
249
247
  }
250
248
  catch (pError)
251
249
  {
252
250
  tmpResult.error = pError;
253
251
  tmpResult.value = false;
254
252
  tmpResult.executed = true;
255
- return fCallback();
256
253
  }
254
+ return fCallback();
257
255
  };
258
256
 
259
257
  var Update = function (pQuery, fCallback)
@@ -286,15 +284,14 @@ var MeadowProvider = function ()
286
284
  tmpResult.error = null;
287
285
  tmpResult.value = tmpInfo;
288
286
  tmpResult.executed = true;
289
- return fCallback();
290
287
  }
291
288
  catch (pError)
292
289
  {
293
290
  tmpResult.error = pError;
294
291
  tmpResult.value = false;
295
292
  tmpResult.executed = true;
296
- return fCallback();
297
293
  }
294
+ return fCallback();
298
295
  };
299
296
 
300
297
  var Delete = function (pQuery, fCallback)
@@ -335,15 +332,14 @@ var MeadowProvider = function ()
335
332
  _Fable.log.warn('Error getting affected rowcount during delete query', { Body: tmpQueryBody, Parameters: pQuery.query.parameters });
336
333
  }
337
334
  tmpResult.executed = true;
338
- return fCallback();
339
335
  }
340
336
  catch (pError)
341
337
  {
342
338
  tmpResult.error = pError;
343
339
  tmpResult.value = false;
344
340
  tmpResult.executed = true;
345
- return fCallback();
346
341
  }
342
+ return fCallback();
347
343
  };
348
344
 
349
345
  var Undelete = function (pQuery, fCallback)
@@ -384,15 +380,14 @@ var MeadowProvider = function ()
384
380
  _Fable.log.warn('Error getting affected rowcount during undelete query', { Body: tmpQueryBody, Parameters: pQuery.query.parameters });
385
381
  }
386
382
  tmpResult.executed = true;
387
- return fCallback();
388
383
  }
389
384
  catch (pError)
390
385
  {
391
386
  tmpResult.error = pError;
392
387
  tmpResult.value = false;
393
388
  tmpResult.executed = true;
394
- return fCallback();
395
389
  }
390
+ return fCallback();
396
391
  };
397
392
 
398
393
  var Count = function (pQuery, fCallback)
@@ -433,15 +428,14 @@ var MeadowProvider = function ()
433
428
  {
434
429
  _Fable.log.warn('Error getting rowcount during count query', { Body: tmpQueryBody, Parameters: pQuery.query.parameters });
435
430
  }
436
- return fCallback();
437
431
  }
438
432
  catch (pError)
439
433
  {
440
434
  tmpResult.error = pError;
441
435
  tmpResult.value = false;
442
436
  tmpResult.executed = true;
443
- return fCallback();
444
437
  }
438
+ return fCallback();
445
439
  };
446
440
 
447
441
  var tmpNewProvider = (
package/test/Meadow-Provider-MSSQL_tests.js CHANGED
@@ -748,7 +748,7 @@ END
748
748
  function (pError, pQuery, pRecord)
749
749
  {
750
750
  Expect(pError.code)
751
- .to.equal("ENOTPREPARED");
751
+ .to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
752
752
  fDone();
753
753
  }
754
754
  )
@@ -769,7 +769,7 @@ END
769
769
  {
770
770
  // We should have no record because the default id is IDFableTest and our tables identity is IDAnimal
771
771
  Expect(pError.code)
772
- .to.equal('ENOTPREPARED');
772
+ .to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
773
773
  fDone();
774
774
  }
775
775
  )
@@ -867,7 +867,7 @@ END
867
867
  function (pError, pQuery, pRecord)
868
868
  {
869
869
  Expect(pError.code)
870
- .to.equal('ENOTPREPARED');
870
+ .to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
871
871
  fDone();
872
872
  }
873
873
  )
@@ -887,7 +887,7 @@ END
887
887
  function (pError, pQuery, pRecord)
888
888
  {
889
889
  Expect(pError.code)
890
- .to.equal('ENOTPREPARED');
890
+ .to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
891
891
  fDone();
892
892
  }
893
893
  )
@@ -907,7 +907,7 @@ END
907
907
  function (pError, pQuery, pRecord)
908
908
  {
909
909
  Expect(pError.code)
910
- .to.equal('ENOTPREPARED');
910
+ .to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
911
911
  fDone();
912
912
  }
913
913
  )
@@ -1093,7 +1093,7 @@ END
1093
1093
  function (pError, pQuery, pQueryRead, pRecord)
1094
1094
  {
1095
1095
  Expect(pError.code)
1096
- .to.equal('ENOTPREPARED');
1096
+ .to.be.oneOf(['ENOTPREPARED', 'EREQUEST']);
1097
1097
  fDone();
1098
1098
  }
1099
1099
  )