[Dependence] Remove angular-sql-storage dependencie

Author: ArnaudSpanneut

README.md

@@ -49,15 +49,17 @@ You can helped by [angular-sql-storage](https://github.com/SimpliField/angular-s
 **Example**
 
 ```js
-var user = new sqlStorageService(name, options);
+var user = new sqlStorageService(name, database, options);
 ```
 
 **Params**
 - `name` [String] - Table name
+- `database` [Promise] - Promise that return SQL database instance.
 - `options` [Object] - Query options
   - `indexed_fields` [Array] - Fields referenced in database.
 ```js
-var user = new sqlStorageService('user', {
+var databaseInstance = $window.openDatabase('test', '1', 'database', 200000);
+var user = new sqlStorageService('user', $q.when(databaseInstance), {
   indexed_fields: ['name'],
 });
 ```

angular-sql-query.js

@@ -2,15 +2,13 @@
   'use strict';
 
   angular
-    .module('sf.sqlQuery', [
-      'sf.sqlStorage',
-    ])
+    .module('sf.sqlQuery', [])
     .factory('SqlQueryService', SqlQueryService);
 
   // @ngInject
-  function SqlQueryService($log, $q, sqlStorageService) {
+  function SqlQueryService($log, $q) {
 
-    function SqlQuery(name, options) {
+    function SqlQuery(name, database, options) {
       var indexedFields;
       var fields;
       var questionsMark;
@@ -29,11 +27,13 @@
         questionsMark: questionsMark,
       };
 
-      this.backUpDB = function backUpDB() {
-        return sqlStorageService.initTables();
-      };
+      this.backUpDB = backUpDB;
 
       return this;
+
+      function backUpDB() {
+        return database;
+      }
     }
 
     // Methods
@@ -231,11 +231,29 @@
     //    HELPERS
     //
     //-----------------
+    /**
+     * Make SQLite request
+     *
+     * @param  {String} query  - SQL Query
+     * @param  {[Array]} datas - Datas for querying
+     * @return {Promise}       - Request result
+     */
     function execute(query, datas) {
-      return this.backUpDB().then(function() {
-        return sqlStorageService.execute(query, datas);
+      var q = $q.defer();
+
+      this.backUpDB().then(function(database) {
+        database.transaction(function(tx) {
+          tx.executeSql(query, datas, function(sqlTx, result) {
+            q.resolve(result);
+          }, function(transaction, error) {
+            q.reject(error);
+          });
+        });
       });
+
+      return q.promise;
     }
+
     /**
      * Construct the method to delete datas
      *
@@ -370,5 +388,5 @@
 
     return SqlQuery;
   }
-  SqlQueryService.$inject = ["$log", "$q", "sqlStorageService"];
+  SqlQueryService.$inject = ["$log", "$q"];
 }());

angular-sql-query.min.js

@@ -19,10 +19,10 @@
     "gulpfile.js"
   ],
   "devDependencies": {
-    "angular-mocks": ">=1.2.26 <=1.5"
+    "angular-mocks": ">=1.2.26 <=1.5",
+    "es5-shim": "~4.1.11"
   },
   "dependencies": {
-    "angular": ">=1.2.26 <=1.5",
-    "angular-sql-storage": "~0.0.3"
+    "angular": ">=1.2.26 <=1.5"
   }
 }

bower.json

@@ -18,10 +18,9 @@
 
       // list of files / patterns to load in the browser
       files: [
+        'bower_components/es5-shim/es5-shim.js',
         'bower_components/angular/angular.js',
         'bower_components/angular-mocks/angular-mocks.js',
-        'bower_components/angular-sql-storage/angular-sql-storage.js',
-        'bower_components/angular-local-storage/dist/angular-local-storage.js',
         'angular-sql-query.js',
         'src/*.spec.js',
       ],

karma.conf.js

@@ -2,15 +2,13 @@
   'use strict';
 
   angular
-    .module('sf.sqlQuery', [
-      'sf.sqlStorage',
-    ])
+    .module('sf.sqlQuery', [])
     .factory('SqlQueryService', SqlQueryService);
 
   // @ngInject
-  function SqlQueryService($log, $q, sqlStorageService) {
+  function SqlQueryService($log, $q) {
 
-    function SqlQuery(name, options) {
+    function SqlQuery(name, database, options) {
       var indexedFields;
       var fields;
       var questionsMark;
@@ -29,11 +27,13 @@
         questionsMark: questionsMark,
       };
 
-      this.backUpDB = function backUpDB() {
-        return sqlStorageService.initTables();
-      };
+      this.backUpDB = backUpDB;
 
       return this;
+
+      function backUpDB() {
+        return database;
+      }
     }
 
     // Methods
@@ -231,11 +231,29 @@
     //    HELPERS
     //
     //-----------------
+    /**
+     * Make SQLite request
+     *
+     * @param  {String} query  - SQL Query
+     * @param  {[Array]} datas - Datas for querying
+     * @return {Promise}       - Request result
+     */
     function execute(query, datas) {
-      return this.backUpDB().then(function() {
-        return sqlStorageService.execute(query, datas);
+      var q = $q.defer();
+
+      this.backUpDB().then(function(database) {
+        database.transaction(function(tx) {
+          tx.executeSql(query, datas, function(sqlTx, result) {
+            q.resolve(result);
+          }, function(transaction, error) {
+            q.reject(error);
+          });
+        });
       });
+
+      return q.promise;
     }
+
     /**
      * Construct the method to delete datas
      *