fixing conflicts

nshiab · Mar 27, 2024 · 7450330 · 7450330
2 parents 1e05d7b + 46053b1
commit 7450330
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/class/SimpleDB.ts b/src/class/SimpleDB.ts
@@ -7,7 +7,7 @@ import stringToArray from "../helpers/stringToArray.js"
 
 import getDescription from "../methods/getDescription.js"
 import renameColumnQuery from "../methods/renameColumnQuery.js"
-import replaceStringsQuery from "../methods/replaceStringsQuery.js"
+import replaceQuery from "../methods/replaceQuery.js"
 import convertQuery from "../methods/convertQuery.js"
 import roundQuery from "../methods/roundQuery.js"
 import joinQuery from "../methods/joinQuery.js"
@@ -1138,7 +1138,7 @@ export default class SimpleDB {
      *   @param options.regex - A boolean indicating the use of regular expressions for a global replace. See the [RE2 docs](https://github.com/google/re2/wiki/Syntax) for the syntax. Defaults to false.
      * @category Updating data
      */
-    async replaceStrings(
+    async replace(
         table: string,
         columns: string | string[],
         strings: { [key: string]: string },
@@ -1156,7 +1156,7 @@ export default class SimpleDB {
         }
         await queryDB(
             this,
-            replaceStringsQuery(
+            replaceQuery(
                 table,
                 stringToArray(columns),
                 Object.keys(strings),
@@ -1165,7 +1165,7 @@ export default class SimpleDB {
             ),
             mergeOptions(this, {
                 table,
-                method: "replaceStrings()",
+                method: "replace()",
                 parameters: { table, columns, strings, options },
             })
         )

diff --git a/src/methods/replaceStringsQuery.ts → src/methods/replaceQuery.ts b/src/methods/replaceStringsQuery.ts → src/methods/replaceQuery.ts
@@ -1,4 +1,4 @@
-export default function replaceStringsQuery(
+export default function replaceQuery(
     table: string,
     columns: string[],
     oldTexts: string[],

diff --git a/test/unit/methods/replaceStrings.test.ts → test/unit/methods/replace.test.ts b/test/unit/methods/replaceStrings.test.ts → test/unit/methods/replace.test.ts
@@ -1,7 +1,7 @@
 import assert from "assert"
 import SimpleNodeDB from "../../../src/class/SimpleNodeDB.js"
 
-describe("replaceString", () => {
+describe("replace", () => {
     let simpleNodeDB: SimpleNodeDB
     before(async function () {
         simpleNodeDB = new SimpleNodeDB()
@@ -15,7 +15,7 @@ describe("replaceString", () => {
             "test/data/files/employees.csv",
         ])
 
-        await simpleNodeDB.replaceStrings(
+        await simpleNodeDB.replace(
             "employeesOneColumn",
             ["Name", "End-of_year-BONUS?"],
             { "%": "" }
@@ -440,7 +440,7 @@ describe("replaceString", () => {
             "test/data/files/employees.csv",
         ])
 
-        await simpleNodeDB.replaceStrings(
+        await simpleNodeDB.replace(
             "employeesSubstring",
             ["Name", "End-of_year-BONUS?"],
             { a: "@" }
@@ -865,7 +865,7 @@ describe("replaceString", () => {
             "test/data/files/employees.csv",
         ])
 
-        await simpleNodeDB.replaceStrings(
+        await simpleNodeDB.replace(
             "employeesEntireString",
             ["Name", "End-of_year-BONUS?"],
             { "Grant, Douglas": "BOSS" },
@@ -1291,7 +1291,7 @@ describe("replaceString", () => {
             "test/data/files/employees.csv",
         ])
 
-        await simpleNodeDB.replaceStrings(
+        await simpleNodeDB.replace(
             "employeesOneColumnMultipleTexts",
             ["End-of_year-BONUS?"],
             { "%": "", ",": "." }
@@ -1718,7 +1718,7 @@ describe("replaceString", () => {
             "test/data/files/employees.csv",
         ])
 
-        await simpleNodeDB.replaceStrings(
+        await simpleNodeDB.replace(
             "employeesMultipleColumns",
             ["Name", "End-of_year-BONUS?"],
             { ",": " => " }
@@ -2143,7 +2143,7 @@ describe("replaceString", () => {
             "test/data/files/employees.csv",
         ])
 
-        await simpleNodeDB.replaceStrings(
+        await simpleNodeDB.replace(
             "employeesMultipleColumnsMultipleTexts",
             ["Name", "End-of_year-BONUS?"],
             { "%": "", ",": "." }
@@ -2569,7 +2569,7 @@ describe("replaceString", () => {
             "test/data/files/employees.csv",
         ])
 
-        await simpleNodeDB.replaceStrings(
+        await simpleNodeDB.replace(
             "employeesMultipleColumnsSingleQuote",
             ["Name"],
             { ",": "'" }
@@ -2995,7 +2995,7 @@ describe("replaceString", () => {
             "test/data/files/employees.csv",
         ])
 
-        await simpleNodeDB.replaceStrings(
+        await simpleNodeDB.replace(
             "employeesMultipleColumnsRegex",
             "Hire date",
             { "\\d+": "-" },