From 53a20c4353c3407876fc91bca0ebedc1ce49a887 Mon Sep 17 00:00:00 2001 From: seb Date: Sun, 20 Sep 2026 13:51:01 +0200 Subject: [PATCH] refactor: introduce database provider abstraction, isolate MSSQL layer - Add provider contract (src/providers/provider.js): query() -> {rows, rowsAffected, insertId}, callback transaction(fn), exec() for stored procs, initialize/purge lifecycle - Add MssqlProvider (src/providers/mssql/index.js) wrapping an mssql ConnectionPool with normalized results, tx commit/rollback and constraint-error classifiers (unique 2627/2601, FK 547) - LibDashStore constructor now takes a provider instead of a pool (breaking); adds LibDashStore.create() async factory; keeps pool as transitional bridge until store modules are converted (see TODO.md) - Move MSSQL-specific code into the provider: src/sql/* -> src/providers/mssql/queries/*, src/schema.js -> src/providers/mssql/schema.js, purge SQL -> purgeSql.js - Update scripts, generate-schema-graph.js and package.json exports (./providers/mssql, ./providers/provider) - Add TODO.md with the remaining provider/SQLite migration plan No SQL or behavioral changes. --- TODO.md | 125 +++++++++++++++++ generate-schema-graph.js | 2 +- package.json | 4 +- scripts/init-schema.js | 2 +- scripts/purge-db.js | 2 +- scripts/reset-db.js | 4 +- scripts/test-api.js | 3 +- src/index.js | 30 ++++- src/providers/mssql/index.js | 126 ++++++++++++++++++ .../purge.js => providers/mssql/purgeSql.js} | 0 .../mssql/queries}/article.js | 0 .../mssql/queries}/articleDelete.js | 0 .../mssql/queries}/articleDetail.js | 0 .../mssql/queries}/articlehistory.js | 0 .../mssql/queries}/articlepic.js | 0 .../mssql/queries}/articlesupplier.js | 0 .../mssql/queries}/articletext.js | 0 src/{sql => providers/mssql/queries}/brand.js | 0 .../mssql/queries}/category.js | 0 .../mssql/queries}/categoryarticle.js | 0 .../mssql/queries}/categorypic.js | 0 .../mssql/queries}/categorytext.js | 0 .../mssql/queries}/company.js | 0 .../mssql/queries}/companysetting.js | 0 .../mssql/queries}/companyuser.js | 0 .../mssql/queries}/customergroup.js | 0 .../mssql/queries}/delivery.js | 0 .../mssql/queries}/entity.js | 0 .../mssql/queries}/entityaddress.js | 0 .../mssql/queries}/entitycontact.js | 0 .../mssql/queries}/entityhistory.js | 0 .../mssql/queries}/google_auth.js | 0 .../mssql/queries}/language.js | 0 .../mssql/queries}/manifestDoc.js | 0 .../mssql/queries}/manifestattachment.js | 0 .../mssql/queries}/numbers.js | 0 src/{sql => providers/mssql/queries}/pic.js | 0 .../mssql/queries}/posterminal.js | 0 src/{sql => providers/mssql/queries}/price.js | 0 src/{sql => providers/mssql/queries}/tax.js | 0 src/{sql => providers/mssql/queries}/unit.js | 0 .../mssql/queries}/unittext.js | 0 src/{ => providers/mssql}/schema.js | 0 src/providers/provider.js | 40 ++++++ src/store/article/addImage.js | 4 +- src/store/article/createUnderParent.js | 8 +- src/store/article/delete.js | 2 +- src/store/article/deleteImage.js | 2 +- src/store/article/getBySku.js | 2 +- src/store/article/getHistoryBySku.js | 2 +- src/store/article/importRows.js | 16 +-- src/store/article/listExport.js | 2 +- src/store/article/listSearchIndex.js | 2 +- src/store/article/orderImages.js | 2 +- src/store/article/queryBySku.js | 2 +- src/store/article/resolveArticleBySku.js | 2 +- src/store/article/setBrandIdBySku.js | 2 +- src/store/article/setCategoryIdsBySku.js | 2 +- src/store/article/setEansBySku.js | 2 +- src/store/article/setFatherBySku.js | 4 +- src/store/article/setPricesBySku.js | 2 +- src/store/article/setWeightBySku.js | 2 +- src/store/article/updateBySku.js | 10 +- src/store/articlesupplier/create.js | 4 +- src/store/articlesupplier/delete.js | 2 +- src/store/articlesupplier/helpers.js | 4 +- src/store/articlesupplier/listByArticleSku.js | 2 +- .../articlesupplier/listByEntityAndSkus.js | 2 +- src/store/articlesupplier/order.js | 2 +- src/store/articlesupplier/update.js | 4 +- src/store/brand/delete.js | 2 +- src/store/brand/list.js | 2 +- src/store/brand/upsert.js | 2 +- src/store/category/addImage.js | 4 +- src/store/category/createUnderParent.js | 4 +- src/store/category/delete.js | 2 +- src/store/category/deleteImage.js | 2 +- src/store/category/ensureByPath.js | 4 +- src/store/category/getTreeForCompany.js | 2 +- src/store/category/move.js | 2 +- src/store/category/order.js | 2 +- src/store/category/queryCategoryArticles.js | 2 +- src/store/category/rename.js | 2 +- src/store/category/resolveCategoryAccess.js | 2 +- src/store/company/create.js | 10 +- src/store/company/delete.js | 2 +- src/store/company/getById.js | 2 +- src/store/company/getByName.js | 2 +- src/store/company/list.js | 2 +- src/store/company/update.js | 2 +- src/store/companysetting/get.js | 2 +- src/store/companysetting/list.js | 2 +- src/store/companysetting/set.js | 2 +- src/store/companyuser/add.js | 2 +- src/store/companyuser/delete.js | 2 +- src/store/companyuser/getByEmail.js | 2 +- src/store/companyuser/resolveCompanyAccess.js | 2 +- .../resolveSelectedCompanyAccess.js | 2 +- src/store/customergroup/create.js | 4 +- src/store/customergroup/delete.js | 2 +- src/store/customergroup/list.js | 2 +- src/store/customergroup/order.js | 2 +- .../resolveCustomerGroupAccess.js | 2 +- src/store/customergroup/update.js | 4 +- src/store/delivery/attachments.js | 2 +- src/store/delivery/create.js | 2 +- src/store/delivery/delete.js | 2 +- src/store/delivery/helpers.js | 2 +- src/store/delivery/list.js | 2 +- src/store/delivery/update.js | 2 +- src/store/delivery/writeLines.js | 2 +- src/store/entity/create.js | 4 +- src/store/entity/delete.js | 2 +- src/store/entity/getById.js | 2 +- src/store/entity/isNumberFree.js | 2 +- src/store/entity/list.js | 2 +- src/store/entity/resolveEntityAccess.js | 2 +- src/store/entity/update.js | 4 +- src/store/entityaddress/create.js | 2 +- src/store/entityaddress/delete.js | 2 +- src/store/entityaddress/list.js | 2 +- src/store/entityaddress/update.js | 2 +- src/store/entitycontact/create.js | 2 +- src/store/entitycontact/delete.js | 2 +- src/store/entitycontact/list.js | 2 +- src/store/entitycontact/update.js | 2 +- src/store/google_auth/add.js | 2 +- src/store/google_auth/getByEmail.js | 2 +- src/store/google_auth/getById.js | 2 +- src/store/google_auth/listAllowedEmails.js | 2 +- src/store/google_auth/removeAllowedEmail.js | 2 +- src/store/google_auth/setProfile.js | 2 +- src/store/google_auth/setSelectedCompany.js | 2 +- src/store/initialize.js | 6 +- src/store/lang/create.js | 2 +- src/store/lang/delete.js | 2 +- src/store/lang/getByIso639.js | 2 +- src/store/lang/list.js | 2 +- src/store/manifestDoc/helpers.js | 4 +- src/store/manifestLines.js | 2 +- src/store/manifestattachment/add.js | 2 +- src/store/manifestattachment/getById.js | 2 +- .../manifestattachment/listByManifestId.js | 2 +- src/store/manifestattachment/order.js | 2 +- src/store/manifestattachment/remove.js | 2 +- .../resolveManifestAccess.js | 2 +- src/store/numbers/list.js | 2 +- src/store/numbers/nextNumber.js | 2 +- src/store/numbers/peekNumber.js | 2 +- src/store/numbers/update.js | 2 +- src/store/order/create.js | 2 +- src/store/order/delete.js | 2 +- src/store/order/getById.js | 2 +- src/store/order/list.js | 2 +- src/store/order/update.js | 2 +- src/store/pic/getImageByHash.js | 2 +- src/store/pic/getThumbByHash.js | 2 +- src/store/pic/resolvePicAccess.js | 2 +- src/store/posterminal/delete.js | 2 +- .../posterminal/getCategoryPosterminalIds.js | 2 +- src/store/posterminal/list.js | 2 +- src/store/posterminal/setOff.js | 2 +- src/store/posterminal/setOffAll.js | 2 +- src/store/posterminal/setOn.js | 2 +- src/store/posterminal/setOnAll.js | 4 +- src/store/posterminal/upsert.js | 2 +- src/store/purge.js | 6 +- src/store/quote/create.js | 2 +- src/store/quote/delete.js | 2 +- src/store/quote/getById.js | 2 +- src/store/quote/list.js | 2 +- src/store/quote/update.js | 2 +- src/store/supplier/create.js | 4 +- src/store/supplier/delete.js | 2 +- src/store/supplier/ensureLieferantenGroup.js | 4 +- src/store/supplier/list.js | 2 +- src/store/supplier/update.js | 4 +- src/store/tax/create.js | 2 +- src/store/tax/getByRate.js | 2 +- src/store/tax/list.js | 2 +- src/store/unit/delete.js | 2 +- src/store/unit/ensureDefault.js | 4 +- src/store/unit/list.js | 2 +- src/store/unit/upsert.js | 4 +- 184 files changed, 508 insertions(+), 192 deletions(-) create mode 100644 TODO.md create mode 100644 src/providers/mssql/index.js rename src/{sql/purge.js => providers/mssql/purgeSql.js} (100%) rename src/{sql => providers/mssql/queries}/article.js (100%) rename src/{sql => providers/mssql/queries}/articleDelete.js (100%) rename src/{sql => providers/mssql/queries}/articleDetail.js (100%) rename src/{sql => providers/mssql/queries}/articlehistory.js (100%) rename src/{sql => providers/mssql/queries}/articlepic.js (100%) rename src/{sql => providers/mssql/queries}/articlesupplier.js (100%) rename src/{sql => providers/mssql/queries}/articletext.js (100%) rename src/{sql => providers/mssql/queries}/brand.js (100%) rename src/{sql => providers/mssql/queries}/category.js (100%) rename src/{sql => providers/mssql/queries}/categoryarticle.js (100%) rename src/{sql => providers/mssql/queries}/categorypic.js (100%) rename src/{sql => providers/mssql/queries}/categorytext.js (100%) rename src/{sql => providers/mssql/queries}/company.js (100%) rename src/{sql => providers/mssql/queries}/companysetting.js (100%) rename src/{sql => providers/mssql/queries}/companyuser.js (100%) rename src/{sql => providers/mssql/queries}/customergroup.js (100%) rename src/{sql => providers/mssql/queries}/delivery.js (100%) rename src/{sql => providers/mssql/queries}/entity.js (100%) rename src/{sql => providers/mssql/queries}/entityaddress.js (100%) rename src/{sql => providers/mssql/queries}/entitycontact.js (100%) rename src/{sql => providers/mssql/queries}/entityhistory.js (100%) rename src/{sql => providers/mssql/queries}/google_auth.js (100%) rename src/{sql => providers/mssql/queries}/language.js (100%) rename src/{sql => providers/mssql/queries}/manifestDoc.js (100%) rename src/{sql => providers/mssql/queries}/manifestattachment.js (100%) rename src/{sql => providers/mssql/queries}/numbers.js (100%) rename src/{sql => providers/mssql/queries}/pic.js (100%) rename src/{sql => providers/mssql/queries}/posterminal.js (100%) rename src/{sql => providers/mssql/queries}/price.js (100%) rename src/{sql => providers/mssql/queries}/tax.js (100%) rename src/{sql => providers/mssql/queries}/unit.js (100%) rename src/{sql => providers/mssql/queries}/unittext.js (100%) rename src/{ => providers/mssql}/schema.js (100%) create mode 100644 src/providers/provider.js diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..d94d4ef --- /dev/null +++ b/TODO.md @@ -0,0 +1,125 @@ +# TODO — Database provider reorganization + +Milestones 1–3 are done (provider contract, MSSQL provider, repo reorg). +Everything below is outstanding. + +## 1. Convert store modules to the provider API (per area, keep behavior) +Replace raw `pool` usage in `src/store/**` with `provider.query()` / +`provider.transaction()` / `provider.exec()` and the normalized result shape +(`{ rows, rowsAffected, insertId }` instead of `recordset` / `rowsAffected[]`). +For every module: +- [ ] `pool.request().input(...).query(SQL)` → `provider.query(SQL, params)` +- [ ] `pool.transaction(); begin; commit; catch rollback` → `provider.transaction(async (tx) => { ... })` +- [ ] `result.recordset` → `result.rows`; `result.rowsAffected[0]` → `result.rowsAffected` +- [ ] `request.js` helper (`(tx ?? pool).request()`) becomes obsolete — delete when unused +- [ ] `recordset[0].id` after `OUTPUT INSERTED.id` → keep, but prefer `insertId` where trivial + +Conversion order (bottom-up by dependency): +- [ ] `lang`, `tax` (leaf helpers, used by company create) +- [ ] `google_auth` +- [ ] `companyuser` (resolveCompanyAccess / resolveSelectedCompanyAccess first) +- [ ] `company`, `companysetting` +- [ ] `customergroup`, `entity`, `entityaddress`, `entitycontact`, `entityhistory` +- [ ] `unit` (incl. `ensureDefault`), `brand`, `supplier` +- [ ] `numbers` (see §2 — stored procs!) +- [ ] `category` (recursive CTEs!) +- [ ] `article` + articletext/articlepic/articleean/price/articlehistory +- [ ] `articlesupplier` +- [ ] `quote`, `order`, `delivery` (shared manifest helpers: `manifestLines`, `manifestDoc`, `manifestattachment`) +- [ ] `posterminal`, `pic` +- [ ] `initialize.js`, `purge.js` final wiring (drop `provider.pool` fallback from `index.js`) +- [ ] Delete `src/store/request.js` once no module uses it + +## 2. Replace MSSQL stored procedures (blocker for SQLite) +- [ ] `numbers.nextNumber` uses proc `getnextnumberwithprefixandpadding` (output param) +- [ ] `numbers.peekNumber` uses proc `peeknextnumberwithprefixandpadding` (output param) +- [ ] Implement both in plain JS inside the store layer: `SELECT next/prefix/padding`, + compute `prefix + padded next`, `UPDATE numbers SET next = next + 1 WHERE ...`. + Must stay atomic: use `provider.transaction()` with row locking semantics + (MSSQL: `WITH (UPDLOCK, ROWLOCK)` in the SELECT; SQLite: within its write tx). +- [ ] Drop the proc definitions from schema/init scripts (`scripts/init-schema.js`). + +## 3. provider contract additions / hygiene +- [ ] Add `isUniqueConstraintError` / `isForeignKeyConstraintError` to the + contract and use them in stores instead of raw mssql error numbers + (currently error messages like `Customer group in use`, `Brand in use`, + `Unit in use` rely on FK/unique detection — grep for these). +- [ ] Make `initialize()`/`purge()` real provider methods (schema migrations move + into the provider; store delegates). Decide per §5. +- [ ] Document provider contract (JSDoc typedef in `src/providers/provider.js`). + +## 4. better-sqlite3 provider +- [ ] Add `src/providers/better-sqlite3/index.js` implementing the same contract: + - `query()` → prepare + `.all()`/`.get()`/`.run()`; normalize + `lastInsertRowid` → `insertId`, `changes` → `rowsAffected` + - `transaction(fn)` → `db.transaction()` wrapper (note: better-sqlite3 is sync; + wrap in async signature so store code stays unchanged) + - Named params: mssql uses `@name`; better-sqlite3 uses `:name` / `@name` / + `$name` — define one (e.g. `@name`) in SQLite SQL so params pass through + - Pragmas on open: `foreign_keys = ON`, `journal_mode = WAL`, `busy_timeout = 5000` + - `BLOB` handling: return `Buffer` for pic/image/attachment binaries + - Error classification: unique → `SQLITE_CONSTRAINT_UNIQUE`, FK → `SQLITE_CONSTRAINT_FOREIGNKEY` + - Do NOT close the caller-owned db in the provider; expose `close()` +- [ ] `better-sqlite3` as peerDependency (optional) in `package.json` +- [ ] package.json exports: `"./providers/better-sqlite3"` + +## 5. SQLite schema (native, not mechanically translated) +- [ ] `src/providers/better-sqlite3/schema.js` + migrations: + - `INT IDENTITY` → `INTEGER PRIMARY KEY` (rowid) + - `NVARCHAR(n)` → `TEXT`; `VARBINARY(MAX)` → `BLOB` + - `DATETIME2 DEFAULT SYSUTCDATETIME()` → `TEXT` ISO-8601 UTC + (`strftime('%Y-%m-%dT%H:%M:%fZ','now')`) + - `IF NOT EXISTS ... sys.tables` → `CREATE TABLE IF NOT EXISTS` + - `OUTPUT INSERTED...` in queries → `RETURNING ...` + - `MERGE companysetting` → `INSERT ... ON CONFLICT ... DO UPDATE` + - `[identifier]` brackets → rename or quote (`"number"`) +- [ ] **Entity number uniqueness** (MSSQL uses indexed view `v_entity_company_number`): + - Add `company_id` column to `entity` (denormalized from customergroup, kept + in sync on insert + customergroup moves) and enforce + `CREATE UNIQUE INDEX uq_entity_company_number ON entity(company_id, number) WHERE number IS NOT NULL` + - Add the equivalent MSSQL migration for parity; remove the indexed view +- [ ] Versioned migrations via `meta` table (already exists) instead of pure + `IF NOT EXISTS` scripts for both providers +- [ ] Implement `initialize()` (migrations) and `purge()` (drop tables, FK-order) + in the SQLite provider; port `purgeSql.js` logic (currently topological + drop order — replicate) + +## 6. SQL translation per area (SQLite queries) +- [ ] `TOP 1` → `LIMIT 1` (mind: TOP without ORDER BY — keep identical ordering) +- [ ] `OUTER APPLY (SELECT TOP 1 ...)` (article/category first-pic joins) → + correlated subquery or `JOIN` on min(sort,id) +- [ ] `FOR JSON PATH` (getBySku, listSearchIndex, listExport, getTreeForCompany) → + build JSON in JS from plain rows (preferred: keeps providers dumb) +- [ ] Recursive CTEs (`SEARCH_ARTICLES`, `RESOLVE_ARTICLE_ACCESS_BY_SKU`, + `GET_CATEGORY_TREE_FLAT`) → SQLite `WITH RECURSIVE` (mostly compatible) +- [ ] `ISNULL` / `COALESCE` differences; `FLOAT` vs `REAL` +- [ ] Case-insensitive comparisons relying on MSSQL default collation + (e.g. name-uniqueness checks) → `COLLATE NOCASE` in SQLite schema or + explicit `LOWER()` in both dialects + +## 7. Contract / parity tests +- [ ] Test harness that runs the identical suite against both providers + (SQLite in-memory for speed; MSSQL in CI) +- [ ] Cover: return shapes, auth errors (`No company selected`, `Not authorized`), + domain errors, tx rollback, FK/unique behavior (`Brand in use` etc.), + binary round-trips (pic, manifestattachment, google_auth picturebinary), + date handling, recursive category tree, importRows two-pass V/K linking, + numbers.next/peek atomicity +- [ ] `scripts/test-api.js`: parametrize over provider +- [ ] `scripts/init-schema.js`, `reset-db.js`, `purge-db.js`: accept provider + selection (e.g. `--provider=better-sqlite3` / env `DASH_DB_PROVIDER`) + +## 8. Docs & tooling +- [ ] README: provider-based usage, both examples, migration notes for dashback +- [ ] `API.md` / `API.*.md` generators (`generate-api-doc.js`): update paths if + they scan `src/sql` / `src/schema` +- [ ] `generate-schema-graph.js` / `schema-graph.dot`: point at both schemas +- [ ] Deprecation note: `new LibDashStore(pool)` removed — constructor now takes + a provider (breaking change; coordinate with dashback) + +## 9. Cleanup +- [ ] Remove transitional `this.pool` / `provider.pool` usage from `index.js` +- [ ] Remove `mssql` from peerDependencies only if no runtime coupling remains + (queries/schema stay mssql-specific, so likely keep it) +- [ ] Decide export for `SCHEMA_SCRIPTS` (currently re-exported from `index.js` + from the moved schema file) diff --git a/generate-schema-graph.js b/generate-schema-graph.js index 9ee5531..c5bc26f 100644 --- a/generate-schema-graph.js +++ b/generate-schema-graph.js @@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url'; import { Graphviz } from '@hpcc-js/wasm-graphviz'; const __dirname = dirname(fileURLToPath(import.meta.url)); -const schemaPath = join(__dirname, 'src', 'schema.js'); +const schemaPath = join(__dirname, 'src', 'providers', 'mssql', 'schema.js'); const outputPath = join(__dirname, 'schema-graph.svg'); const dotOutputPath = join(__dirname, 'schema-graph.dot'); diff --git a/package.json b/package.json index 29f419f..1d77ad6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,9 @@ "main": "./src/index.js", "exports": { ".": "./src/index.js", - "./schema": "./src/schema.js" + "./schema": "./src/providers/mssql/schema.js", + "./providers/mssql": "./src/providers/mssql/index.js", + "./providers/provider": "./src/providers/provider.js" }, "scripts": { "schema-graph": "node generate-schema-graph.js", diff --git a/scripts/init-schema.js b/scripts/init-schema.js index 6ff1d36..d0d3e3e 100644 --- a/scripts/init-schema.js +++ b/scripts/init-schema.js @@ -1,6 +1,6 @@ import 'dotenv/config'; import sql from 'mssql'; -import { SCHEMA_SCRIPTS } from '../src/schema.js'; +import { SCHEMA_SCRIPTS } from '../src/providers/mssql/schema.js'; const config = { server: process.env.MSSQL_SERVER, diff --git a/scripts/purge-db.js b/scripts/purge-db.js index 5b9195e..5922c6d 100644 --- a/scripts/purge-db.js +++ b/scripts/purge-db.js @@ -1,6 +1,6 @@ import 'dotenv/config'; import sql from 'mssql'; -import { buildPurgeSql } from '../src/sql/purge.js'; +import { buildPurgeSql } from '../src/providers/mssql/purgeSql.js'; const pool = await sql.connect({ server: process.env.MSSQL_SERVER, diff --git a/scripts/reset-db.js b/scripts/reset-db.js index 5d44b35..34b069c 100644 --- a/scripts/reset-db.js +++ b/scripts/reset-db.js @@ -1,7 +1,7 @@ import 'dotenv/config'; import sql from 'mssql'; -import { buildPurgeSql } from '../src/sql/purge.js'; -import { SCHEMA_SCRIPTS } from '../src/schema.js'; +import { buildPurgeSql } from '../src/providers/mssql/purgeSql.js'; +import { SCHEMA_SCRIPTS } from '../src/providers/mssql/schema.js'; const pool = await sql.connect({ server: process.env.MSSQL_SERVER, diff --git a/scripts/test-api.js b/scripts/test-api.js index f2f6024..eeb6523 100644 --- a/scripts/test-api.js +++ b/scripts/test-api.js @@ -4,6 +4,7 @@ import sql from 'mssql'; import chalk from 'chalk'; import * as p from '@clack/prompts'; import LibDashStore from '../src/index.js'; +import { MssqlProvider } from '../src/providers/mssql/index.js'; const config = { server: process.env.MSSQL_SERVER, @@ -2004,7 +2005,7 @@ async function main() { spin.message('Initializing schema…'); let client; try { - client = await new LibDashStore(pool); + client = await new LibDashStore(new MssqlProvider(pool)); spin.stop(chalk.green('Ready')); } catch (err) { spin.stop(chalk.red('Initialize failed')); diff --git a/src/index.js b/src/index.js index 0a55f9f..c647581 100644 --- a/src/index.js +++ b/src/index.js @@ -123,7 +123,24 @@ import manifestattachmentGetById from './store/manifestattachment/getById.js'; import manifestattachmentOrder from './store/manifestattachment/order.js'; export default class LibDashStore { - constructor(pool) { + /** + * @param {import('./providers/provider.js').DatabaseProvider} provider + */ + constructor(provider) { + if ( + !provider || + typeof provider.query !== 'function' || + typeof provider.transaction !== 'function' + ) { + throw new TypeError( + 'LibDashStore requires a database provider (query/transaction/initialize/purge).', + ); + } + + this.provider = provider; + // Transitional: store modules still use the raw mssql pool. + // They are converted to provider.query() area by area (see TODO.md). + const pool = provider.pool; this.pool = pool; this.companyuser = { @@ -317,11 +334,16 @@ export default class LibDashStore { order: manifestattachmentOrder(pool), }; - this.purge = storePurge(pool); - this.initialize = storeInitialize(pool); + this.purge = storePurge(provider); + this.initialize = storeInitialize(provider); return this.initialize().then(() => this); } + + /** Recommended async factory (constructor returning a promise is confusing). */ + static async create(provider) { + return new LibDashStore(provider); + } } -export { SCHEMA_SCRIPTS } from './schema.js'; +export { SCHEMA_SCRIPTS } from './providers/mssql/schema.js'; diff --git a/src/providers/mssql/index.js b/src/providers/mssql/index.js new file mode 100644 index 0000000..52ad1c0 --- /dev/null +++ b/src/providers/mssql/index.js @@ -0,0 +1,126 @@ +/** + * MSSQL provider over an `mssql` ConnectionPool. + * Normalizes mssql results into the provider contract shape: + * { rows, rowsAffected, insertId } + */ + +function normalizeRows(result) { + const recordset = result?.recordset ?? []; + const affected = Array.isArray(result?.rowsAffected) + ? result.rowsAffected.reduce((a, b) => a + b, 0) + : result?.rowsAffected ?? 0; + return { rows: recordset, rowsAffected: affected, insertId: null }; +} + +export class MssqlExecutor { + /** @param {() => import('mssql').Request} requestFactory */ + constructor(requestFactory) { + this.#requestFactory = requestFactory; + } + + #requestFactory; + + /** @returns {Promise} */ + async query(sql, params = {}) { + const req = this.#requestFactory(); + for (const [key, value] of Object.entries(params)) { + req.input(key, value); + } + return normalizeRows(await req.query(sql)); + } + + /** + * Stored-procedure call with input/output params. + * Used by numbers.nextNumber / peekNumber + * (`getnextnumberwithprefixandpadding`). + */ + async exec(procName, { inputs = {}, outputs = [] } = {}) { + const req = this.#requestFactory(); + for (const [key, value] of Object.entries(inputs)) { + req.input(key, value); + } + for (const out of outputs) { + req.output(out); + } + const result = await req.execute(procName); + return { + rows: result.recordset ?? [], + rowsAffected: Array.isArray(result.rowsAffected) + ? result.rowsAffected.reduce((a, b) => a + b, 0) + : 0, + insertId: null, + outputs: result.output ?? {}, + }; + } +} + +export class MssqlProvider { + /** @param {import('mssql').ConnectionPool} pool */ + constructor(pool) { + if (!pool || typeof pool.request !== 'function') { + throw new TypeError('MssqlProvider requires an mssql ConnectionPool'); + } + this.pool = pool; + } + + makeExecutor(requestFactory = () => this.pool.request()) { + return new MssqlExecutor(requestFactory); + } + + async query(sql, params = {}) { + return this.makeExecutor().query(sql, params); + } + + async exec(procName, options) { + return this.makeExecutor().exec(procName, options); + } + + /** + * Runs `fn(runner)` inside a transaction. Commit on success, + * rollback on error. `runner` has query/exec like the provider. + * + * @template T + * @param {(runner: MssqlExecutor) => Promise} fn + * @returns {Promise} + */ + async transaction(fn) { + const tx = this.pool.transaction(); + await tx.begin(); + try { + const runner = this.makeExecutor(() => tx.request()); + const result = await fn(runner); + await tx.commit(); + return result; + } catch (err) { + try { + await tx.rollback(); + } catch { + // ignore rollback failure after original error + } + throw err; + } + } + + async initialize() { + // Implemented by store/initialize.js — no-op here (keeps parity with + // other providers, which may run migrations internally instead). + } + + async purge() { + // Implemented by store/purge.js — no-op here. + } + + close() { + return this.pool.close(); + } +} + +/** mssql: 2627 = PK/unique violation, 2601 = unique index violation */ +export function isUniqueConstraintError(err) { + return err?.number === 2627 || err?.number === 2601; +} + +/** mssql: 547 = FK conflict */ +export function isForeignKeyConstraintError(err) { + return err?.number === 547; +} diff --git a/src/sql/purge.js b/src/providers/mssql/purgeSql.js similarity index 100% rename from src/sql/purge.js rename to src/providers/mssql/purgeSql.js diff --git a/src/sql/article.js b/src/providers/mssql/queries/article.js similarity index 100% rename from src/sql/article.js rename to src/providers/mssql/queries/article.js diff --git a/src/sql/articleDelete.js b/src/providers/mssql/queries/articleDelete.js similarity index 100% rename from src/sql/articleDelete.js rename to src/providers/mssql/queries/articleDelete.js diff --git a/src/sql/articleDetail.js b/src/providers/mssql/queries/articleDetail.js similarity index 100% rename from src/sql/articleDetail.js rename to src/providers/mssql/queries/articleDetail.js diff --git a/src/sql/articlehistory.js b/src/providers/mssql/queries/articlehistory.js similarity index 100% rename from src/sql/articlehistory.js rename to src/providers/mssql/queries/articlehistory.js diff --git a/src/sql/articlepic.js b/src/providers/mssql/queries/articlepic.js similarity index 100% rename from src/sql/articlepic.js rename to src/providers/mssql/queries/articlepic.js diff --git a/src/sql/articlesupplier.js b/src/providers/mssql/queries/articlesupplier.js similarity index 100% rename from src/sql/articlesupplier.js rename to src/providers/mssql/queries/articlesupplier.js diff --git a/src/sql/articletext.js b/src/providers/mssql/queries/articletext.js similarity index 100% rename from src/sql/articletext.js rename to src/providers/mssql/queries/articletext.js diff --git a/src/sql/brand.js b/src/providers/mssql/queries/brand.js similarity index 100% rename from src/sql/brand.js rename to src/providers/mssql/queries/brand.js diff --git a/src/sql/category.js b/src/providers/mssql/queries/category.js similarity index 100% rename from src/sql/category.js rename to src/providers/mssql/queries/category.js diff --git a/src/sql/categoryarticle.js b/src/providers/mssql/queries/categoryarticle.js similarity index 100% rename from src/sql/categoryarticle.js rename to src/providers/mssql/queries/categoryarticle.js diff --git a/src/sql/categorypic.js b/src/providers/mssql/queries/categorypic.js similarity index 100% rename from src/sql/categorypic.js rename to src/providers/mssql/queries/categorypic.js diff --git a/src/sql/categorytext.js b/src/providers/mssql/queries/categorytext.js similarity index 100% rename from src/sql/categorytext.js rename to src/providers/mssql/queries/categorytext.js diff --git a/src/sql/company.js b/src/providers/mssql/queries/company.js similarity index 100% rename from src/sql/company.js rename to src/providers/mssql/queries/company.js diff --git a/src/sql/companysetting.js b/src/providers/mssql/queries/companysetting.js similarity index 100% rename from src/sql/companysetting.js rename to src/providers/mssql/queries/companysetting.js diff --git a/src/sql/companyuser.js b/src/providers/mssql/queries/companyuser.js similarity index 100% rename from src/sql/companyuser.js rename to src/providers/mssql/queries/companyuser.js diff --git a/src/sql/customergroup.js b/src/providers/mssql/queries/customergroup.js similarity index 100% rename from src/sql/customergroup.js rename to src/providers/mssql/queries/customergroup.js diff --git a/src/sql/delivery.js b/src/providers/mssql/queries/delivery.js similarity index 100% rename from src/sql/delivery.js rename to src/providers/mssql/queries/delivery.js diff --git a/src/sql/entity.js b/src/providers/mssql/queries/entity.js similarity index 100% rename from src/sql/entity.js rename to src/providers/mssql/queries/entity.js diff --git a/src/sql/entityaddress.js b/src/providers/mssql/queries/entityaddress.js similarity index 100% rename from src/sql/entityaddress.js rename to src/providers/mssql/queries/entityaddress.js diff --git a/src/sql/entitycontact.js b/src/providers/mssql/queries/entitycontact.js similarity index 100% rename from src/sql/entitycontact.js rename to src/providers/mssql/queries/entitycontact.js diff --git a/src/sql/entityhistory.js b/src/providers/mssql/queries/entityhistory.js similarity index 100% rename from src/sql/entityhistory.js rename to src/providers/mssql/queries/entityhistory.js diff --git a/src/sql/google_auth.js b/src/providers/mssql/queries/google_auth.js similarity index 100% rename from src/sql/google_auth.js rename to src/providers/mssql/queries/google_auth.js diff --git a/src/sql/language.js b/src/providers/mssql/queries/language.js similarity index 100% rename from src/sql/language.js rename to src/providers/mssql/queries/language.js diff --git a/src/sql/manifestDoc.js b/src/providers/mssql/queries/manifestDoc.js similarity index 100% rename from src/sql/manifestDoc.js rename to src/providers/mssql/queries/manifestDoc.js diff --git a/src/sql/manifestattachment.js b/src/providers/mssql/queries/manifestattachment.js similarity index 100% rename from src/sql/manifestattachment.js rename to src/providers/mssql/queries/manifestattachment.js diff --git a/src/sql/numbers.js b/src/providers/mssql/queries/numbers.js similarity index 100% rename from src/sql/numbers.js rename to src/providers/mssql/queries/numbers.js diff --git a/src/sql/pic.js b/src/providers/mssql/queries/pic.js similarity index 100% rename from src/sql/pic.js rename to src/providers/mssql/queries/pic.js diff --git a/src/sql/posterminal.js b/src/providers/mssql/queries/posterminal.js similarity index 100% rename from src/sql/posterminal.js rename to src/providers/mssql/queries/posterminal.js diff --git a/src/sql/price.js b/src/providers/mssql/queries/price.js similarity index 100% rename from src/sql/price.js rename to src/providers/mssql/queries/price.js diff --git a/src/sql/tax.js b/src/providers/mssql/queries/tax.js similarity index 100% rename from src/sql/tax.js rename to src/providers/mssql/queries/tax.js diff --git a/src/sql/unit.js b/src/providers/mssql/queries/unit.js similarity index 100% rename from src/sql/unit.js rename to src/providers/mssql/queries/unit.js diff --git a/src/sql/unittext.js b/src/providers/mssql/queries/unittext.js similarity index 100% rename from src/sql/unittext.js rename to src/providers/mssql/queries/unittext.js diff --git a/src/schema.js b/src/providers/mssql/schema.js similarity index 100% rename from src/schema.js rename to src/providers/mssql/schema.js diff --git a/src/providers/provider.js b/src/providers/provider.js new file mode 100644 index 0000000..3eeec41 --- /dev/null +++ b/src/providers/provider.js @@ -0,0 +1,40 @@ +/** + * Database provider contract for LibDashStore. + * + * A provider wraps a concrete database driver and exposes: + * - query(sql, params) -> { rows, rowsAffected, insertId } + * - transaction(fn) -> runs fn(runner) in a tx, commit/rollback + * - exec(proc, {inputs,outputs}) -> stored procedure call (optional capability) + * - initialize() / purge() -> schema lifecycle + * - pool -> the underlying driver handle (transitional) + * + * @typedef {Object} QueryResult + * @property {Array} rows Result rows (mssql `recordset` equivalent). + * @property {number} rowsAffected Number of affected rows (mssql `rowsAffected[0]`). + * @property {number|null} insertId Last inserted id when applicable, else null. + * + * @typedef {Object} DatabaseProvider + * @property {(sql: string, params?: Object) => Promise} query + * @property {(fn: (runner: DatabaseProvider) => Promise<*>) => Promise<*>} transaction + * @property {() => Promise} initialize + * @property {() => Promise} purge + * @property {*} pool + */ + +/** + * Checks whether an error is a unique-constraint violation. + * @param {unknown} err + * @returns {boolean} + */ +export function isUniqueConstraintError(err) { + throw new Error('Not implemented: isUniqueConstraintError'); +} + +/** + * Checks whether an error is a foreign-key-constraint violation. + * @param {unknown} err + * @returns {boolean} + */ +export function isForeignKeyConstraintError(err) { + throw new Error('Not implemented: isForeignKeyConstraintError'); +} diff --git a/src/store/article/addImage.js b/src/store/article/addImage.js index 5e92915..832f1e3 100644 --- a/src/store/article/addImage.js +++ b/src/store/article/addImage.js @@ -1,5 +1,5 @@ -import { ADD as ADD_ARTICLEPIC, GET_NEXT_SORT } from '../../sql/articlepic.js'; -import { CREATE as CREATE_PIC } from '../../sql/pic.js'; +import { ADD as ADD_ARTICLEPIC, GET_NEXT_SORT } from '../../providers/mssql/queries/articlepic.js'; +import { CREATE as CREATE_PIC } from '../../providers/mssql/queries/pic.js'; import processAvifImage from '../../util/processAvifImage.js'; import newFullHash from '../../util/newFullHash.js'; import request from '../request.js'; diff --git a/src/store/article/createUnderParent.js b/src/store/article/createUnderParent.js index c200709..515d58c 100644 --- a/src/store/article/createUnderParent.js +++ b/src/store/article/createUnderParent.js @@ -1,7 +1,7 @@ -import { CREATE } from '../../sql/article.js'; -import { ADD as ADD_CATEGORYARTICLE } from '../../sql/categoryarticle.js'; -import { CREATE as CREATE_ARTICLETEXT } from '../../sql/articletext.js'; -import { INSERT as INSERT_HISTORY } from '../../sql/articlehistory.js'; +import { CREATE } from '../../providers/mssql/queries/article.js'; +import { ADD as ADD_CATEGORYARTICLE } from '../../providers/mssql/queries/categoryarticle.js'; +import { CREATE as CREATE_ARTICLETEXT } from '../../providers/mssql/queries/articletext.js'; +import { INSERT as INSERT_HISTORY } from '../../providers/mssql/queries/articlehistory.js'; import resolveCategoryAccess from '../category/resolveCategoryAccess.js'; import ensureDefaultUnit from '../unit/ensureDefault.js'; import nextSku from '../numbers/nextSku.js'; diff --git a/src/store/article/delete.js b/src/store/article/delete.js index e4b75ee..1c30d94 100644 --- a/src/store/article/delete.js +++ b/src/store/article/delete.js @@ -5,7 +5,7 @@ import { DELETE_PICS_BY_ARTICLE, GET_CHILD_COUNT, GET_LIST_IDS, -} from '../../sql/articleDelete.js'; +} from '../../providers/mssql/queries/articleDelete.js'; import resolveArticleBySku from './resolveArticleBySku.js'; import request from '../request.js'; diff --git a/src/store/article/deleteImage.js b/src/store/article/deleteImage.js index 43b93ea..b0bc2f8 100644 --- a/src/store/article/deleteImage.js +++ b/src/store/article/deleteImage.js @@ -1,4 +1,4 @@ -import { DELETE_BY_ARTICLE_AND_HASH } from '../../sql/pic.js'; +import { DELETE_BY_ARTICLE_AND_HASH } from '../../providers/mssql/queries/pic.js'; import resolveArticleBySku from './resolveArticleBySku.js'; export default function deleteImage(pool) { diff --git a/src/store/article/getBySku.js b/src/store/article/getBySku.js index 12a3d90..01c86c7 100644 --- a/src/store/article/getBySku.js +++ b/src/store/article/getBySku.js @@ -1,4 +1,4 @@ -import { GET_ARTICLE_BY_SKU_FULL } from '../../sql/article.js'; +import { GET_ARTICLE_BY_SKU_FULL } from '../../providers/mssql/queries/article.js'; function parseJsonArray(raw) { if (!raw) return []; diff --git a/src/store/article/getHistoryBySku.js b/src/store/article/getHistoryBySku.js index 5bede06..a8c7ddd 100644 --- a/src/store/article/getHistoryBySku.js +++ b/src/store/article/getHistoryBySku.js @@ -1,4 +1,4 @@ -import { LIST_BY_ARTICLE_ID } from '../../sql/articlehistory.js'; +import { LIST_BY_ARTICLE_ID } from '../../providers/mssql/queries/articlehistory.js'; import resolveArticleBySku from './resolveArticleBySku.js'; export default function getHistoryBySku(pool) { diff --git a/src/store/article/importRows.js b/src/store/article/importRows.js index 379e7ee..283e376 100644 --- a/src/store/article/importRows.js +++ b/src/store/article/importRows.js @@ -7,14 +7,14 @@ import { SET_IS_FATHER, UPDATE_BRAND, UPDATE_FATHER_BY_SKU, -} from '../../sql/article.js'; -import { ADD as ADD_CATEGORYARTICLE } from '../../sql/categoryarticle.js'; -import { CREATE as CREATE_ARTICLETEXT } from '../../sql/articletext.js'; -import { INSERT as INSERT_HISTORY } from '../../sql/articlehistory.js'; -import { GET_CHILD_COUNT } from '../../sql/articleDelete.js'; -import { CREATE as CREATE_BRAND, GET_BY_COMPANY_AND_NAME } from '../../sql/brand.js'; -import { CREATE as CREATE_PRICE } from '../../sql/price.js'; -import { CREATE as CREATE_TAX, GET_BY_RATE } from '../../sql/tax.js'; +} from '../../providers/mssql/queries/article.js'; +import { ADD as ADD_CATEGORYARTICLE } from '../../providers/mssql/queries/categoryarticle.js'; +import { CREATE as CREATE_ARTICLETEXT } from '../../providers/mssql/queries/articletext.js'; +import { INSERT as INSERT_HISTORY } from '../../providers/mssql/queries/articlehistory.js'; +import { GET_CHILD_COUNT } from '../../providers/mssql/queries/articleDelete.js'; +import { CREATE as CREATE_BRAND, GET_BY_COMPANY_AND_NAME } from '../../providers/mssql/queries/brand.js'; +import { CREATE as CREATE_PRICE } from '../../providers/mssql/queries/price.js'; +import { CREATE as CREATE_TAX, GET_BY_RATE } from '../../providers/mssql/queries/tax.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import ensureByPath from '../category/ensureByPath.js'; diff --git a/src/store/article/listExport.js b/src/store/article/listExport.js index 903fa47..e99b110 100644 --- a/src/store/article/listExport.js +++ b/src/store/article/listExport.js @@ -1,4 +1,4 @@ -import { GET_ARTICLE_EXPORT, GET_CATEGORY_TREE_FLAT } from '../../sql/article.js'; +import { GET_ARTICLE_EXPORT, GET_CATEGORY_TREE_FLAT } from '../../providers/mssql/queries/article.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveCategoryAccess from '../category/resolveCategoryAccess.js'; diff --git a/src/store/article/listSearchIndex.js b/src/store/article/listSearchIndex.js index 3405d68..0d09fb1 100644 --- a/src/store/article/listSearchIndex.js +++ b/src/store/article/listSearchIndex.js @@ -1,4 +1,4 @@ -import { SEARCH_ARTICLES } from '../../sql/article.js'; +import { SEARCH_ARTICLES } from '../../providers/mssql/queries/article.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function listSearchIndex(pool) { diff --git a/src/store/article/orderImages.js b/src/store/article/orderImages.js index 7f3ba64..980b784 100644 --- a/src/store/article/orderImages.js +++ b/src/store/article/orderImages.js @@ -2,7 +2,7 @@ import { LIST_HASHES_BY_ARTICLE, SET_TEMP_SORTS, UPDATE_SORT_BY_HASH, -} from '../../sql/articlepic.js'; +} from '../../providers/mssql/queries/articlepic.js'; import resolveArticleBySku from './resolveArticleBySku.js'; import request from '../request.js'; diff --git a/src/store/article/queryBySku.js b/src/store/article/queryBySku.js index 9067612..d260f26 100644 --- a/src/store/article/queryBySku.js +++ b/src/store/article/queryBySku.js @@ -4,7 +4,7 @@ import { GET_EANS_BY_ARTICLE_ID, GET_PHOTOS_BY_ARTICLE_ID, GET_PRICES_BY_ARTICLE_ID, -} from '../../sql/articleDetail.js'; +} from '../../providers/mssql/queries/articleDetail.js'; function shapeArticleDetail(row, categoryIds, photos, eans, prices) { return { diff --git a/src/store/article/resolveArticleBySku.js b/src/store/article/resolveArticleBySku.js index e30ab3d..9db1676 100644 --- a/src/store/article/resolveArticleBySku.js +++ b/src/store/article/resolveArticleBySku.js @@ -1,4 +1,4 @@ -import { RESOLVE_ARTICLE_ACCESS_BY_SKU } from '../../sql/article.js'; +import { RESOLVE_ARTICLE_ACCESS_BY_SKU } from '../../providers/mssql/queries/article.js'; export default function resolveArticleBySku(pool) { return async (googleAuthId, sku) => { diff --git a/src/store/article/setBrandIdBySku.js b/src/store/article/setBrandIdBySku.js index 37148da..7396f9d 100644 --- a/src/store/article/setBrandIdBySku.js +++ b/src/store/article/setBrandIdBySku.js @@ -1,7 +1,7 @@ import { GET_BRAND_BY_COMPANY_AND_ID, UPDATE_BRAND, -} from '../../sql/article.js'; +} from '../../providers/mssql/queries/article.js'; import queryBySku from './queryBySku.js'; import resolveArticleBySku from './resolveArticleBySku.js'; diff --git a/src/store/article/setCategoryIdsBySku.js b/src/store/article/setCategoryIdsBySku.js index 918e309..155e724 100644 --- a/src/store/article/setCategoryIdsBySku.js +++ b/src/store/article/setCategoryIdsBySku.js @@ -1,7 +1,7 @@ import { ADD_CATEGORY, DELETE_CATEGORIES_BY_ARTICLE, -} from '../../sql/article.js'; +} from '../../providers/mssql/queries/article.js'; import request from '../request.js'; import resolveCategoryAccess from '../category/resolveCategoryAccess.js'; import queryBySku from './queryBySku.js'; diff --git a/src/store/article/setEansBySku.js b/src/store/article/setEansBySku.js index 1171514..8290371 100644 --- a/src/store/article/setEansBySku.js +++ b/src/store/article/setEansBySku.js @@ -1,7 +1,7 @@ import { ADD_EAN, DELETE_EANS_BY_ARTICLE, -} from '../../sql/article.js'; +} from '../../providers/mssql/queries/article.js'; import request from '../request.js'; import queryBySku from './queryBySku.js'; import resolveArticleBySku from './resolveArticleBySku.js'; diff --git a/src/store/article/setFatherBySku.js b/src/store/article/setFatherBySku.js index 97babbe..5aa5a86 100644 --- a/src/store/article/setFatherBySku.js +++ b/src/store/article/setFatherBySku.js @@ -3,8 +3,8 @@ import { SET_FATHER_SORT, SET_IS_FATHER, UPDATE_FATHER_BY_SKU, -} from '../../sql/article.js'; -import { GET_CHILD_COUNT } from '../../sql/articleDelete.js'; +} from '../../providers/mssql/queries/article.js'; +import { GET_CHILD_COUNT } from '../../providers/mssql/queries/articleDelete.js'; import request from '../request.js'; import queryBySku from './queryBySku.js'; import resolveArticleBySku from './resolveArticleBySku.js'; diff --git a/src/store/article/setPricesBySku.js b/src/store/article/setPricesBySku.js index 5327f9c..8407827 100644 --- a/src/store/article/setPricesBySku.js +++ b/src/store/article/setPricesBySku.js @@ -1,7 +1,7 @@ import { CREATE as CREATE_PRICE, DELETE_BY_ARTICLE_AND_CUSTOMERGROUP, -} from '../../sql/price.js'; +} from '../../providers/mssql/queries/price.js'; import request from '../request.js'; import taxEnsure from '../tax/ensure.js'; import queryBySku from './queryBySku.js'; diff --git a/src/store/article/setWeightBySku.js b/src/store/article/setWeightBySku.js index dc39602..e31c066 100644 --- a/src/store/article/setWeightBySku.js +++ b/src/store/article/setWeightBySku.js @@ -1,4 +1,4 @@ -import { UPDATE_WEIGHT } from '../../sql/article.js'; +import { UPDATE_WEIGHT } from '../../providers/mssql/queries/article.js'; import queryBySku from './queryBySku.js'; import resolveArticleBySku from './resolveArticleBySku.js'; diff --git a/src/store/article/updateBySku.js b/src/store/article/updateBySku.js index a881f3c..697b7ad 100644 --- a/src/store/article/updateBySku.js +++ b/src/store/article/updateBySku.js @@ -2,11 +2,11 @@ import { UPDATE_UNIT, UPDATE_UNITAMOUNT, UPDATE_UNIT_AND_AMOUNT, -} from '../../sql/article.js'; -import { INSERT as INSERT_HISTORY } from '../../sql/articlehistory.js'; -import { UPDATE_BY_ARTICLE_AND_LANGUAGE } from '../../sql/articletext.js'; -import { GET_DETAIL_BY_ARTICLE_ID } from '../../sql/articleDetail.js'; -import { GET_FULL_BY_SI } from '../../sql/unit.js'; +} from '../../providers/mssql/queries/article.js'; +import { INSERT as INSERT_HISTORY } from '../../providers/mssql/queries/articlehistory.js'; +import { UPDATE_BY_ARTICLE_AND_LANGUAGE } from '../../providers/mssql/queries/articletext.js'; +import { GET_DETAIL_BY_ARTICLE_ID } from '../../providers/mssql/queries/articleDetail.js'; +import { GET_FULL_BY_SI } from '../../providers/mssql/queries/unit.js'; import request from '../request.js'; import queryBySku from './queryBySku.js'; import resolveArticleBySku from './resolveArticleBySku.js'; diff --git a/src/store/articlesupplier/create.js b/src/store/articlesupplier/create.js index 4f0c216..ce6bdcb 100644 --- a/src/store/articlesupplier/create.js +++ b/src/store/articlesupplier/create.js @@ -3,8 +3,8 @@ import { CREATE as CREATE_ARTICLE_SUPPLIER, GET_BY_ID_AND_ARTICLE_ID, GET_NEXT_SORT, -} from '../../sql/articlesupplier.js'; -import { CREATE as CREATE_PRICE } from '../../sql/price.js'; +} from '../../providers/mssql/queries/articlesupplier.js'; +import { CREATE as CREATE_PRICE } from '../../providers/mssql/queries/price.js'; import request from '../request.js'; import resolveArticleBySku from '../article/resolveArticleBySku.js'; import ensureLieferantenGroup from '../supplier/ensureLieferantenGroup.js'; diff --git a/src/store/articlesupplier/delete.js b/src/store/articlesupplier/delete.js index 2f6383c..6044fa1 100644 --- a/src/store/articlesupplier/delete.js +++ b/src/store/articlesupplier/delete.js @@ -2,7 +2,7 @@ import { DELETE_BY_ID_AND_ARTICLE_ID, DELETE_PRICE, GET_BY_ID_AND_ARTICLE_ID, -} from '../../sql/articlesupplier.js'; +} from '../../providers/mssql/queries/articlesupplier.js'; import request from '../request.js'; import resolveArticleBySku from '../article/resolveArticleBySku.js'; diff --git a/src/store/articlesupplier/helpers.js b/src/store/articlesupplier/helpers.js index 89db819..09f2fb4 100644 --- a/src/store/articlesupplier/helpers.js +++ b/src/store/articlesupplier/helpers.js @@ -1,5 +1,5 @@ -import { GET_SUPPLIER_BY_ID, SUPPLIER_GROUP_NAME } from '../../sql/entity.js'; -import { GET_COMPANY_DEFAULT_TAX } from '../../sql/articlesupplier.js'; +import { GET_SUPPLIER_BY_ID, SUPPLIER_GROUP_NAME } from '../../providers/mssql/queries/entity.js'; +import { GET_COMPANY_DEFAULT_TAX } from '../../providers/mssql/queries/articlesupplier.js'; import request from '../request.js'; export function optionalString(value) { diff --git a/src/store/articlesupplier/listByArticleSku.js b/src/store/articlesupplier/listByArticleSku.js index cfac06a..76fe44b 100644 --- a/src/store/articlesupplier/listByArticleSku.js +++ b/src/store/articlesupplier/listByArticleSku.js @@ -1,4 +1,4 @@ -import { LIST_BY_ARTICLE_ID } from '../../sql/articlesupplier.js'; +import { LIST_BY_ARTICLE_ID } from '../../providers/mssql/queries/articlesupplier.js'; import resolveArticleBySku from '../article/resolveArticleBySku.js'; import { shapeArticleSupplier } from './helpers.js'; diff --git a/src/store/articlesupplier/listByEntityAndSkus.js b/src/store/articlesupplier/listByEntityAndSkus.js index 3d1223d..993e0d2 100644 --- a/src/store/articlesupplier/listByEntityAndSkus.js +++ b/src/store/articlesupplier/listByEntityAndSkus.js @@ -1,4 +1,4 @@ -import { LIST_BY_ENTITY_AND_SKUS } from '../../sql/articlesupplier.js'; +import { LIST_BY_ENTITY_AND_SKUS } from '../../providers/mssql/queries/articlesupplier.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import { assertSupplier } from './helpers.js'; diff --git a/src/store/articlesupplier/order.js b/src/store/articlesupplier/order.js index 27e1fb4..2efea5a 100644 --- a/src/store/articlesupplier/order.js +++ b/src/store/articlesupplier/order.js @@ -2,7 +2,7 @@ import { LIST_IDS_BY_ARTICLE, SET_TEMP_SORTS, UPDATE_SORT, -} from '../../sql/articlesupplier.js'; +} from '../../providers/mssql/queries/articlesupplier.js'; import request from '../request.js'; import resolveArticleBySku from '../article/resolveArticleBySku.js'; diff --git a/src/store/articlesupplier/update.js b/src/store/articlesupplier/update.js index e2447a4..41d19e0 100644 --- a/src/store/articlesupplier/update.js +++ b/src/store/articlesupplier/update.js @@ -3,8 +3,8 @@ import { GET_BY_ID_AND_ARTICLE_ID, UPDATE as UPDATE_ARTICLE_SUPPLIER, UPDATE_PRICE, -} from '../../sql/articlesupplier.js'; -import { CREATE as CREATE_PRICE } from '../../sql/price.js'; +} from '../../providers/mssql/queries/articlesupplier.js'; +import { CREATE as CREATE_PRICE } from '../../providers/mssql/queries/price.js'; import request from '../request.js'; import resolveArticleBySku from '../article/resolveArticleBySku.js'; import ensureLieferantenGroup from '../supplier/ensureLieferantenGroup.js'; diff --git a/src/store/brand/delete.js b/src/store/brand/delete.js index c8ef70d..0a07aa6 100644 --- a/src/store/brand/delete.js +++ b/src/store/brand/delete.js @@ -1,4 +1,4 @@ -import { DELETE_BY_COMPANY_AND_ID } from '../../sql/brand.js'; +import { DELETE_BY_COMPANY_AND_ID } from '../../providers/mssql/queries/brand.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/brand/list.js b/src/store/brand/list.js index 8171b93..fe0a60e 100644 --- a/src/store/brand/list.js +++ b/src/store/brand/list.js @@ -1,4 +1,4 @@ -import { LIST_BY_COMPANY } from '../../sql/brand.js'; +import { LIST_BY_COMPANY } from '../../providers/mssql/queries/brand.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function list(pool) { diff --git a/src/store/brand/upsert.js b/src/store/brand/upsert.js index 31b45e4..de7a47f 100644 --- a/src/store/brand/upsert.js +++ b/src/store/brand/upsert.js @@ -2,7 +2,7 @@ import { CREATE, GET_BY_COMPANY_AND_NAME, UPDATE_BY_ID, -} from '../../sql/brand.js'; +} from '../../providers/mssql/queries/brand.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function upsert(pool) { diff --git a/src/store/category/addImage.js b/src/store/category/addImage.js index fe25d12..c5b4d71 100644 --- a/src/store/category/addImage.js +++ b/src/store/category/addImage.js @@ -1,5 +1,5 @@ -import { ADD as ADD_CATEGORYPIC, GET_NEXT_SORT } from '../../sql/categorypic.js'; -import { CREATE as CREATE_PIC } from '../../sql/pic.js'; +import { ADD as ADD_CATEGORYPIC, GET_NEXT_SORT } from '../../providers/mssql/queries/categorypic.js'; +import { CREATE as CREATE_PIC } from '../../providers/mssql/queries/pic.js'; import processAvifImage from '../../util/processAvifImage.js'; import newFullHash from '../../util/newFullHash.js'; import request from '../request.js'; diff --git a/src/store/category/createUnderParent.js b/src/store/category/createUnderParent.js index 4bd4382..c4efb18 100644 --- a/src/store/category/createUnderParent.js +++ b/src/store/category/createUnderParent.js @@ -1,8 +1,8 @@ import { CREATE, GET_NEXT_SIBLING_SORT, -} from '../../sql/category.js'; -import { CREATE as CREATE_CATEGORYTEXT } from '../../sql/categorytext.js'; +} from '../../providers/mssql/queries/category.js'; +import { CREATE as CREATE_CATEGORYTEXT } from '../../providers/mssql/queries/categorytext.js'; import resolveCategoryAccess from './resolveCategoryAccess.js'; import request from '../request.js'; import slugify from '../slugify.js'; diff --git a/src/store/category/delete.js b/src/store/category/delete.js index b4cbf8e..5bf2088 100644 --- a/src/store/category/delete.js +++ b/src/store/category/delete.js @@ -1,4 +1,4 @@ -import { DELETE } from '../../sql/category.js'; +import { DELETE } from '../../providers/mssql/queries/category.js'; import resolveCategoryAccess from './resolveCategoryAccess.js'; export default function del(pool) { diff --git a/src/store/category/deleteImage.js b/src/store/category/deleteImage.js index acafd2f..d96010d 100644 --- a/src/store/category/deleteImage.js +++ b/src/store/category/deleteImage.js @@ -1,4 +1,4 @@ -import { DELETE_BY_CATEGORY } from '../../sql/categorypic.js'; +import { DELETE_BY_CATEGORY } from '../../providers/mssql/queries/categorypic.js'; import resolveCategoryAccess from './resolveCategoryAccess.js'; export default function deleteImage(pool) { diff --git a/src/store/category/ensureByPath.js b/src/store/category/ensureByPath.js index f508ec0..a7824ce 100644 --- a/src/store/category/ensureByPath.js +++ b/src/store/category/ensureByPath.js @@ -2,8 +2,8 @@ import { CREATE, GET_BY_PARENT_AND_NAME, GET_NEXT_SIBLING_SORT, -} from '../../sql/category.js'; -import { CREATE as CREATE_CATEGORYTEXT } from '../../sql/categorytext.js'; +} from '../../providers/mssql/queries/category.js'; +import { CREATE as CREATE_CATEGORYTEXT } from '../../providers/mssql/queries/categorytext.js'; import resolveCategoryAccess from './resolveCategoryAccess.js'; import request from '../request.js'; import slugify from '../slugify.js'; diff --git a/src/store/category/getTreeForCompany.js b/src/store/category/getTreeForCompany.js index 309aa5a..2ffaeb9 100644 --- a/src/store/category/getTreeForCompany.js +++ b/src/store/category/getTreeForCompany.js @@ -1,4 +1,4 @@ -import { GET_TREE_FOR_COMPANY } from '../../sql/category.js'; +import { GET_TREE_FOR_COMPANY } from '../../providers/mssql/queries/category.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import queryCategoryArticles from './queryCategoryArticles.js'; import getCategoryPosterminalIds from '../posterminal/getCategoryPosterminalIds.js'; diff --git a/src/store/category/move.js b/src/store/category/move.js index 11fb3b2..7b2a4d6 100644 --- a/src/store/category/move.js +++ b/src/store/category/move.js @@ -2,7 +2,7 @@ import { GET_NEXT_SIBLING_SORT, IS_ANCESTOR, MOVE, -} from '../../sql/category.js'; +} from '../../providers/mssql/queries/category.js'; import request from '../request.js'; import resolveCategoryAccess from './resolveCategoryAccess.js'; diff --git a/src/store/category/order.js b/src/store/category/order.js index 38a7473..1f6a53d 100644 --- a/src/store/category/order.js +++ b/src/store/category/order.js @@ -1,7 +1,7 @@ import { LIST_CHILD_IDS, UPDATE_SORT, -} from '../../sql/category.js'; +} from '../../providers/mssql/queries/category.js'; import request from '../request.js'; import resolveCategoryAccess from './resolveCategoryAccess.js'; diff --git a/src/store/category/queryCategoryArticles.js b/src/store/category/queryCategoryArticles.js index 6d4c6c0..23588a4 100644 --- a/src/store/category/queryCategoryArticles.js +++ b/src/store/category/queryCategoryArticles.js @@ -1,4 +1,4 @@ -import { GET_CATEGORY_ARTICLES } from '../../sql/category.js'; +import { GET_CATEGORY_ARTICLES } from '../../providers/mssql/queries/category.js'; export default function queryCategoryArticles(pool) { return async ({ categoryId, languageId, posCustomerGroupId }) => { diff --git a/src/store/category/rename.js b/src/store/category/rename.js index 86d863b..322e47c 100644 --- a/src/store/category/rename.js +++ b/src/store/category/rename.js @@ -1,4 +1,4 @@ -import { UPDATE_BY_CATEGORY_AND_LANGUAGE } from '../../sql/categorytext.js'; +import { UPDATE_BY_CATEGORY_AND_LANGUAGE } from '../../providers/mssql/queries/categorytext.js'; import resolveCategoryAccess from './resolveCategoryAccess.js'; import slugify from '../slugify.js'; diff --git a/src/store/category/resolveCategoryAccess.js b/src/store/category/resolveCategoryAccess.js index 8d3536c..5b85a02 100644 --- a/src/store/category/resolveCategoryAccess.js +++ b/src/store/category/resolveCategoryAccess.js @@ -1,4 +1,4 @@ -import { RESOLVE_CATEGORY_ACCESS } from '../../sql/category.js'; +import { RESOLVE_CATEGORY_ACCESS } from '../../providers/mssql/queries/category.js'; export default function resolveCategoryAccess(pool) { return async (googleAuthId, categoryId) => { diff --git a/src/store/company/create.js b/src/store/company/create.js index 947ede0..eacc3ca 100644 --- a/src/store/company/create.js +++ b/src/store/company/create.js @@ -1,11 +1,11 @@ -import { POS_GROUP_NAME } from '../../sql/entity.js'; -import { CREATE } from '../../sql/company.js'; -import { CREATE as CREATE_CATEGORY } from '../../sql/category.js'; +import { POS_GROUP_NAME } from '../../providers/mssql/queries/entity.js'; +import { CREATE } from '../../providers/mssql/queries/company.js'; +import { CREATE as CREATE_CATEGORY } from '../../providers/mssql/queries/category.js'; import { CREATE_WITHOUT_COMPANY as CREATE_CUSTOMERGROUP, SET_COMPANY as SET_CUSTOMERGROUP_COMPANY, -} from '../../sql/customergroup.js'; -import { ADD as ADD_COMPANYUSER } from '../../sql/companyuser.js'; +} from '../../providers/mssql/queries/customergroup.js'; +import { ADD as ADD_COMPANYUSER } from '../../providers/mssql/queries/companyuser.js'; import getByName from './getByName.js'; import langEnsure from '../lang/ensure.js'; import taxEnsure from '../tax/ensure.js'; diff --git a/src/store/company/delete.js b/src/store/company/delete.js index 6477bd8..5d1a8c2 100644 --- a/src/store/company/delete.js +++ b/src/store/company/delete.js @@ -1,4 +1,4 @@ -import { DELETE } from '../../sql/company.js'; +import { DELETE } from '../../providers/mssql/queries/company.js'; export default function del(pool) { /** diff --git a/src/store/company/getById.js b/src/store/company/getById.js index 1468282..11211e0 100644 --- a/src/store/company/getById.js +++ b/src/store/company/getById.js @@ -1,4 +1,4 @@ -import { GET_BY_ID } from '../../sql/company.js'; +import { GET_BY_ID } from '../../providers/mssql/queries/company.js'; import request from '../request.js'; export default function getById(pool) { diff --git a/src/store/company/getByName.js b/src/store/company/getByName.js index 1097132..fcdb5e5 100644 --- a/src/store/company/getByName.js +++ b/src/store/company/getByName.js @@ -1,4 +1,4 @@ -import { GET_BY_NAME } from '../../sql/company.js'; +import { GET_BY_NAME } from '../../providers/mssql/queries/company.js'; import request from '../request.js'; export default function getByName(pool) { diff --git a/src/store/company/list.js b/src/store/company/list.js index 2a0a41c..c37e78e 100644 --- a/src/store/company/list.js +++ b/src/store/company/list.js @@ -1,4 +1,4 @@ -import { LIST } from '../../sql/company.js'; +import { LIST } from '../../providers/mssql/queries/company.js'; export default function list(pool) { /** diff --git a/src/store/company/update.js b/src/store/company/update.js index f5b17f0..6246c79 100644 --- a/src/store/company/update.js +++ b/src/store/company/update.js @@ -1,4 +1,4 @@ -import { UPDATE } from '../../sql/company.js'; +import { UPDATE } from '../../providers/mssql/queries/company.js'; import getById from './getById.js'; import getByName from './getByName.js'; import langEnsure from '../lang/ensure.js'; diff --git a/src/store/companysetting/get.js b/src/store/companysetting/get.js index 9002577..0370b13 100644 --- a/src/store/companysetting/get.js +++ b/src/store/companysetting/get.js @@ -1,4 +1,4 @@ -import { GET_BY_COMPANY_AND_KEY } from '../../sql/companysetting.js'; +import { GET_BY_COMPANY_AND_KEY } from '../../providers/mssql/queries/companysetting.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import shapeSetting from './shapeSetting.js'; diff --git a/src/store/companysetting/list.js b/src/store/companysetting/list.js index 7879f2b..c7a9d4d 100644 --- a/src/store/companysetting/list.js +++ b/src/store/companysetting/list.js @@ -1,7 +1,7 @@ import { LIST_BY_COMPANY, LIST_BY_COMPANY_FRONTEND, -} from '../../sql/companysetting.js'; +} from '../../providers/mssql/queries/companysetting.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import shapeSetting from './shapeSetting.js'; diff --git a/src/store/companysetting/set.js b/src/store/companysetting/set.js index 96e804a..7e7fdf8 100644 --- a/src/store/companysetting/set.js +++ b/src/store/companysetting/set.js @@ -1,4 +1,4 @@ -import { GET_BY_COMPANY_AND_KEY, UPSERT } from '../../sql/companysetting.js'; +import { GET_BY_COMPANY_AND_KEY, UPSERT } from '../../providers/mssql/queries/companysetting.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import shapeSetting from './shapeSetting.js'; diff --git a/src/store/companyuser/add.js b/src/store/companyuser/add.js index 29cedd2..a879d13 100644 --- a/src/store/companyuser/add.js +++ b/src/store/companyuser/add.js @@ -1,4 +1,4 @@ -import { ADD } from '../../sql/companyuser.js'; +import { ADD } from '../../providers/mssql/queries/companyuser.js'; export default function add(pool) { /** diff --git a/src/store/companyuser/delete.js b/src/store/companyuser/delete.js index f0b5ffe..693c3cf 100644 --- a/src/store/companyuser/delete.js +++ b/src/store/companyuser/delete.js @@ -1,4 +1,4 @@ -import { DELETE } from '../../sql/companyuser.js'; +import { DELETE } from '../../providers/mssql/queries/companyuser.js'; export default function del(pool) { /** diff --git a/src/store/companyuser/getByEmail.js b/src/store/companyuser/getByEmail.js index ed4fd19..9378250 100644 --- a/src/store/companyuser/getByEmail.js +++ b/src/store/companyuser/getByEmail.js @@ -1,4 +1,4 @@ -import { GET_BY_EMAIL } from '../../sql/companyuser.js'; +import { GET_BY_EMAIL } from '../../providers/mssql/queries/companyuser.js'; export default function getByEmail(pool) { /** diff --git a/src/store/companyuser/resolveCompanyAccess.js b/src/store/companyuser/resolveCompanyAccess.js index 20a5ad4..bcacb18 100644 --- a/src/store/companyuser/resolveCompanyAccess.js +++ b/src/store/companyuser/resolveCompanyAccess.js @@ -1,4 +1,4 @@ -import { GET_COMPANY_ACCESS } from '../../sql/companyuser.js'; +import { GET_COMPANY_ACCESS } from '../../providers/mssql/queries/companyuser.js'; export default function resolveCompanyAccess(pool) { return async (googleAuthId, companyId) => { diff --git a/src/store/companyuser/resolveSelectedCompanyAccess.js b/src/store/companyuser/resolveSelectedCompanyAccess.js index fb7c629..4c466ce 100644 --- a/src/store/companyuser/resolveSelectedCompanyAccess.js +++ b/src/store/companyuser/resolveSelectedCompanyAccess.js @@ -1,4 +1,4 @@ -import { GET_BY_ID } from '../../sql/google_auth.js'; +import { GET_BY_ID } from '../../providers/mssql/queries/google_auth.js'; import resolveCompanyAccess from './resolveCompanyAccess.js'; export default function resolveSelectedCompanyAccess(pool) { diff --git a/src/store/customergroup/create.js b/src/store/customergroup/create.js index a7ac90e..e72ffb5 100644 --- a/src/store/customergroup/create.js +++ b/src/store/customergroup/create.js @@ -1,5 +1,5 @@ -import { CREATE, GET_NEXT_SORT } from '../../sql/customergroup.js'; -import { POS_GROUP_NAME, SUPPLIER_GROUP_NAME } from '../../sql/entity.js'; +import { CREATE, GET_NEXT_SORT } from '../../providers/mssql/queries/customergroup.js'; +import { POS_GROUP_NAME, SUPPLIER_GROUP_NAME } from '../../providers/mssql/queries/entity.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; const RESERVED_NAMES = new Set([POS_GROUP_NAME, SUPPLIER_GROUP_NAME]); diff --git a/src/store/customergroup/delete.js b/src/store/customergroup/delete.js index e534dc6..ce1e1ba 100644 --- a/src/store/customergroup/delete.js +++ b/src/store/customergroup/delete.js @@ -1,4 +1,4 @@ -import { DELETE_BY_COMPANY_AND_ID } from '../../sql/customergroup.js'; +import { DELETE_BY_COMPANY_AND_ID } from '../../providers/mssql/queries/customergroup.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/customergroup/list.js b/src/store/customergroup/list.js index b4074c5..5088f1e 100644 --- a/src/store/customergroup/list.js +++ b/src/store/customergroup/list.js @@ -1,4 +1,4 @@ -import { LIST_BY_COMPANY } from '../../sql/customergroup.js'; +import { LIST_BY_COMPANY } from '../../providers/mssql/queries/customergroup.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function list(pool) { diff --git a/src/store/customergroup/order.js b/src/store/customergroup/order.js index 272bf36..031e222 100644 --- a/src/store/customergroup/order.js +++ b/src/store/customergroup/order.js @@ -1,7 +1,7 @@ import { LIST_IDS_BY_COMPANY, UPDATE_SORT, -} from '../../sql/customergroup.js'; +} from '../../providers/mssql/queries/customergroup.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; diff --git a/src/store/customergroup/resolveCustomerGroupAccess.js b/src/store/customergroup/resolveCustomerGroupAccess.js index 5caf6dd..65853aa 100644 --- a/src/store/customergroup/resolveCustomerGroupAccess.js +++ b/src/store/customergroup/resolveCustomerGroupAccess.js @@ -1,4 +1,4 @@ -import { GET_BY_COMPANY_AND_ID } from '../../sql/customergroup.js'; +import { GET_BY_COMPANY_AND_ID } from '../../providers/mssql/queries/customergroup.js'; import request from '../request.js'; /** Ensure customergroup belongs to company. Throws Customer group not found. */ diff --git a/src/store/customergroup/update.js b/src/store/customergroup/update.js index 0711dfa..a742458 100644 --- a/src/store/customergroup/update.js +++ b/src/store/customergroup/update.js @@ -1,5 +1,5 @@ -import { GET_BY_COMPANY_AND_ID, UPDATE } from '../../sql/customergroup.js'; -import { POS_GROUP_NAME, SUPPLIER_GROUP_NAME } from '../../sql/entity.js'; +import { GET_BY_COMPANY_AND_ID, UPDATE } from '../../providers/mssql/queries/customergroup.js'; +import { POS_GROUP_NAME, SUPPLIER_GROUP_NAME } from '../../providers/mssql/queries/entity.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; const LOCKED_NAMES = new Set([POS_GROUP_NAME, SUPPLIER_GROUP_NAME]); diff --git a/src/store/delivery/attachments.js b/src/store/delivery/attachments.js index 39155c6..8df86ae 100644 --- a/src/store/delivery/attachments.js +++ b/src/store/delivery/attachments.js @@ -1,5 +1,5 @@ import { createHash } from 'node:crypto'; -import { LIST_BY_MANIFEST } from '../../sql/manifestattachment.js'; +import { LIST_BY_MANIFEST } from '../../providers/mssql/queries/manifestattachment.js'; import request from '../request.js'; import generateDocumentThumb from '../../util/generateDocumentThumb.js'; import { parseMeta } from '../manifestattachment/listByManifestId.js'; diff --git a/src/store/delivery/create.js b/src/store/delivery/create.js index dfae24e..e82ae19 100644 --- a/src/store/delivery/create.js +++ b/src/store/delivery/create.js @@ -4,7 +4,7 @@ import { CREATE_ATTACHMENT, GET_NEXT_ATTACHMENT_SORT, DELIVERY_TYPE, -} from '../../sql/delivery.js'; +} from '../../providers/mssql/queries/delivery.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import nextNumber from '../numbers/nextNumber.js'; diff --git a/src/store/delivery/delete.js b/src/store/delivery/delete.js index 2eb653e..271e640 100644 --- a/src/store/delivery/delete.js +++ b/src/store/delivery/delete.js @@ -1,4 +1,4 @@ -import { DELETE_MANIFEST, DELIVERY_TYPE } from '../../sql/delivery.js'; +import { DELETE_MANIFEST, DELIVERY_TYPE } from '../../providers/mssql/queries/delivery.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/delivery/helpers.js b/src/store/delivery/helpers.js index 6a7cab1..3c147e7 100644 --- a/src/store/delivery/helpers.js +++ b/src/store/delivery/helpers.js @@ -2,7 +2,7 @@ import { DELIVERY_TYPE, GET_DELIVERY_HEADER, GET_DELIVERY_LINES, -} from '../../sql/delivery.js'; +} from '../../providers/mssql/queries/delivery.js'; import request from '../request.js'; import { shapeLine } from '../manifestLines.js'; import { loadAttachments } from './attachments.js'; diff --git a/src/store/delivery/list.js b/src/store/delivery/list.js index 722e0c9..9ca3cf8 100644 --- a/src/store/delivery/list.js +++ b/src/store/delivery/list.js @@ -1,4 +1,4 @@ -import { DELIVERY_TYPE, LIST_DELIVERIES, LIST_DELIVERY_FILES } from '../../sql/delivery.js'; +import { DELIVERY_TYPE, LIST_DELIVERIES, LIST_DELIVERY_FILES } from '../../providers/mssql/queries/delivery.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import { shapeSummary } from './helpers.js'; diff --git a/src/store/delivery/update.js b/src/store/delivery/update.js index 27975ee..ab99e75 100644 --- a/src/store/delivery/update.js +++ b/src/store/delivery/update.js @@ -6,7 +6,7 @@ import { CREATE_FILE, CREATE_ATTACHMENT, UPDATE_MANIFEST, -} from '../../sql/delivery.js'; +} from '../../providers/mssql/queries/delivery.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import taxEnsure from '../tax/ensure.js'; diff --git a/src/store/delivery/writeLines.js b/src/store/delivery/writeLines.js index c1613f3..3dd8e73 100644 --- a/src/store/delivery/writeLines.js +++ b/src/store/delivery/writeLines.js @@ -1,4 +1,4 @@ -import { GET_SUPPLIER_BY_ID, SUPPLIER_GROUP_NAME } from '../../sql/entity.js'; +import { GET_SUPPLIER_BY_ID, SUPPLIER_GROUP_NAME } from '../../providers/mssql/queries/entity.js'; import request from '../request.js'; export async function assertSupplier(pool, tx, companyId, supplierId) { diff --git a/src/store/entity/create.js b/src/store/entity/create.js index 66a474b..7945bb0 100644 --- a/src/store/entity/create.js +++ b/src/store/entity/create.js @@ -1,5 +1,5 @@ -import { CREATE } from '../../sql/entity.js'; -import { INSERT as INSERT_HISTORY } from '../../sql/entityhistory.js'; +import { CREATE } from '../../providers/mssql/queries/entity.js'; +import { INSERT as INSERT_HISTORY } from '../../providers/mssql/queries/entityhistory.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveCustomerGroupAccess from '../customergroup/resolveCustomerGroupAccess.js'; diff --git a/src/store/entity/delete.js b/src/store/entity/delete.js index 96d096e..48b1504 100644 --- a/src/store/entity/delete.js +++ b/src/store/entity/delete.js @@ -1,4 +1,4 @@ -import { DELETE_BY_COMPANY_AND_ID } from '../../sql/entity.js'; +import { DELETE_BY_COMPANY_AND_ID } from '../../providers/mssql/queries/entity.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/entity/getById.js b/src/store/entity/getById.js index 4190608..af8d5c2 100644 --- a/src/store/entity/getById.js +++ b/src/store/entity/getById.js @@ -1,4 +1,4 @@ -import { GET_BY_COMPANY_AND_ID } from '../../sql/entity.js'; +import { GET_BY_COMPANY_AND_ID } from '../../providers/mssql/queries/entity.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import shape from './shape.js'; diff --git a/src/store/entity/isNumberFree.js b/src/store/entity/isNumberFree.js index 94fd267..1dad8a8 100644 --- a/src/store/entity/isNumberFree.js +++ b/src/store/entity/isNumberFree.js @@ -1,4 +1,4 @@ -import { NUMBER_TAKEN_IN_COMPANY } from '../../sql/entity.js'; +import { NUMBER_TAKEN_IN_COMPANY } from '../../providers/mssql/queries/entity.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function isNumberFree(pool) { diff --git a/src/store/entity/list.js b/src/store/entity/list.js index ad3d9c1..5433fdc 100644 --- a/src/store/entity/list.js +++ b/src/store/entity/list.js @@ -4,7 +4,7 @@ import { LIST_CUSTOMERS_BY_COMPANY, POS_GROUP_NAME, SUPPLIER_GROUP_NAME, -} from '../../sql/entity.js'; +} from '../../providers/mssql/queries/entity.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveCustomerGroupAccess from '../customergroup/resolveCustomerGroupAccess.js'; import shape from './shape.js'; diff --git a/src/store/entity/resolveEntityAccess.js b/src/store/entity/resolveEntityAccess.js index 458e443..944ea19 100644 --- a/src/store/entity/resolveEntityAccess.js +++ b/src/store/entity/resolveEntityAccess.js @@ -1,4 +1,4 @@ -import { GET_BY_COMPANY_AND_ID } from '../../sql/entity.js'; +import { GET_BY_COMPANY_AND_ID } from '../../providers/mssql/queries/entity.js'; import request from '../request.js'; /** Ensure entity belongs to company. Throws Entity not found. */ diff --git a/src/store/entity/update.js b/src/store/entity/update.js index c876667..d070f31 100644 --- a/src/store/entity/update.js +++ b/src/store/entity/update.js @@ -1,5 +1,5 @@ -import { GET_BY_COMPANY_AND_ID, UPDATE } from '../../sql/entity.js'; -import { INSERT as INSERT_HISTORY } from '../../sql/entityhistory.js'; +import { GET_BY_COMPANY_AND_ID, UPDATE } from '../../providers/mssql/queries/entity.js'; +import { INSERT as INSERT_HISTORY } from '../../providers/mssql/queries/entityhistory.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import shape from './shape.js'; diff --git a/src/store/entityaddress/create.js b/src/store/entityaddress/create.js index bf61b19..a00caf2 100644 --- a/src/store/entityaddress/create.js +++ b/src/store/entityaddress/create.js @@ -1,4 +1,4 @@ -import { CREATE, GET_NEXT_SORT } from '../../sql/entityaddress.js'; +import { CREATE, GET_NEXT_SORT } from '../../providers/mssql/queries/entityaddress.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveEntityAccess from '../entity/resolveEntityAccess.js'; diff --git a/src/store/entityaddress/delete.js b/src/store/entityaddress/delete.js index bf6f27d..c6a8867 100644 --- a/src/store/entityaddress/delete.js +++ b/src/store/entityaddress/delete.js @@ -1,4 +1,4 @@ -import { DELETE_BY_ENTITY_AND_ID } from '../../sql/entityaddress.js'; +import { DELETE_BY_ENTITY_AND_ID } from '../../providers/mssql/queries/entityaddress.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveEntityAccess from '../entity/resolveEntityAccess.js'; diff --git a/src/store/entityaddress/list.js b/src/store/entityaddress/list.js index c7fd471..c951b9a 100644 --- a/src/store/entityaddress/list.js +++ b/src/store/entityaddress/list.js @@ -1,4 +1,4 @@ -import { LIST_BY_ENTITY } from '../../sql/entityaddress.js'; +import { LIST_BY_ENTITY } from '../../providers/mssql/queries/entityaddress.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveEntityAccess from '../entity/resolveEntityAccess.js'; diff --git a/src/store/entityaddress/update.js b/src/store/entityaddress/update.js index f8f5cdc..0b4c2d2 100644 --- a/src/store/entityaddress/update.js +++ b/src/store/entityaddress/update.js @@ -1,4 +1,4 @@ -import { GET_BY_ENTITY_AND_ID, UPDATE } from '../../sql/entityaddress.js'; +import { GET_BY_ENTITY_AND_ID, UPDATE } from '../../providers/mssql/queries/entityaddress.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveEntityAccess from '../entity/resolveEntityAccess.js'; diff --git a/src/store/entitycontact/create.js b/src/store/entitycontact/create.js index be2d543..06c737f 100644 --- a/src/store/entitycontact/create.js +++ b/src/store/entitycontact/create.js @@ -1,4 +1,4 @@ -import { CREATE, GET_NEXT_SORT } from '../../sql/entitycontact.js'; +import { CREATE, GET_NEXT_SORT } from '../../providers/mssql/queries/entitycontact.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveEntityAccess from '../entity/resolveEntityAccess.js'; diff --git a/src/store/entitycontact/delete.js b/src/store/entitycontact/delete.js index f9603c7..f1817bb 100644 --- a/src/store/entitycontact/delete.js +++ b/src/store/entitycontact/delete.js @@ -1,4 +1,4 @@ -import { DELETE_BY_ENTITY_AND_ID } from '../../sql/entitycontact.js'; +import { DELETE_BY_ENTITY_AND_ID } from '../../providers/mssql/queries/entitycontact.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveEntityAccess from '../entity/resolveEntityAccess.js'; diff --git a/src/store/entitycontact/list.js b/src/store/entitycontact/list.js index cdb3027..0890d5d 100644 --- a/src/store/entitycontact/list.js +++ b/src/store/entitycontact/list.js @@ -1,4 +1,4 @@ -import { LIST_BY_ENTITY } from '../../sql/entitycontact.js'; +import { LIST_BY_ENTITY } from '../../providers/mssql/queries/entitycontact.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveEntityAccess from '../entity/resolveEntityAccess.js'; diff --git a/src/store/entitycontact/update.js b/src/store/entitycontact/update.js index 9c3f241..bda57ae 100644 --- a/src/store/entitycontact/update.js +++ b/src/store/entitycontact/update.js @@ -1,4 +1,4 @@ -import { GET_BY_ENTITY_AND_ID, UPDATE } from '../../sql/entitycontact.js'; +import { GET_BY_ENTITY_AND_ID, UPDATE } from '../../providers/mssql/queries/entitycontact.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveEntityAccess from '../entity/resolveEntityAccess.js'; diff --git a/src/store/google_auth/add.js b/src/store/google_auth/add.js index d898a4a..71edce9 100644 --- a/src/store/google_auth/add.js +++ b/src/store/google_auth/add.js @@ -1,4 +1,4 @@ -import { ADD } from '../../sql/google_auth.js'; +import { ADD } from '../../providers/mssql/queries/google_auth.js'; export default function add(pool) { /** diff --git a/src/store/google_auth/getByEmail.js b/src/store/google_auth/getByEmail.js index 1e7def7..2ad57b2 100644 --- a/src/store/google_auth/getByEmail.js +++ b/src/store/google_auth/getByEmail.js @@ -1,4 +1,4 @@ -import { GET_BY_EMAIL } from '../../sql/google_auth.js'; +import { GET_BY_EMAIL } from '../../providers/mssql/queries/google_auth.js'; export default function getByEmail(pool) { /** diff --git a/src/store/google_auth/getById.js b/src/store/google_auth/getById.js index 49718ae..d7be0ba 100644 --- a/src/store/google_auth/getById.js +++ b/src/store/google_auth/getById.js @@ -1,4 +1,4 @@ -import { GET_BY_ID } from '../../sql/google_auth.js'; +import { GET_BY_ID } from '../../providers/mssql/queries/google_auth.js'; export default function getById(pool) { /** diff --git a/src/store/google_auth/listAllowedEmails.js b/src/store/google_auth/listAllowedEmails.js index 5252714..6229316 100644 --- a/src/store/google_auth/listAllowedEmails.js +++ b/src/store/google_auth/listAllowedEmails.js @@ -1,4 +1,4 @@ -import { LIST_ALLOWED_EMAILS } from '../../sql/google_auth.js'; +import { LIST_ALLOWED_EMAILS } from '../../providers/mssql/queries/google_auth.js'; export default function listAllowedEmails(pool) { /** diff --git a/src/store/google_auth/removeAllowedEmail.js b/src/store/google_auth/removeAllowedEmail.js index d67dfe6..34e01df 100644 --- a/src/store/google_auth/removeAllowedEmail.js +++ b/src/store/google_auth/removeAllowedEmail.js @@ -1,4 +1,4 @@ -import { REMOVE_ALLOWED_EMAIL } from '../../sql/google_auth.js'; +import { REMOVE_ALLOWED_EMAIL } from '../../providers/mssql/queries/google_auth.js'; export default function removeAllowedEmail(pool) { /** diff --git a/src/store/google_auth/setProfile.js b/src/store/google_auth/setProfile.js index 8619aca..5b4d2d8 100644 --- a/src/store/google_auth/setProfile.js +++ b/src/store/google_auth/setProfile.js @@ -1,4 +1,4 @@ -import { SET_PROFILE } from '../../sql/google_auth.js'; +import { SET_PROFILE } from '../../providers/mssql/queries/google_auth.js'; export default function setProfile(pool) { /** diff --git a/src/store/google_auth/setSelectedCompany.js b/src/store/google_auth/setSelectedCompany.js index 6a3554a..1a89076 100644 --- a/src/store/google_auth/setSelectedCompany.js +++ b/src/store/google_auth/setSelectedCompany.js @@ -1,4 +1,4 @@ -import { SET_SELECTED_COMPANY } from '../../sql/google_auth.js'; +import { SET_SELECTED_COMPANY } from '../../providers/mssql/queries/google_auth.js'; export default function setSelectedCompany(pool) { /** diff --git a/src/store/initialize.js b/src/store/initialize.js index 34db917..1df1675 100644 --- a/src/store/initialize.js +++ b/src/store/initialize.js @@ -1,6 +1,6 @@ -import { SCHEMA_SCRIPTS } from '../schema.js'; +import { SCHEMA_SCRIPTS } from '../providers/mssql/schema.js'; -export default function initialize(pool) { +export default function initialize(provider) { /** * Initializes the database schema by running all schema scripts. * @@ -11,7 +11,7 @@ export default function initialize(pool) { */ return async () => { for (const script of SCHEMA_SCRIPTS) { - await pool.request().query(script); + await provider.query(script); } }; } diff --git a/src/store/lang/create.js b/src/store/lang/create.js index 75be363..60a9bf4 100644 --- a/src/store/lang/create.js +++ b/src/store/lang/create.js @@ -1,4 +1,4 @@ -import { CREATE } from '../../sql/language.js'; +import { CREATE } from '../../providers/mssql/queries/language.js'; import request from '../request.js'; export default function create(pool) { diff --git a/src/store/lang/delete.js b/src/store/lang/delete.js index 897b851..ad4cea3 100644 --- a/src/store/lang/delete.js +++ b/src/store/lang/delete.js @@ -1,4 +1,4 @@ -import { DELETE } from '../../sql/language.js'; +import { DELETE } from '../../providers/mssql/queries/language.js'; export default function del(pool) { /** diff --git a/src/store/lang/getByIso639.js b/src/store/lang/getByIso639.js index 93ccdb5..972caf9 100644 --- a/src/store/lang/getByIso639.js +++ b/src/store/lang/getByIso639.js @@ -1,4 +1,4 @@ -import { GET_BY_ISO639 } from '../../sql/language.js'; +import { GET_BY_ISO639 } from '../../providers/mssql/queries/language.js'; import request from '../request.js'; export default function getByIso639(pool) { diff --git a/src/store/lang/list.js b/src/store/lang/list.js index 792dc95..7fe92c3 100644 --- a/src/store/lang/list.js +++ b/src/store/lang/list.js @@ -1,4 +1,4 @@ -import { LIST } from '../../sql/language.js'; +import { LIST } from '../../providers/mssql/queries/language.js'; export default function list(pool) { /** diff --git a/src/store/manifestDoc/helpers.js b/src/store/manifestDoc/helpers.js index c6525cc..3e7e53a 100644 --- a/src/store/manifestDoc/helpers.js +++ b/src/store/manifestDoc/helpers.js @@ -1,12 +1,12 @@ import { GET_MANIFEST_HEADER, GET_MANIFEST_LINES, -} from '../../sql/manifestDoc.js'; +} from '../../providers/mssql/queries/manifestDoc.js'; import { GET_CUSTOMER_BY_ID, POS_GROUP_NAME, SUPPLIER_GROUP_NAME, -} from '../../sql/entity.js'; +} from '../../providers/mssql/queries/entity.js'; import request from '../request.js'; import { shapeLine } from '../manifestLines.js'; diff --git a/src/store/manifestLines.js b/src/store/manifestLines.js index ac18f54..5cba73b 100644 --- a/src/store/manifestLines.js +++ b/src/store/manifestLines.js @@ -1,4 +1,4 @@ -import { CREATE_LINE } from '../sql/manifestDoc.js'; +import { CREATE_LINE } from '../providers/mssql/queries/manifestDoc.js'; import request from './request.js'; /** diff --git a/src/store/manifestattachment/add.js b/src/store/manifestattachment/add.js index c4b63b1..700b1cd 100644 --- a/src/store/manifestattachment/add.js +++ b/src/store/manifestattachment/add.js @@ -5,7 +5,7 @@ import { CREATE_FILE, CREATE_ATTACHMENT, GET_NEXT_SORT, -} from '../../sql/manifestattachment.js'; +} from '../../providers/mssql/queries/manifestattachment.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveManifestAccess from './resolveManifestAccess.js'; import request from '../request.js'; diff --git a/src/store/manifestattachment/getById.js b/src/store/manifestattachment/getById.js index fd3587b..2b0e115 100644 --- a/src/store/manifestattachment/getById.js +++ b/src/store/manifestattachment/getById.js @@ -1,4 +1,4 @@ -import { GET_BY_ID } from '../../sql/manifestattachment.js'; +import { GET_BY_ID } from '../../providers/mssql/queries/manifestattachment.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveManifestAccess from './resolveManifestAccess.js'; import { parseMeta } from './listByManifestId.js'; diff --git a/src/store/manifestattachment/listByManifestId.js b/src/store/manifestattachment/listByManifestId.js index a954b5b..6771ac9 100644 --- a/src/store/manifestattachment/listByManifestId.js +++ b/src/store/manifestattachment/listByManifestId.js @@ -1,4 +1,4 @@ -import { LIST_BY_MANIFEST } from '../../sql/manifestattachment.js'; +import { LIST_BY_MANIFEST } from '../../providers/mssql/queries/manifestattachment.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveManifestAccess from './resolveManifestAccess.js'; import request from '../request.js'; diff --git a/src/store/manifestattachment/order.js b/src/store/manifestattachment/order.js index c5cd2fb..47219c1 100644 --- a/src/store/manifestattachment/order.js +++ b/src/store/manifestattachment/order.js @@ -2,7 +2,7 @@ import { LIST_IDS_BY_MANIFEST, SET_TEMP_SORTS, UPDATE_SORT, -} from '../../sql/manifestattachment.js'; +} from '../../providers/mssql/queries/manifestattachment.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveManifestAccess from './resolveManifestAccess.js'; import request from '../request.js'; diff --git a/src/store/manifestattachment/remove.js b/src/store/manifestattachment/remove.js index 1a1c46c..61c5390 100644 --- a/src/store/manifestattachment/remove.js +++ b/src/store/manifestattachment/remove.js @@ -1,4 +1,4 @@ -import { FIND_ATTACHMENT, DELETE_FILE } from '../../sql/manifestattachment.js'; +import { FIND_ATTACHMENT, DELETE_FILE } from '../../providers/mssql/queries/manifestattachment.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import resolveManifestAccess from './resolveManifestAccess.js'; import request from '../request.js'; diff --git a/src/store/manifestattachment/resolveManifestAccess.js b/src/store/manifestattachment/resolveManifestAccess.js index 88f57cc..ababa2b 100644 --- a/src/store/manifestattachment/resolveManifestAccess.js +++ b/src/store/manifestattachment/resolveManifestAccess.js @@ -1,4 +1,4 @@ -import { CHECK_MANIFEST_ACCESS } from '../../sql/manifestattachment.js'; +import { CHECK_MANIFEST_ACCESS } from '../../providers/mssql/queries/manifestattachment.js'; import request from '../request.js'; /** Ensure manifest belongs to company. Throws Manifest not found. */ diff --git a/src/store/numbers/list.js b/src/store/numbers/list.js index 970eaf5..fd7786d 100644 --- a/src/store/numbers/list.js +++ b/src/store/numbers/list.js @@ -1,4 +1,4 @@ -import { LIST_BY_COMPANY } from '../../sql/numbers.js'; +import { LIST_BY_COMPANY } from '../../providers/mssql/queries/numbers.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; function shape(row) { diff --git a/src/store/numbers/nextNumber.js b/src/store/numbers/nextNumber.js index 83cb246..aec8d74 100644 --- a/src/store/numbers/nextNumber.js +++ b/src/store/numbers/nextNumber.js @@ -1,4 +1,4 @@ -import { ENSURE_TYPE } from '../../sql/numbers.js'; +import { ENSURE_TYPE } from '../../providers/mssql/queries/numbers.js'; import request from '../request.js'; export default function nextNumber(pool) { diff --git a/src/store/numbers/peekNumber.js b/src/store/numbers/peekNumber.js index ff51293..9a92b30 100644 --- a/src/store/numbers/peekNumber.js +++ b/src/store/numbers/peekNumber.js @@ -1,4 +1,4 @@ -import { ENSURE_TYPE } from '../../sql/numbers.js'; +import { ENSURE_TYPE } from '../../providers/mssql/queries/numbers.js'; import request from '../request.js'; export default function peekNumber(pool) { diff --git a/src/store/numbers/update.js b/src/store/numbers/update.js index 2f90f7b..65a9786 100644 --- a/src/store/numbers/update.js +++ b/src/store/numbers/update.js @@ -1,7 +1,7 @@ import { GET_BY_COMPANY_AND_ID, UPDATE_BY_COMPANY_AND_ID, -} from '../../sql/numbers.js'; +} from '../../providers/mssql/queries/numbers.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; function shape(row) { diff --git a/src/store/order/create.js b/src/store/order/create.js index 83da40b..7c09968 100644 --- a/src/store/order/create.js +++ b/src/store/order/create.js @@ -1,4 +1,4 @@ -import { CREATE_MANIFEST, ORDER_TYPE } from '../../sql/manifestDoc.js'; +import { CREATE_MANIFEST, ORDER_TYPE } from '../../providers/mssql/queries/manifestDoc.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import taxEnsure from '../tax/ensure.js'; diff --git a/src/store/order/delete.js b/src/store/order/delete.js index bda8c41..71e33da 100644 --- a/src/store/order/delete.js +++ b/src/store/order/delete.js @@ -1,4 +1,4 @@ -import { DELETE_MANIFEST, ORDER_TYPE } from '../../sql/manifestDoc.js'; +import { DELETE_MANIFEST, ORDER_TYPE } from '../../providers/mssql/queries/manifestDoc.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/order/getById.js b/src/store/order/getById.js index 72242d8..48e9212 100644 --- a/src/store/order/getById.js +++ b/src/store/order/getById.js @@ -1,4 +1,4 @@ -import { ORDER_TYPE } from '../../sql/manifestDoc.js'; +import { ORDER_TYPE } from '../../providers/mssql/queries/manifestDoc.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import { loadDoc } from '../manifestDoc/helpers.js'; diff --git a/src/store/order/list.js b/src/store/order/list.js index 78a8441..58c8dee 100644 --- a/src/store/order/list.js +++ b/src/store/order/list.js @@ -1,4 +1,4 @@ -import { LIST_MANIFESTS, ORDER_TYPE } from '../../sql/manifestDoc.js'; +import { LIST_MANIFESTS, ORDER_TYPE } from '../../providers/mssql/queries/manifestDoc.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import { shapeSummary } from '../manifestDoc/helpers.js'; diff --git a/src/store/order/update.js b/src/store/order/update.js index f87c1de..e1b0aa1 100644 --- a/src/store/order/update.js +++ b/src/store/order/update.js @@ -3,7 +3,7 @@ import { GET_MANIFEST_HEADER, ORDER_TYPE, UPDATE_MANIFEST, -} from '../../sql/manifestDoc.js'; +} from '../../providers/mssql/queries/manifestDoc.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import taxEnsure from '../tax/ensure.js'; diff --git a/src/store/pic/getImageByHash.js b/src/store/pic/getImageByHash.js index 15a3e90..60f56a0 100644 --- a/src/store/pic/getImageByHash.js +++ b/src/store/pic/getImageByHash.js @@ -1,4 +1,4 @@ -import { GET_FULL_BY_HASH } from '../../sql/pic.js'; +import { GET_FULL_BY_HASH } from '../../providers/mssql/queries/pic.js'; import resolvePicAccess from './resolvePicAccess.js'; export default function getImageByHash(pool) { diff --git a/src/store/pic/getThumbByHash.js b/src/store/pic/getThumbByHash.js index 8b3dde7..d88acd9 100644 --- a/src/store/pic/getThumbByHash.js +++ b/src/store/pic/getThumbByHash.js @@ -1,4 +1,4 @@ -import { GET_THUMB_BY_HASH } from '../../sql/pic.js'; +import { GET_THUMB_BY_HASH } from '../../providers/mssql/queries/pic.js'; import resolvePicAccess from './resolvePicAccess.js'; export default function getThumbByHash(pool) { diff --git a/src/store/pic/resolvePicAccess.js b/src/store/pic/resolvePicAccess.js index 13519fe..dc8414e 100644 --- a/src/store/pic/resolvePicAccess.js +++ b/src/store/pic/resolvePicAccess.js @@ -1,4 +1,4 @@ -import { GET_CATEGORY_ID_BY_HASH } from '../../sql/pic.js'; +import { GET_CATEGORY_ID_BY_HASH } from '../../providers/mssql/queries/pic.js'; import resolveCategoryAccess from '../category/resolveCategoryAccess.js'; export default function resolvePicAccess(pool) { diff --git a/src/store/posterminal/delete.js b/src/store/posterminal/delete.js index 99c2063..302d252 100644 --- a/src/store/posterminal/delete.js +++ b/src/store/posterminal/delete.js @@ -1,4 +1,4 @@ -import { DELETE_BY_COMPANY_AND_ID } from '../../sql/posterminal.js'; +import { DELETE_BY_COMPANY_AND_ID } from '../../providers/mssql/queries/posterminal.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/posterminal/getCategoryPosterminalIds.js b/src/store/posterminal/getCategoryPosterminalIds.js index cd7ae99..9a69f35 100644 --- a/src/store/posterminal/getCategoryPosterminalIds.js +++ b/src/store/posterminal/getCategoryPosterminalIds.js @@ -1,4 +1,4 @@ -import { POSTERMINAL_IDS_BY_COMPANY } from '../../sql/posterminal.js'; +import { POSTERMINAL_IDS_BY_COMPANY } from '../../providers/mssql/queries/posterminal.js'; export default function getCategoryPosterminalIds(pool) { /** diff --git a/src/store/posterminal/list.js b/src/store/posterminal/list.js index de72524..c6d9729 100644 --- a/src/store/posterminal/list.js +++ b/src/store/posterminal/list.js @@ -1,4 +1,4 @@ -import { LIST_BY_COMPANY } from '../../sql/posterminal.js'; +import { LIST_BY_COMPANY } from '../../providers/mssql/queries/posterminal.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function list(pool) { diff --git a/src/store/posterminal/setOff.js b/src/store/posterminal/setOff.js index 04d50f2..2a85079 100644 --- a/src/store/posterminal/setOff.js +++ b/src/store/posterminal/setOff.js @@ -1,4 +1,4 @@ -import { GET_BY_ID, SET_OFF, LIST_CATEGORY_IDS } from '../../sql/posterminal.js'; +import { GET_BY_ID, SET_OFF, LIST_CATEGORY_IDS } from '../../providers/mssql/queries/posterminal.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function setOff(pool) { diff --git a/src/store/posterminal/setOffAll.js b/src/store/posterminal/setOffAll.js index a1bb6fd..09d2fca 100644 --- a/src/store/posterminal/setOffAll.js +++ b/src/store/posterminal/setOffAll.js @@ -1,4 +1,4 @@ -import { GET_BY_ID, SET_OFF_ALL, LIST_CATEGORY_IDS } from '../../sql/posterminal.js'; +import { GET_BY_ID, SET_OFF_ALL, LIST_CATEGORY_IDS } from '../../providers/mssql/queries/posterminal.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function setOffAll(pool) { diff --git a/src/store/posterminal/setOn.js b/src/store/posterminal/setOn.js index b25029d..48471ff 100644 --- a/src/store/posterminal/setOn.js +++ b/src/store/posterminal/setOn.js @@ -1,4 +1,4 @@ -import { GET_BY_ID, SET_ON, LIST_CATEGORY_IDS } from '../../sql/posterminal.js'; +import { GET_BY_ID, SET_ON, LIST_CATEGORY_IDS } from '../../providers/mssql/queries/posterminal.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function setOn(pool) { diff --git a/src/store/posterminal/setOnAll.js b/src/store/posterminal/setOnAll.js index aa7c0df..1dc34dc 100644 --- a/src/store/posterminal/setOnAll.js +++ b/src/store/posterminal/setOnAll.js @@ -1,6 +1,6 @@ -import { GET_BY_ID, SET_ON_ALL, LIST_CATEGORY_IDS } from '../../sql/posterminal.js'; +import { GET_BY_ID, SET_ON_ALL, LIST_CATEGORY_IDS } from '../../providers/mssql/queries/posterminal.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; -import { GET_COMPANY_ROOT_CATEGORY } from '../../sql/company.js'; +import { GET_COMPANY_ROOT_CATEGORY } from '../../providers/mssql/queries/company.js'; export default function setOnAll(pool) { const access = resolveSelectedCompanyAccess(pool); diff --git a/src/store/posterminal/upsert.js b/src/store/posterminal/upsert.js index 7510f82..5bd2f29 100644 --- a/src/store/posterminal/upsert.js +++ b/src/store/posterminal/upsert.js @@ -1,4 +1,4 @@ -import { GET_BY_ID, CREATE, UPDATE } from '../../sql/posterminal.js'; +import { GET_BY_ID, CREATE, UPDATE } from '../../providers/mssql/queries/posterminal.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function upsert(pool) { diff --git a/src/store/purge.js b/src/store/purge.js index 3599f8c..5dfe4dc 100644 --- a/src/store/purge.js +++ b/src/store/purge.js @@ -1,6 +1,6 @@ -import { buildPurgeSql } from '../sql/purge.js'; +import { buildPurgeSql } from '../providers/mssql/purgeSql.js'; -export default function purge(pool) { +export default function purge(provider) { /** * Purges (wipes) all data from the database. * @@ -10,6 +10,6 @@ export default function purge(pool) { * await store.purge(); */ return async () => { - await pool.request().query(buildPurgeSql()); + await provider.query(buildPurgeSql()); }; } diff --git a/src/store/quote/create.js b/src/store/quote/create.js index 94ad91f..7aeb3e4 100644 --- a/src/store/quote/create.js +++ b/src/store/quote/create.js @@ -1,4 +1,4 @@ -import { CREATE_MANIFEST, QUOTE_TYPE } from '../../sql/manifestDoc.js'; +import { CREATE_MANIFEST, QUOTE_TYPE } from '../../providers/mssql/queries/manifestDoc.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import taxEnsure from '../tax/ensure.js'; diff --git a/src/store/quote/delete.js b/src/store/quote/delete.js index 3e63681..d688309 100644 --- a/src/store/quote/delete.js +++ b/src/store/quote/delete.js @@ -1,4 +1,4 @@ -import { DELETE_MANIFEST, QUOTE_TYPE } from '../../sql/manifestDoc.js'; +import { DELETE_MANIFEST, QUOTE_TYPE } from '../../providers/mssql/queries/manifestDoc.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/quote/getById.js b/src/store/quote/getById.js index 9f28768..f336108 100644 --- a/src/store/quote/getById.js +++ b/src/store/quote/getById.js @@ -1,4 +1,4 @@ -import { QUOTE_TYPE } from '../../sql/manifestDoc.js'; +import { QUOTE_TYPE } from '../../providers/mssql/queries/manifestDoc.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import { loadDoc } from '../manifestDoc/helpers.js'; diff --git a/src/store/quote/list.js b/src/store/quote/list.js index fcbd968..c64703b 100644 --- a/src/store/quote/list.js +++ b/src/store/quote/list.js @@ -1,4 +1,4 @@ -import { LIST_MANIFESTS, QUOTE_TYPE } from '../../sql/manifestDoc.js'; +import { LIST_MANIFESTS, QUOTE_TYPE } from '../../providers/mssql/queries/manifestDoc.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import { shapeSummary } from '../manifestDoc/helpers.js'; diff --git a/src/store/quote/update.js b/src/store/quote/update.js index 39f300b..5348419 100644 --- a/src/store/quote/update.js +++ b/src/store/quote/update.js @@ -3,7 +3,7 @@ import { GET_MANIFEST_HEADER, QUOTE_TYPE, UPDATE_MANIFEST, -} from '../../sql/manifestDoc.js'; +} from '../../providers/mssql/queries/manifestDoc.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import taxEnsure from '../tax/ensure.js'; diff --git a/src/store/supplier/create.js b/src/store/supplier/create.js index 9a33614..3bdd6b0 100644 --- a/src/store/supplier/create.js +++ b/src/store/supplier/create.js @@ -1,5 +1,5 @@ -import { CREATE } from '../../sql/entity.js'; -import { INSERT as INSERT_HISTORY } from '../../sql/entityhistory.js'; +import { CREATE } from '../../providers/mssql/queries/entity.js'; +import { INSERT as INSERT_HISTORY } from '../../providers/mssql/queries/entityhistory.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import ensureLieferantenGroup from './ensureLieferantenGroup.js'; diff --git a/src/store/supplier/delete.js b/src/store/supplier/delete.js index ad8544a..9205298 100644 --- a/src/store/supplier/delete.js +++ b/src/store/supplier/delete.js @@ -1,4 +1,4 @@ -import { DELETE_BY_ID, SUPPLIER_GROUP_NAME } from '../../sql/entity.js'; +import { DELETE_BY_ID, SUPPLIER_GROUP_NAME } from '../../providers/mssql/queries/entity.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/supplier/ensureLieferantenGroup.js b/src/store/supplier/ensureLieferantenGroup.js index 470a4cf..b6abd0e 100644 --- a/src/store/supplier/ensureLieferantenGroup.js +++ b/src/store/supplier/ensureLieferantenGroup.js @@ -2,8 +2,8 @@ import { CREATE, GET_BY_COMPANY_AND_NAME, GET_NEXT_SORT, -} from '../../sql/customergroup.js'; -import { SUPPLIER_GROUP_NAME } from '../../sql/entity.js'; +} from '../../providers/mssql/queries/customergroup.js'; +import { SUPPLIER_GROUP_NAME } from '../../providers/mssql/queries/entity.js'; /** Ensure company has customergroup "Lieferanten"; return its id. */ export default async function ensureLieferantenGroup(pool, companyId, tx) { diff --git a/src/store/supplier/list.js b/src/store/supplier/list.js index c3b7896..8185f48 100644 --- a/src/store/supplier/list.js +++ b/src/store/supplier/list.js @@ -1,4 +1,4 @@ -import { LIST_SUPPLIERS_BY_COMPANY, SUPPLIER_GROUP_NAME } from '../../sql/entity.js'; +import { LIST_SUPPLIERS_BY_COMPANY, SUPPLIER_GROUP_NAME } from '../../providers/mssql/queries/entity.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function list(pool) { diff --git a/src/store/supplier/update.js b/src/store/supplier/update.js index 833f978..a658247 100644 --- a/src/store/supplier/update.js +++ b/src/store/supplier/update.js @@ -3,8 +3,8 @@ import { GET_SUPPLIER_BY_ID, SUPPLIER_GROUP_NAME, UPDATE_NAME, -} from '../../sql/entity.js'; -import { INSERT as INSERT_HISTORY } from '../../sql/entityhistory.js'; +} from '../../providers/mssql/queries/entity.js'; +import { INSERT as INSERT_HISTORY } from '../../providers/mssql/queries/entityhistory.js'; import request from '../request.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; diff --git a/src/store/tax/create.js b/src/store/tax/create.js index 1b5bbf5..7c3f0b3 100644 --- a/src/store/tax/create.js +++ b/src/store/tax/create.js @@ -1,4 +1,4 @@ -import { CREATE } from '../../sql/tax.js'; +import { CREATE } from '../../providers/mssql/queries/tax.js'; import request from '../request.js'; export default function create(pool) { diff --git a/src/store/tax/getByRate.js b/src/store/tax/getByRate.js index c76aae7..f6d74c6 100644 --- a/src/store/tax/getByRate.js +++ b/src/store/tax/getByRate.js @@ -1,4 +1,4 @@ -import { GET_BY_RATE } from '../../sql/tax.js'; +import { GET_BY_RATE } from '../../providers/mssql/queries/tax.js'; import request from '../request.js'; export default function getByRate(pool) { diff --git a/src/store/tax/list.js b/src/store/tax/list.js index 28ec6a1..a826971 100644 --- a/src/store/tax/list.js +++ b/src/store/tax/list.js @@ -1,4 +1,4 @@ -import { LIST } from '../../sql/tax.js'; +import { LIST } from '../../providers/mssql/queries/tax.js'; export default function list(pool) { /** diff --git a/src/store/unit/delete.js b/src/store/unit/delete.js index 69dae4d..7becb26 100644 --- a/src/store/unit/delete.js +++ b/src/store/unit/delete.js @@ -1,4 +1,4 @@ -import { DELETE_BY_COMPANY_AND_SI } from '../../sql/unit.js'; +import { DELETE_BY_COMPANY_AND_SI } from '../../providers/mssql/queries/unit.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; export default function del(pool) { diff --git a/src/store/unit/ensureDefault.js b/src/store/unit/ensureDefault.js index b7ed02c..9e43afc 100644 --- a/src/store/unit/ensureDefault.js +++ b/src/store/unit/ensureDefault.js @@ -1,8 +1,8 @@ -import { CREATE, GET_BY_SI } from '../../sql/unit.js'; +import { CREATE, GET_BY_SI } from '../../providers/mssql/queries/unit.js'; import { CREATE as CREATE_UNITTEXT, GET_BY_UNIT_AND_LANGUAGE, -} from '../../sql/unittext.js'; +} from '../../providers/mssql/queries/unittext.js'; import request from '../request.js'; const DEFAULT_SI = 'pc'; diff --git a/src/store/unit/list.js b/src/store/unit/list.js index c4c05cd..9bdf2ed 100644 --- a/src/store/unit/list.js +++ b/src/store/unit/list.js @@ -1,4 +1,4 @@ -import { LIST_BY_COMPANY } from '../../sql/unit.js'; +import { LIST_BY_COMPANY } from '../../providers/mssql/queries/unit.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import shapeUnit from './shapeUnit.js'; diff --git a/src/store/unit/upsert.js b/src/store/unit/upsert.js index ae4d551..b08879b 100644 --- a/src/store/unit/upsert.js +++ b/src/store/unit/upsert.js @@ -3,12 +3,12 @@ import { GET_BY_SI, GET_FULL_BY_SI, UPDATE_BY_SI, -} from '../../sql/unit.js'; +} from '../../providers/mssql/queries/unit.js'; import { CREATE as CREATE_UNITTEXT, GET_BY_UNIT_AND_LANGUAGE, UPDATE_BY_UNIT_AND_LANGUAGE, -} from '../../sql/unittext.js'; +} from '../../providers/mssql/queries/unittext.js'; import resolveSelectedCompanyAccess from '../companyuser/resolveSelectedCompanyAccess.js'; import request from '../request.js'; import shapeUnit from './shapeUnit.js';