Fix sql.js v1.0 support in browser

michaelbromley · michaelbromley · commit f7bcd8faa7fd · 2019-06-18T10:05:04.000+02:00
diff --git a/src/driver/sqljs/SqljsDriver.ts b/src/driver/sqljs/SqljsDriver.ts
@@ -12,7 +12,8 @@ import {ObjectLiteral} from "../../common/ObjectLiteral";
 
 // This is needed to satisfy the typescript compiler.
 interface Window {
-    SQL: any;
+    SQL?: any;
+    initSqlJs?: any;
     localforage: any;
 }
 declare var window: Window;
@@ -273,7 +274,7 @@ export class SqljsDriver extends AbstractSqliteDriver {
      */
     protected loadDependencies(): void {
         if (PlatformTools.type === "browser") {
-            this.sqlite = window.SQL;
+            this.sqlite = window.SQL || window.initSqlJs;
         }
         else {
             try {
@@ -284,4 +285,4 @@ export class SqljsDriver extends AbstractSqliteDriver {
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ import {ObjectLiteral} from "../../common/ObjectLiteral";`
`12`	`12`
`13`	`13`	`// This is needed to satisfy the typescript compiler.`
`14`	`14`	`interface Window {`
`15`		`- SQL: any;`
	`15`	`+ SQL?: any;`
	`16`	`+ initSqlJs?: any;`
`16`	`17`	`localforage: any;`
`17`	`18`	`}`
`18`	`19`	`declare var window: Window;`
`@@ -273,7 +274,7 @@ export class SqljsDriver extends AbstractSqliteDriver {`
`273`	`274`	`*/`
`274`	`275`	`protected loadDependencies(): void {`
`275`	`276`	`if (PlatformTools.type === "browser") {`
`276`		`- this.sqlite = window.SQL;`
	`277`	`+ this.sqlite = window.SQL \|\| window.initSqlJs;`
`277`	`278`	`}`
`278`	`279`	`else {`
`279`	`280`	`try {`
`@@ -284,4 +285,4 @@ export class SqljsDriver extends AbstractSqliteDriver {`
`284`	`285`	`}`
`285`	`286`	`}`
`286`	`287`	`}`
`287`		`-}`
	`288`	`+}`