@aws-amplify/datastore-storage-adapter 2.0.65 → 2.0.69
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.
- package/.rollup.cache/home/runner/work/amplify-js/amplify-js/amplify-js/packages/datastore-storage-adapter/dist/meta/cjs.tsbuildinfo +1 -1
- package/CHANGELOG.md +18 -0
- package/dist/aws-amplify-datastore-sqlite-adapter-expo.js +77 -74
- package/dist/aws-amplify-datastore-sqlite-adapter-expo.js.map +1 -1
- package/dist/aws-amplify-datastore-sqlite-adapter-expo.min.js +1 -1
- package/dist/aws-amplify-datastore-sqlite-adapter-expo.min.js.map +1 -1
- package/dist/aws-amplify-datastore-storage-adapter.js +74 -70
- package/dist/aws-amplify-datastore-storage-adapter.js.map +1 -1
- package/dist/aws-amplify-datastore-storage-adapter.min.js +1 -1
- package/dist/aws-amplify-datastore-storage-adapter.min.js.map +1 -1
- package/lib/.tsbuildinfo +1 -3
- package/lib/ExpoSQLiteAdapter/ExpoSQLiteDatabase.js +5 -5
- package/lib/ExpoSQLiteAdapter/ExpoSQLiteDatabase.js.map +1 -1
- package/lib/SQLiteAdapter/SQLiteDatabase.js.map +1 -1
- package/lib/common/CommonSQLiteAdapter.js +47 -42
- package/lib/common/CommonSQLiteAdapter.js.map +1 -1
- package/lib/common/SQLiteUtils.d.ts +16 -1
- package/lib/common/SQLiteUtils.js +70 -67
- package/lib/common/SQLiteUtils.js.map +1 -1
- package/lib/common/constants.js +1 -0
- package/lib/common/constants.js.map +1 -1
- package/lib/common/types.d.ts +2 -2
- package/lib/index.js +2 -0
- package/lib/index.js.map +1 -1
- package/lib-esm/.tsbuildinfo +1 -3
- package/lib-esm/ExpoSQLiteAdapter/ExpoSQLiteDatabase.js +5 -5
- package/lib-esm/ExpoSQLiteAdapter/ExpoSQLiteDatabase.js.map +1 -1
- package/lib-esm/SQLiteAdapter/SQLiteDatabase.js.map +1 -1
- package/lib-esm/common/CommonSQLiteAdapter.js +29 -25
- package/lib-esm/common/CommonSQLiteAdapter.js.map +1 -1
- package/lib-esm/common/SQLiteUtils.d.ts +16 -1
- package/lib-esm/common/SQLiteUtils.js +46 -46
- package/lib-esm/common/SQLiteUtils.js.map +1 -1
- package/lib-esm/common/types.d.ts +2 -2
- package/lib-esm/common/types.js +1 -0
- package/lib-esm/index.js +1 -0
- package/lib-esm/index.js.map +1 -1
- package/package.json +22 -23
- package/src/common/SQLiteUtils.ts +1 -1
- package/src/index.ts +2 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,24 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [2.0.69](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore-storage-adapter@2.0.68...@aws-amplify/datastore-storage-adapter@2.0.69) (2026-07-04)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @aws-amplify/datastore-storage-adapter
|
|
9
|
+
|
|
10
|
+
## [2.0.68](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore-storage-adapter@2.0.67...@aws-amplify/datastore-storage-adapter@2.0.68) (2026-07-04)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @aws-amplify/datastore-storage-adapter
|
|
13
|
+
|
|
14
|
+
## [2.0.67](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore-storage-adapter@2.0.66...@aws-amplify/datastore-storage-adapter@2.0.67) (2026-06-15)
|
|
15
|
+
|
|
16
|
+
### Bug Fixes
|
|
17
|
+
|
|
18
|
+
- complete partial v5-stable LTS release (publish remaining packages) ([#14843](https://github.com/aws-amplify/amplify-js/issues/14843)) ([b17999d](https://github.com/aws-amplify/amplify-js/commit/b17999d4be1e39c2a3127cf83bf509fb8ca807bc)), closes [#14842](https://github.com/aws-amplify/amplify-js/issues/14842)
|
|
19
|
+
|
|
20
|
+
## [2.0.66](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore-storage-adapter@2.0.65...@aws-amplify/datastore-storage-adapter@2.0.66) (2026-06-12)
|
|
21
|
+
|
|
22
|
+
**Note:** Version bump only for package @aws-amplify/datastore-storage-adapter
|
|
23
|
+
|
|
6
24
|
## [2.0.65](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore-storage-adapter@2.0.64...@aws-amplify/datastore-storage-adapter@2.0.65) (2026-03-13)
|
|
7
25
|
|
|
8
26
|
**Note:** Version bump only for package @aws-amplify/datastore-storage-adapter
|
|
@@ -78,7 +78,7 @@ var ExpoSQLiteDatabase = /** @class */function () {
|
|
|
78
78
|
_a.sent();
|
|
79
79
|
// delete database is not supported by expo-sqlite.
|
|
80
80
|
// Database file needs to be deleted using deleteAsync from expo-file-system
|
|
81
|
-
return [4 /*yield*/, (0,expo_file_system__WEBPACK_IMPORTED_MODULE_1__.deleteAsync)(expo_file_system__WEBPACK_IMPORTED_MODULE_1__.documentDirectory
|
|
81
|
+
return [4 /*yield*/, (0,expo_file_system__WEBPACK_IMPORTED_MODULE_1__.deleteAsync)("".concat(expo_file_system__WEBPACK_IMPORTED_MODULE_1__.documentDirectory, "SQLite/").concat(_common_constants__WEBPACK_IMPORTED_MODULE_3__.DB_NAME))];
|
|
82
82
|
case 2:
|
|
83
83
|
// delete database is not supported by expo-sqlite.
|
|
84
84
|
// Database file needs to be deleted using deleteAsync from expo-file-system
|
|
@@ -152,7 +152,7 @@ var ExpoSQLiteDatabase = /** @class */function () {
|
|
|
152
152
|
switch (_a.label) {
|
|
153
153
|
case 0:
|
|
154
154
|
_a.trys.push([0, 2,, 3]);
|
|
155
|
-
return [4 /*yield*/, Promise.all((0,tslib__WEBPACK_IMPORTED_MODULE_4__.
|
|
155
|
+
return [4 /*yield*/, Promise.all((0,tslib__WEBPACK_IMPORTED_MODULE_4__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_4__.__read)(queryParameterizedStatements), false).map(function (_a) {
|
|
156
156
|
var _b = (0,tslib__WEBPACK_IMPORTED_MODULE_4__.__read)(_a, 2),
|
|
157
157
|
statement = _b[0],
|
|
158
158
|
params = _b[1];
|
|
@@ -197,7 +197,7 @@ var ExpoSQLiteDatabase = /** @class */function () {
|
|
|
197
197
|
case 0:
|
|
198
198
|
_a.trys.push([0, 4,, 5]);
|
|
199
199
|
// await for all sql statements promises to resolve
|
|
200
|
-
return [4 /*yield*/, Promise.all((0,tslib__WEBPACK_IMPORTED_MODULE_4__.
|
|
200
|
+
return [4 /*yield*/, Promise.all((0,tslib__WEBPACK_IMPORTED_MODULE_4__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_4__.__read)(saveParameterizedStatements), false).map(function (_a) {
|
|
201
201
|
var _b = (0,tslib__WEBPACK_IMPORTED_MODULE_4__.__read)(_a, 2),
|
|
202
202
|
statement = _b[0],
|
|
203
203
|
params = _b[1];
|
|
@@ -215,7 +215,7 @@ var ExpoSQLiteDatabase = /** @class */function () {
|
|
|
215
215
|
// await for all sql statements promises to resolve
|
|
216
216
|
_a.sent();
|
|
217
217
|
if (!deleteParameterizedStatements) return [3 /*break*/, 3];
|
|
218
|
-
return [4 /*yield*/, Promise.all((0,tslib__WEBPACK_IMPORTED_MODULE_4__.
|
|
218
|
+
return [4 /*yield*/, Promise.all((0,tslib__WEBPACK_IMPORTED_MODULE_4__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_4__.__read)(deleteParameterizedStatements), false).map(function (_a) {
|
|
219
219
|
var _b = (0,tslib__WEBPACK_IMPORTED_MODULE_4__.__read)(_a, 2),
|
|
220
220
|
statement = _b[0],
|
|
221
221
|
params = _b[1];
|
|
@@ -466,11 +466,11 @@ var CommonSQLiteAdapter = /** @class */function () {
|
|
|
466
466
|
});
|
|
467
467
|
};
|
|
468
468
|
CommonSQLiteAdapter.prototype.save = function (model, condition) {
|
|
469
|
-
var e_1, _a;
|
|
470
469
|
return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__awaiter)(this, void 0, void 0, function () {
|
|
471
|
-
var modelConstructor, tableName, connectedModels, connectionStoreNames,
|
|
472
|
-
|
|
473
|
-
|
|
470
|
+
var modelConstructor, tableName, connectedModels, connectionStoreNames, _a, queryStatement, params, fromDB, predicates, predicateObjs, type, isValid, msg, result, saveStatements, _b, connectionStoreNames_1, connectionStoreNames_1_1, resItem, modelName, item, instance, id, _c, queryStatement_1, params_1, fromDB_1, opType, saveStatement, e_1_1;
|
|
471
|
+
var _d, e_1, _e, _f;
|
|
472
|
+
return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__generator)(this, function (_g) {
|
|
473
|
+
switch (_g.label) {
|
|
474
474
|
case 0:
|
|
475
475
|
modelConstructor = Object.getPrototypeOf(model).constructor;
|
|
476
476
|
tableName = modelConstructor.name;
|
|
@@ -485,10 +485,10 @@ var CommonSQLiteAdapter = /** @class */function () {
|
|
|
485
485
|
instance: instance
|
|
486
486
|
};
|
|
487
487
|
});
|
|
488
|
-
|
|
488
|
+
_a = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__read)((0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.queryByIdStatement)(model.id, tableName), 2), queryStatement = _a[0], params = _a[1];
|
|
489
489
|
return [4 /*yield*/, this.db.get(queryStatement, params)];
|
|
490
490
|
case 1:
|
|
491
|
-
fromDB =
|
|
491
|
+
fromDB = _g.sent();
|
|
492
492
|
if (condition && fromDB) {
|
|
493
493
|
predicates = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.ModelPredicateCreator.getPredicates(condition);
|
|
494
494
|
predicateObjs = predicates.predicates, type = predicates.type;
|
|
@@ -504,46 +504,49 @@ var CommonSQLiteAdapter = /** @class */function () {
|
|
|
504
504
|
}
|
|
505
505
|
result = [];
|
|
506
506
|
saveStatements = new Set();
|
|
507
|
-
|
|
507
|
+
_g.label = 2;
|
|
508
508
|
case 2:
|
|
509
|
-
|
|
510
|
-
connectionStoreNames_1 = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__asyncValues)(connectionStoreNames);
|
|
511
|
-
|
|
509
|
+
_g.trys.push([2, 8, 9, 14]);
|
|
510
|
+
_b = true, connectionStoreNames_1 = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__asyncValues)(connectionStoreNames);
|
|
511
|
+
_g.label = 3;
|
|
512
512
|
case 3:
|
|
513
513
|
return [4 /*yield*/, connectionStoreNames_1.next()];
|
|
514
514
|
case 4:
|
|
515
|
-
if (!(connectionStoreNames_1_1 =
|
|
516
|
-
|
|
515
|
+
if (!(connectionStoreNames_1_1 = _g.sent(), _d = connectionStoreNames_1_1.done, !_d)) return [3 /*break*/, 7];
|
|
516
|
+
_f = connectionStoreNames_1_1.value;
|
|
517
|
+
_b = false;
|
|
518
|
+
resItem = _f;
|
|
517
519
|
modelName = resItem.modelName, item = resItem.item, instance = resItem.instance;
|
|
518
520
|
id = item.id;
|
|
519
521
|
_c = (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__read)((0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.queryByIdStatement)(id, modelName), 2), queryStatement_1 = _c[0], params_1 = _c[1];
|
|
520
522
|
return [4 /*yield*/, this.db.get(queryStatement_1, params_1)];
|
|
521
523
|
case 5:
|
|
522
|
-
fromDB_1 =
|
|
524
|
+
fromDB_1 = _g.sent();
|
|
523
525
|
opType = fromDB_1 === undefined ? _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.OpType.INSERT : _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.OpType.UPDATE;
|
|
524
526
|
saveStatement = fromDB_1 ? (0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.modelUpdateStatement)(instance, modelName) : (0,_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__.modelInsertStatement)(instance, modelName);
|
|
525
527
|
if (id === model.id || opType === _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.OpType.INSERT) {
|
|
526
528
|
saveStatements.add(saveStatement);
|
|
527
529
|
result.push([instance, opType]);
|
|
528
530
|
}
|
|
529
|
-
|
|
531
|
+
_g.label = 6;
|
|
530
532
|
case 6:
|
|
533
|
+
_b = true;
|
|
531
534
|
return [3 /*break*/, 3];
|
|
532
535
|
case 7:
|
|
533
536
|
return [3 /*break*/, 14];
|
|
534
537
|
case 8:
|
|
535
|
-
e_1_1 =
|
|
538
|
+
e_1_1 = _g.sent();
|
|
536
539
|
e_1 = {
|
|
537
540
|
error: e_1_1
|
|
538
541
|
};
|
|
539
542
|
return [3 /*break*/, 14];
|
|
540
543
|
case 9:
|
|
541
|
-
|
|
542
|
-
if (!(
|
|
543
|
-
return [4 /*yield*/,
|
|
544
|
+
_g.trys.push([9,, 12, 13]);
|
|
545
|
+
if (!(!_b && !_d && (_e = connectionStoreNames_1["return"]))) return [3 /*break*/, 11];
|
|
546
|
+
return [4 /*yield*/, _e.call(connectionStoreNames_1)];
|
|
544
547
|
case 10:
|
|
545
|
-
|
|
546
|
-
|
|
548
|
+
_g.sent();
|
|
549
|
+
_g.label = 11;
|
|
547
550
|
case 11:
|
|
548
551
|
return [3 /*break*/, 13];
|
|
549
552
|
case 12:
|
|
@@ -554,7 +557,7 @@ var CommonSQLiteAdapter = /** @class */function () {
|
|
|
554
557
|
case 14:
|
|
555
558
|
return [4 /*yield*/, this.db.batchSave(saveStatements)];
|
|
556
559
|
case 15:
|
|
557
|
-
|
|
560
|
+
_g.sent();
|
|
558
561
|
return [2 /*return*/, result];
|
|
559
562
|
}
|
|
560
563
|
});
|
|
@@ -670,12 +673,12 @@ var CommonSQLiteAdapter = /** @class */function () {
|
|
|
670
673
|
});
|
|
671
674
|
return idPredicate && idPredicate.operand;
|
|
672
675
|
};
|
|
673
|
-
CommonSQLiteAdapter.prototype.queryOne = function (
|
|
674
|
-
|
|
675
|
-
firstOrLast = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.QueryOne.FIRST;
|
|
676
|
-
}
|
|
677
|
-
return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__awaiter)(this, void 0, void 0, function () {
|
|
676
|
+
CommonSQLiteAdapter.prototype.queryOne = function (modelConstructor_1) {
|
|
677
|
+
return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__awaiter)(this, arguments, void 0, function (modelConstructor, firstOrLast) {
|
|
678
678
|
var tableName, _a, queryStatement, params, result, modelInstance;
|
|
679
|
+
if (firstOrLast === void 0) {
|
|
680
|
+
firstOrLast = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__.QueryOne.FIRST;
|
|
681
|
+
}
|
|
679
682
|
return (0,tslib__WEBPACK_IMPORTED_MODULE_3__.__generator)(this, function (_b) {
|
|
680
683
|
switch (_b.label) {
|
|
681
684
|
case 0:
|
|
@@ -881,7 +884,7 @@ var USER = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.utils.USER,
|
|
|
881
884
|
isModelConstructor = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.utils.isModelConstructor;
|
|
882
885
|
var keysFromModel = function keysFromModel(model) {
|
|
883
886
|
return Object.keys(model).map(function (k) {
|
|
884
|
-
return "\""
|
|
887
|
+
return "\"".concat(k, "\"");
|
|
885
888
|
}).join(', ');
|
|
886
889
|
};
|
|
887
890
|
var valuesFromModel = function valuesFromModel(model) {
|
|
@@ -902,7 +905,7 @@ var updateSet = function updateSet(model) {
|
|
|
902
905
|
k = _b[0],
|
|
903
906
|
v = _b[1];
|
|
904
907
|
values.push(prepareValueForDML(v));
|
|
905
|
-
return "\""
|
|
908
|
+
return "\"".concat(k, "\"=?");
|
|
906
909
|
}).join(', ');
|
|
907
910
|
return [paramaterized, values];
|
|
908
911
|
};
|
|
@@ -916,7 +919,7 @@ function prepareValueForDML(value) {
|
|
|
916
919
|
if (Array.isArray(value) || isObjectType) {
|
|
917
920
|
return JSON.stringify(value);
|
|
918
921
|
}
|
|
919
|
-
return ""
|
|
922
|
+
return "".concat(value);
|
|
920
923
|
}
|
|
921
924
|
function getSQLiteType(scalar) {
|
|
922
925
|
switch (scalar) {
|
|
@@ -939,7 +942,7 @@ function getSQLiteType(scalar) {
|
|
|
939
942
|
return 'REAL';
|
|
940
943
|
default:
|
|
941
944
|
var _ = scalar;
|
|
942
|
-
throw new Error("unknown type "
|
|
945
|
+
throw new Error("unknown type ".concat(scalar));
|
|
943
946
|
}
|
|
944
947
|
}
|
|
945
948
|
function generateSchemaStatements(schema) {
|
|
@@ -980,16 +983,16 @@ function modelCreateTableStatement(model, userModel) {
|
|
|
980
983
|
var fields = Object.values(model.fields).reduce(function (acc, field) {
|
|
981
984
|
if ((0,_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.isGraphQLScalarType)(field.type)) {
|
|
982
985
|
if (field.name === 'id') {
|
|
983
|
-
return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
986
|
+
return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(acc), false), ['"id" PRIMARY KEY NOT NULL'], false);
|
|
984
987
|
}
|
|
985
|
-
var columnParam_1 = "\""
|
|
988
|
+
var columnParam_1 = "\"".concat(field.name, "\" ").concat(getSQLiteType(field.type));
|
|
986
989
|
if (field.isRequired) {
|
|
987
990
|
columnParam_1 += ' NOT NULL';
|
|
988
991
|
}
|
|
989
|
-
return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
992
|
+
return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(acc), false), ["".concat(columnParam_1)], false);
|
|
990
993
|
}
|
|
991
994
|
if ((0,_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.isModelFieldType)(field.type)) {
|
|
992
|
-
var columnParam_2 = "\""
|
|
995
|
+
var columnParam_2 = "\"".concat(field.name, "\" TEXT");
|
|
993
996
|
// add targetName as well as field name for BELONGS_TO relations
|
|
994
997
|
if ((0,_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.isTargetNameAssociation)(field.association)) {
|
|
995
998
|
// check if this field has been explicitly defined in the model
|
|
@@ -1000,27 +1003,27 @@ function modelCreateTableStatement(model, userModel) {
|
|
|
1000
1003
|
// if the FK is not explicitly defined in the model, we have to add it here
|
|
1001
1004
|
if (!fkDefinedInModel) {
|
|
1002
1005
|
var required = field.isRequired ? ' NOT NULL' : '';
|
|
1003
|
-
columnParam_2 += ", \""
|
|
1006
|
+
columnParam_2 += ", \"".concat(field.association.targetName, "\" TEXT").concat(required);
|
|
1004
1007
|
}
|
|
1005
1008
|
}
|
|
1006
1009
|
// ignore isRequired param for model fields, since they will not contain
|
|
1007
1010
|
// the related data locally
|
|
1008
|
-
return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
1011
|
+
return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(acc), false), ["".concat(columnParam_2)], false);
|
|
1009
1012
|
}
|
|
1010
1013
|
// default to TEXT
|
|
1011
|
-
var columnParam = "\""
|
|
1014
|
+
var columnParam = "\"".concat(field.name, "\" TEXT");
|
|
1012
1015
|
if (field.isRequired) {
|
|
1013
1016
|
columnParam += ' NOT NULL';
|
|
1014
1017
|
}
|
|
1015
|
-
return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
1018
|
+
return (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(acc), false), ["".concat(columnParam)], false);
|
|
1016
1019
|
}, []);
|
|
1017
1020
|
implicitAuthFields.forEach(function (authField) {
|
|
1018
|
-
fields.push(authField
|
|
1021
|
+
fields.push("".concat(authField, " TEXT"));
|
|
1019
1022
|
});
|
|
1020
1023
|
if (userModel) {
|
|
1021
|
-
fields = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
1024
|
+
fields = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(fields), false), ["\"_version\" INTEGER", "\"_lastChangedAt\" INTEGER", "\"_deleted\" INTEGER"], false);
|
|
1022
1025
|
}
|
|
1023
|
-
var createTableStatement = "CREATE TABLE IF NOT EXISTS \""
|
|
1026
|
+
var createTableStatement = "CREATE TABLE IF NOT EXISTS \"".concat(model.name, "\" (").concat(fields.join(', '), ");");
|
|
1024
1027
|
return createTableStatement;
|
|
1025
1028
|
}
|
|
1026
1029
|
function modelInsertStatement(model, tableName) {
|
|
@@ -1028,18 +1031,18 @@ function modelInsertStatement(model, tableName) {
|
|
|
1028
1031
|
var _a = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(valuesFromModel(model), 2),
|
|
1029
1032
|
paramaterized = _a[0],
|
|
1030
1033
|
values = _a[1];
|
|
1031
|
-
var insertStatement = "INSERT INTO \""
|
|
1034
|
+
var insertStatement = "INSERT INTO \"".concat(tableName, "\" (").concat(keys, ") VALUES (").concat(paramaterized, ")");
|
|
1032
1035
|
return [insertStatement, values];
|
|
1033
1036
|
}
|
|
1034
1037
|
function modelUpdateStatement(model, tableName) {
|
|
1035
1038
|
var _a = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(updateSet(model), 2),
|
|
1036
1039
|
paramaterized = _a[0],
|
|
1037
1040
|
values = _a[1];
|
|
1038
|
-
var updateStatement = "UPDATE \""
|
|
1039
|
-
return [updateStatement, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
1041
|
+
var updateStatement = "UPDATE \"".concat(tableName, "\" SET ").concat(paramaterized, " WHERE id=?");
|
|
1042
|
+
return [updateStatement, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)((0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(values), false), [model.id], false)];
|
|
1040
1043
|
}
|
|
1041
1044
|
function queryByIdStatement(id, tableName) {
|
|
1042
|
-
return ["SELECT * FROM \""
|
|
1045
|
+
return ["SELECT * FROM \"".concat(tableName, "\" WHERE \"id\" = ?"), [id]];
|
|
1043
1046
|
}
|
|
1044
1047
|
/*
|
|
1045
1048
|
Predicates supported by DataStore:
|
|
@@ -1076,9 +1079,9 @@ var logicalOperatorMap = {
|
|
|
1076
1079
|
function buildSpecialNullComparison(field, operator, operand) {
|
|
1077
1080
|
if (operand === null || operand === undefined) {
|
|
1078
1081
|
if (operator === 'eq') {
|
|
1079
|
-
return "\""
|
|
1082
|
+
return "\"".concat(field, "\" IS NULL");
|
|
1080
1083
|
} else if (operator === 'ne') {
|
|
1081
|
-
return "\""
|
|
1084
|
+
return "\"".concat(field, "\" IS NOT NULL");
|
|
1082
1085
|
}
|
|
1083
1086
|
}
|
|
1084
1087
|
// no special null handling required
|
|
@@ -1094,7 +1097,7 @@ var whereConditionFromPredicateObject = function whereConditionFromPredicateObje
|
|
|
1094
1097
|
}
|
|
1095
1098
|
var comparisonOperator = comparisonOperatorMap[operator];
|
|
1096
1099
|
if (comparisonOperator) {
|
|
1097
|
-
return ["\""
|
|
1100
|
+
return ["\"".concat(field, "\" ").concat(comparisonOperator, " ?"), [operand]];
|
|
1098
1101
|
}
|
|
1099
1102
|
var logicalOperatorKey = operator;
|
|
1100
1103
|
var logicalOperator = logicalOperatorMap[logicalOperatorKey];
|
|
@@ -1104,14 +1107,14 @@ var whereConditionFromPredicateObject = function whereConditionFromPredicateObje
|
|
|
1104
1107
|
switch (logicalOperatorKey) {
|
|
1105
1108
|
case 'between':
|
|
1106
1109
|
rightExp = operand; // operand is a 2-tuple
|
|
1107
|
-
statement = ["\""
|
|
1110
|
+
statement = ["\"".concat(field, "\" ").concat(logicalOperator, " ").concat(rightExp.map(function (_) {
|
|
1108
1111
|
return '?';
|
|
1109
|
-
}).join(' AND '), rightExp];
|
|
1112
|
+
}).join(' AND ')), rightExp];
|
|
1110
1113
|
break;
|
|
1111
1114
|
case 'beginsWith':
|
|
1112
1115
|
case 'contains':
|
|
1113
1116
|
case 'notContains':
|
|
1114
|
-
statement = ["instr(\""
|
|
1117
|
+
statement = ["instr(\"".concat(field, "\", ?) ").concat(logicalOperator), [operand]];
|
|
1115
1118
|
break;
|
|
1116
1119
|
default:
|
|
1117
1120
|
var _ = logicalOperatorKey;
|
|
@@ -1125,7 +1128,7 @@ function whereClauseFromPredicate(predicate) {
|
|
|
1125
1128
|
var result = [];
|
|
1126
1129
|
var params = [];
|
|
1127
1130
|
recurse(predicate, result, params);
|
|
1128
|
-
var whereClause = "WHERE "
|
|
1131
|
+
var whereClause = "WHERE ".concat(result.join(' '));
|
|
1129
1132
|
return [whereClause, params];
|
|
1130
1133
|
function recurse(predicate, result, params) {
|
|
1131
1134
|
var e_1, _a;
|
|
@@ -1152,7 +1155,7 @@ function whereClauseFromPredicate(predicate) {
|
|
|
1152
1155
|
break;
|
|
1153
1156
|
default:
|
|
1154
1157
|
var _ = groupType;
|
|
1155
|
-
throw new Error("Invalid "
|
|
1158
|
+
throw new Error("Invalid ".concat(groupType));
|
|
1156
1159
|
}
|
|
1157
1160
|
var groupResult = [];
|
|
1158
1161
|
try {
|
|
@@ -1171,13 +1174,13 @@ function whereClauseFromPredicate(predicate) {
|
|
|
1171
1174
|
if (e_1) throw e_1.error;
|
|
1172
1175
|
}
|
|
1173
1176
|
}
|
|
1174
|
-
result.push((isNegation ? 'NOT' : ''
|
|
1177
|
+
result.push("".concat(isNegation ? 'NOT' : '', "(").concat(groupResult.join(" ".concat(filterType, " ")), ")"));
|
|
1175
1178
|
} else if ((0,_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__.isPredicateObj)(predicate)) {
|
|
1176
1179
|
var _b = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereConditionFromPredicateObject(predicate), 2),
|
|
1177
1180
|
condition = _b[0],
|
|
1178
1181
|
conditionParams = _b[1];
|
|
1179
1182
|
result.push(condition);
|
|
1180
|
-
params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
1183
|
+
params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(conditionParams), false));
|
|
1181
1184
|
}
|
|
1182
1185
|
}
|
|
1183
1186
|
}
|
|
@@ -1192,11 +1195,11 @@ function orderByClauseFromSort(sortPredicate) {
|
|
|
1192
1195
|
var orderByParts = sortPredicate.map(function (_a) {
|
|
1193
1196
|
var field = _a.field,
|
|
1194
1197
|
sortDirection = _a.sortDirection;
|
|
1195
|
-
return "\""
|
|
1198
|
+
return "\"".concat(String(field), "\" ").concat(sortDirectionMap[sortDirection]);
|
|
1196
1199
|
});
|
|
1197
1200
|
// We always sort by _rowid_ last
|
|
1198
|
-
orderByParts.push("_rowid_ "
|
|
1199
|
-
return "ORDER BY "
|
|
1201
|
+
orderByParts.push("_rowid_ ".concat(sortDirectionMap.ASCENDING));
|
|
1202
|
+
return "ORDER BY ".concat(orderByParts.join(', '));
|
|
1200
1203
|
}
|
|
1201
1204
|
function limitClauseFromPagination(limit, page) {
|
|
1202
1205
|
if (page === void 0) {
|
|
@@ -1212,23 +1215,23 @@ function limitClauseFromPagination(limit, page) {
|
|
|
1212
1215
|
return [clause, params];
|
|
1213
1216
|
}
|
|
1214
1217
|
function queryAllStatement(tableName, predicate, sort, limit, page) {
|
|
1215
|
-
var statement = "SELECT * FROM \""
|
|
1218
|
+
var statement = "SELECT * FROM \"".concat(tableName, "\"");
|
|
1216
1219
|
var params = [];
|
|
1217
1220
|
if (predicate && predicate.predicates.length) {
|
|
1218
1221
|
var _a = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereClauseFromPredicate(predicate), 2),
|
|
1219
1222
|
whereClause = _a[0],
|
|
1220
1223
|
whereParams = _a[1];
|
|
1221
|
-
statement += " "
|
|
1222
|
-
params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
1224
|
+
statement += " ".concat(whereClause);
|
|
1225
|
+
params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereParams), false));
|
|
1223
1226
|
}
|
|
1224
1227
|
var orderByClause = orderByClauseFromSort(sort);
|
|
1225
|
-
statement += " "
|
|
1228
|
+
statement += " ".concat(orderByClause);
|
|
1226
1229
|
if (limit) {
|
|
1227
1230
|
var _b = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(limitClauseFromPagination(limit, page), 2),
|
|
1228
1231
|
limitClause = _b[0],
|
|
1229
1232
|
limitParams = _b[1];
|
|
1230
|
-
statement += " "
|
|
1231
|
-
params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
1233
|
+
statement += " ".concat(limitClause);
|
|
1234
|
+
params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(limitParams), false));
|
|
1232
1235
|
}
|
|
1233
1236
|
return [statement, params];
|
|
1234
1237
|
}
|
|
@@ -1237,24 +1240,24 @@ function queryOneStatement(firstOrLast, tableName) {
|
|
|
1237
1240
|
// ORDER BY rowid will no longer work as expected if a customer has
|
|
1238
1241
|
// a field by that name in their schema. We may want to enforce it
|
|
1239
1242
|
// as a reserved keyword in Codegen
|
|
1240
|
-
return ["SELECT * FROM "
|
|
1243
|
+
return ["SELECT * FROM ".concat(tableName, " ORDER BY _rowid_ LIMIT 1"), []];
|
|
1241
1244
|
} else {
|
|
1242
|
-
return ["SELECT * FROM "
|
|
1245
|
+
return ["SELECT * FROM ".concat(tableName, " ORDER BY _rowid_ DESC LIMIT 1"), []];
|
|
1243
1246
|
}
|
|
1244
1247
|
}
|
|
1245
1248
|
function deleteByIdStatement(id, tableName) {
|
|
1246
|
-
var deleteStatement = "DELETE FROM \""
|
|
1249
|
+
var deleteStatement = "DELETE FROM \"".concat(tableName, "\" WHERE \"id\"=?");
|
|
1247
1250
|
return [deleteStatement, [id]];
|
|
1248
1251
|
}
|
|
1249
1252
|
function deleteByPredicateStatement(tableName, predicate) {
|
|
1250
|
-
var statement = "DELETE FROM \""
|
|
1253
|
+
var statement = "DELETE FROM \"".concat(tableName, "\"");
|
|
1251
1254
|
var params = [];
|
|
1252
1255
|
if (predicate && predicate.predicates.length) {
|
|
1253
1256
|
var _a = (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereClauseFromPredicate(predicate), 2),
|
|
1254
1257
|
whereClause = _a[0],
|
|
1255
1258
|
whereParams = _a[1];
|
|
1256
|
-
statement += " "
|
|
1257
|
-
params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.
|
|
1259
|
+
statement += " ".concat(whereClause);
|
|
1260
|
+
params.push.apply(params, (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__spreadArray)([], (0,tslib__WEBPACK_IMPORTED_MODULE_1__.__read)(whereParams), false));
|
|
1258
1261
|
}
|
|
1259
1262
|
return [statement, params];
|
|
1260
1263
|
}
|