Merge remote-tracking branch 'upstream/master'

coresmart · Nov 9, 2011 · 7d7760f · 7d7760f
2 parents 1a20f3f + 285e124
commit 7d7760f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/persistence.migrations.js b/lib/persistence.migrations.js
@@ -217,12 +217,12 @@ if(!window.persistence) { // persistence.js not loaded!
       this.action(function(tx, nextCommand){
         var sql = 'select sql from sqlite_master where type = "table" and name == "'+tableName+'"';
         tx.executeSql(sql, null, function(result){
-          var columns = new RegExp("CREATE TABLE \\w+ \\((.+)\\)").exec(result[0].sql)[1].split(', ');
+          var columns = new RegExp("CREATE TABLE `\\w+` |\\w+ \\((.+)\\)").exec(result[0].sql)[1].split(', ');
           var selectColumns = [];
           var columnsSql = [];
 
           for (var i = 0; i < columns.length; i++) {
-            var colName = new RegExp("(\\w+) .+").exec(columns[i])[1];
+            var colName = new RegExp("((`\\w+`)|(\\w+)) .+").exec(columns[i])[1];
             if (colName == columnName) continue;
 
             columnsSql.push(columns[i]);