replace access_mode completely with boolean

Keenan Gugeler · Riolku · commit 9e9ef1e45bed · 2023-11-13T10:16:42.000-05:00
Everywhere now uses a `readOnly` boolean instead of the AccessMode enum.
diff --git a/src_cpp/include/node_database.h b/src_cpp/include/node_database.h
@@ -25,7 +25,7 @@ class NodeDatabase : public Napi::ObjectWrap<NodeDatabase> {
     std::string databasePath;
     size_t bufferPoolSize;
     bool enableCompression;
-    kuzu::common::AccessMode accessMode;
+    bool readOnly;
     std::shared_ptr<Database> database;
 };
 
diff --git a/src_cpp/node_database.cpp b/src_cpp/node_database.cpp
@@ -19,7 +19,7 @@ NodeDatabase::NodeDatabase(const Napi::CallbackInfo& info) : Napi::ObjectWrap<No
     databasePath = info[0].ToString();
     bufferPoolSize = info[1].As<Napi::Number>().Int64Value();
     enableCompression = info[2].As<Napi::Boolean>().Value();
-    accessMode = static_cast<kuzu::common::AccessMode>(info[3].As<Napi::Number>().Int32Value());
+    readOnly = info[3].As<Napi::Boolean>().Value();
 }
 
 Napi::Value NodeDatabase::InitAsync(const Napi::CallbackInfo& info) {
@@ -41,7 +41,7 @@ void NodeDatabase::InitCppDatabase() {
     if (!enableCompression) {
         systemConfig.enableCompression = enableCompression;
     }
-    systemConfig.accessMode = accessMode;
+    systemConfig.readOnly = readOnly;
     this->database = std::make_shared<Database>(databasePath, systemConfig);
 }
 
diff --git a/src_js/access_mode.js b/src_js/access_mode.js
diff --git a/src_js/database.js b/src_js/database.js
@@ -2,7 +2,6 @@
 
 const KuzuNative = require("./kuzujs.node");
 const LoggingLevel = require("./logging_level.js");
-const AccessMode = require("./access_mode.js");
 
 class Database {
   /**
@@ -14,7 +13,7 @@ class Database {
    * @param {String} databasePath path to the database file.
    * @param {Number} bufferManagerSize size of the buffer manager in bytes.
    * @param {Boolean} enableCompression whether to enable compression.
-   * @param {Boolean} readOnly if true, access mode is set to `READ_ONLY`; otherwise, set to `READ_WRITE`.
+   * @param {Boolean} readOnly if true, database will be opened in read-only mode.
    */
   constructor(
     databasePath,
@@ -29,15 +28,11 @@ class Database {
       throw new Error("Buffer manager size must be a positive integer.");
     }
     bufferManagerSize = Math.floor(bufferManagerSize);
-    accessMode = AccessMode.READ_WRITE;
-    if (readOnly) {
-      accessMode = AccessMode.READ_ONLY;
-    }
     this._database = new KuzuNative.NodeDatabase(
       databasePath,
       bufferManagerSize,
       enableCompression,
-      accessMode
+      readOnly,
     );
     this._isInitialized = false;
     this._initPromise = null;
diff --git a/src_js/index.js b/src_js/index.js
@@ -1,14 +1,12 @@
 "use strict";
 
-const AccessMode = require("./access_mode.js");
 const Connection = require("./connection.js");
 const Database = require("./database.js");
 const LoggingLevel = require("./logging_level.js");
 const PreparedStatement = require("./prepared_statement.js");
 const QueryResult = require("./query_result.js");
 
 module.exports = {
-  AccessMode,
   Connection,
   Database,
   LoggingLevel,
diff --git a/test/test_database.js b/test/test_database.js
@@ -65,8 +65,8 @@ describe("Database constructor", function () {
     const testDbReadOnly = new kuzu.Database(
       tmpDbPath,
       1 << 28 /* 256MB */,
-      true,
-      kuzu.AccessMode.READ_ONLY
+      true, /* compression */
+      true, /* readOnly */
     );
     assert.exists(testDbReadOnly);
     assert.equal(testDbReadOnly.constructor.name, "Database");
@@ -91,7 +91,7 @@ describe("Database constructor", function () {
     } catch (e) {
       assert.equal(
         e.message,
-        "Cannot execute write operations in a read-only access mode database!"
+        "Cannot execute write operations in a read-only database!"
       );
     }
   });

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ NodeDatabase::NodeDatabase(const Napi::CallbackInfo& info) : Napi::ObjectWrap<No`
`19`	`19`	`databasePath = info[0].ToString();`
`20`	`20`	`bufferPoolSize = info[1].As<Napi::Number>().Int64Value();`
`21`	`21`	`enableCompression = info[2].As<Napi::Boolean>().Value();`
`22`		`- accessMode = static_cast<kuzu::common::AccessMode>(info[3].As<Napi::Number>().Int32Value());`
	`22`	`+ readOnly = info[3].As<Napi::Boolean>().Value();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`Napi::Value NodeDatabase::InitAsync(const Napi::CallbackInfo& info) {`
`@@ -41,7 +41,7 @@ void NodeDatabase::InitCppDatabase() {`
`41`	`41`	`if (!enableCompression) {`
`42`	`42`	`systemConfig.enableCompression = enableCompression;`
`43`	`43`	`}`
`44`		`- systemConfig.accessMode = accessMode;`
	`44`	`+ systemConfig.readOnly = readOnly;`
`45`	`45`	`this->database = std::make_shared<Database>(databasePath, systemConfig);`
`46`	`46`	`}`
`47`	`47`