Merge pull request #891 from crazyserver/MOBILE-1666

Mobile 1666

Author: jleyva

upgrade.txt

@@ -15,6 +15,7 @@ information provided here is intended especially for developers.
         or
     ionic state restore
  * mm-rich-text-editor now admits a new parameter adjust-height (default: true). It admits an HTML DOM Id string or boolean. Specifying it will adjust height of the editor to the selected element. If true it will adjust to the whole page and false will use height parameter instead.
+ * Generators on stores are deprecated. Using generators will make Android < 4.4 fail. Use keyPath instead. They will be automatically generated if needed. DB Functions query, update and where are not allowed using compoung indexes see JSdoc DB functions on db.js for more info.
 
 === 3.2 ===
 

www/addons/mod/forum/services/forum_offline.js

@@ -36,11 +36,8 @@ angular.module('mm.addons.mod_forum')
                     name: 'timecreated'
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'forumAndUser',
-                    generator: function(obj) {
-                        return [obj.forumid, obj.userid];
-                    }
+                    keyPath: ['forumid', 'userid']
                 }
             ]
         },
@@ -61,18 +58,12 @@ angular.module('mm.addons.mod_forum')
                     name: 'timecreated'
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'discussionAndUser',
-                    generator: function(obj) {
-                        return [obj.discussionid, obj.userid];
-                    }
+                    keyPath: ['discussionid', 'userid']
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'forumAndUser',
-                    generator: function(obj) {
-                        return [obj.forumid, obj.userid];
-                    }
+                    keyPath: ['forumid', 'userid']
                 }
             ]
         }

www/addons/mod/glossary/services/glossary_offline.js

@@ -32,11 +32,8 @@ angular.module('mm.addons.mod_glossary')
                     name: 'userid'
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'glossaryAndUser',
-                    generator: function(obj) {
-                        return [obj.glossaryid, obj.userid];
-                    }
+                    keyPath: ['glossaryid', 'userid']
                 }
             ]
         }

www/addons/mod/quiz/services/quiz_offline.js

@@ -40,11 +40,8 @@ angular.module('mm.addons.mod_quiz')
                     name: 'finished'
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'quizAndUser',
-                    generator: function(obj) {
-                        return [obj.quizid, obj.userid];
-                    }
+                    keyPath: ['quizid', 'userid']
                 }
             ]
         }

www/addons/mod/scorm/services/scorm_offline.js

@@ -39,11 +39,8 @@ angular.module('mm.addons.mod_scorm')
                     name: 'timemodified'
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'scormAndUser',
-                    generator: function(obj) {
-                        return [obj.scormid, obj.userid];
-                    }
+                    keyPath: ['scormid', 'userid']
                 }
             ]
         },
@@ -70,18 +67,12 @@ angular.module('mm.addons.mod_scorm')
                     name: 'synced'
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'scormUserAttempt',
-                    generator: function(obj) {
-                        return [obj.scormid, obj.userid, obj.attempt];
-                    }
+                    keyPath: ['scormid', 'userid', 'attempt']
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'scormUserAttemptSynced',
-                    generator: function(obj) {
-                        return [obj.scormid, obj.userid, obj.attempt, obj.synced];
-                    }
+                    keyPath: ['scormid', 'userid', 'attempt', 'synced']
                 }
             ]
         }
@@ -430,16 +421,18 @@ angular.module('mm.addons.mod_scorm')
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
 
-            var where;
+            var fileName, where;
 
             if (excludeSynced && excludeNotSynced) {
                 return $q.when([]);
             } else if (excludeSynced || excludeNotSynced) {
-                where = ['scormUserAttemptSynced', '=', [scormId, userId, attempt, excludeNotSynced ? 1 : 0]];
+                fileName = 'scormUserAttemptSynced';
+                where = [scormId, userId, attempt, excludeNotSynced ? 1 : 0];
             } else {
-                where = ['scormUserAttempt', '=', [scormId, userId, attempt]];
+                fileName = 'scormUserAttempt';
+                where = [scormId, userId, attempt];
             }
-            return site.getDb().query(mmaModScormOfflineTracksStore, where);
+            return site.getDb().whereEqual(mmaModScormOfflineTracksStore, fieldName, where);
         });
     };
 

www/core/components/question/services/question.js

@@ -42,18 +42,12 @@ angular.module('mm.core.question')
                     name: 'state'
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'componentAndAttempt',
-                    generator: function(obj) {
-                        return [obj.component, obj.attemptid];
-                    }
+                    keyPath: ['component', 'attemptid']
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'componentAndComponentId',
-                    generator: function(obj) {
-                        return [obj.component, obj.componentId];
-                    }
+                    keyPath: ['component', 'componentId']
                 }
             ]
         },
@@ -80,25 +74,16 @@ angular.module('mm.core.question')
                     name: 'questionslot'
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'componentAndAttempt',
-                    generator: function(obj) {
-                        return [obj.component, obj.attemptid];
-                    }
+                    keyPath: ['component', 'attemptid']
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'componentAndComponentId',
-                    generator: function(obj) {
-                        return [obj.component, obj.componentId];
-                    }
+                    keyPath: ['component', 'componentId']
                 },
                 {
-                    // Not using compound indexes because they seem to have issues with where().
                     name: 'componentAndAttemptAndQuestion',
-                    generator: function(obj) {
-                        return [obj.component, obj.attemptid, obj.questionslot];
-                    }
+                    keyPath: ['component', 'attemptid', 'questionslot']
                 }
             ]
         }