Merge pull request #1229 from cpainterwakefield/master

Change to SQL activecode - blocks using the same dburl (on same page) now share same db instance

Author: bnmnetp

runestone/activecode/js/activecode_sql.js

@@ -40,15 +40,13 @@ export default class SQLActiveCode extends ActiveCode {
                 } else {
                     if (allDburls[self.dburl].status == "loading") {
                         allDburls[self.dburl].xWaitFor.done(function () {
-                            self.db = new SQL.Database(
-                                allDburls[self.dburl].db
-                            );
+                            self.db = allDburls[self.dburl].dbObject;
                             $(self.runButton).removeAttr("disabled");
                             $(self.runButton).text(buttonText);
                         });
                         return;
                     }
-                    self.db = new SQL.Database(allDburls[self.dburl].db);
+                    self.db = allDburls[self.dburl].dbObject;
                     $(self.runButton).removeAttr("disabled");
                     $(self.runButton).text(buttonText);
                     return;
@@ -60,6 +58,7 @@ export default class SQLActiveCode extends ActiveCode {
                 xhr.onload = (e) => {
                     var uInt8Array = new Uint8Array(xhr.response);
                     self.db = new SQL.Database(uInt8Array);
+                    allDburls[self.dburl].dbObject = self.db;
                     $(self.runButton).text(buttonText);
                     $(self.runButton).removeAttr("disabled");
                     allDburls[self.dburl].db = uInt8Array;

runestone/activecode/test/_sources/index.rst

@@ -233,6 +233,15 @@ Support for SQL in the browser ?  Yes!
 
     select * from test;
 
+.. activecode:: test_activecode_6b
+    :language: sql
+    :autograde: unittest
+    :dburl: /_static/test.db
+
+    select * from created_table;
+
+    =====
+    assert 0,0 == itworks
 
 .. activecode:: sql3
     :language: sql

runestone/activecode/test/test_activecode.py

@@ -140,6 +140,26 @@ def test_sql_activecode(selenium_utils_get):
     out = selenium_utils_get.driver.find_element_by_id(f"{div_id}_stdout")
     assert "" == out.text.strip()
 
+    div_id = "test_activecode_6"
+    t1 = find_ac(selenium_utils_get, div_id)
+    click_run(selenium_utils_get, t1)
+    ta = t1.find_element_by_class_name("cm-s-default")
+    assert ta
+    selenium_utils_get.driver.execute_script(
+        f"""window.edList['{div_id}'].editor.setValue("CREATE TABLE created_table (x TEXT); INSERT INTO created_table VALUES ('itworks');")"""
+    )
+    click_run(selenium_utils_get, t1)
+
+    div_id = "test_activecode_6b"
+    t2 = find_ac(selenium_utils_get, div_id)
+    # TODO: We don't yet have a way for async operations in ActiveCode constructors to signal when they're complete. So, insert a delay to guesstimate when the async load of the SQL WASM code and other async functions complete.
+    time.sleep(2)
+    click_run(selenium_utils_get, t2)
+    selenium_utils_get.wait.until(EC.text_to_be_present_in_element((By.ID, f"{div_id}_stdout"), "You"))
+    res = selenium_utils_get.driver.find_element_by_id(f"{div_id}_sql_out")
+    assert res
+    out = selenium_utils_get.driver.find_element_by_id(f"{div_id}_stdout")
+    assert "You passed 1 out of 1 tests" in out.text
 
 @pytest.fixture
 def selenium_utils_sf(selenium_utils):