@antelopejs/rethinkdb 1.6.0 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +36 -41
- package/dist/connection.js +3 -2
- package/dist/connection.js.map +1 -1
- package/dist/implementations/catalog/discovery.js +5 -21
- package/dist/implementations/catalog/discovery.js.map +1 -1
- package/dist/implementations/database/atomic.js +5 -3
- package/dist/implementations/database/atomic.js.map +1 -1
- package/dist/implementations/database/expression.d.ts +3 -2
- package/dist/implementations/database/expression.js +217 -136
- package/dist/implementations/database/expression.js.map +1 -1
- package/dist/implementations/database/external-probe.d.ts +2 -2
- package/dist/implementations/database/external-probe.js +49 -18
- package/dist/implementations/database/external-probe.js.map +1 -1
- package/dist/implementations/database/external-read.d.ts +2 -1
- package/dist/implementations/database/external-read.js +17 -1
- package/dist/implementations/database/external-read.js.map +1 -1
- package/dist/implementations/database/external-selection.d.ts +2 -2
- package/dist/implementations/database/external-selection.js +6 -5
- package/dist/implementations/database/external-selection.js.map +1 -1
- package/dist/implementations/database/external-writes.d.ts +2 -6
- package/dist/implementations/database/external-writes.js +36 -12
- package/dist/implementations/database/external-writes.js.map +1 -1
- package/dist/implementations/database/initialize.js +2 -1
- package/dist/implementations/database/initialize.js.map +1 -1
- package/dist/implementations/database/query.d.ts +1 -4
- package/dist/implementations/database/query.js +31 -17
- package/dist/implementations/database/query.js.map +1 -1
- package/dist/implementations/database/schema.js +19 -16
- package/dist/implementations/database/schema.js.map +1 -1
- package/dist/implementations/database/selection-stages.js +121 -98
- package/dist/implementations/database/selection-stages.js.map +1 -1
- package/dist/implementations/database/selection.d.ts +4 -3
- package/dist/implementations/database/selection.js +28 -17
- package/dist/implementations/database/selection.js.map +1 -1
- package/dist/implementations/database/stream.js +69 -77
- package/dist/implementations/database/stream.js.map +1 -1
- package/dist/implementations/database/utils.d.ts +11 -3
- package/dist/implementations/database/utils.js +27 -0
- package/dist/implementations/database/utils.js.map +1 -1
- package/dist/test/atomic-mutation.test.js +7 -2
- package/dist/test/atomic-mutation.test.js.map +1 -1
- package/dist/test/desc-order.test.d.ts +1 -0
- package/dist/test/desc-order.test.js +27 -0
- package/dist/test/desc-order.test.js.map +1 -0
- package/dist/test/instance-indexes.test.js +24 -13
- package/dist/test/instance-indexes.test.js.map +1 -1
- package/dist/test/stage-names.test.d.ts +1 -0
- package/dist/test/stage-names.test.js +60 -0
- package/dist/test/stage-names.test.js.map +1 -0
- package/dist/test/typed-operations.test.d.ts +1 -0
- package/dist/test/typed-operations.test.js +103 -0
- package/dist/test/typed-operations.test.js.map +1 -0
- package/dist/test/untyped-operations.test.d.ts +1 -0
- package/dist/test/untyped-operations.test.js +45 -0
- package/dist/test/untyped-operations.test.js.map +1 -0
- package/dist/test-external/catalog.test.js +1 -1
- package/dist/test-external/catalog.test.js.map +1 -1
- package/dist/test-external/erp.d.ts +1 -1
- package/dist/test-external/erp.js.map +1 -1
- package/dist/test-external/pinned-keys.test.d.ts +1 -0
- package/dist/test-external/pinned-keys.test.js +53 -0
- package/dist/test-external/pinned-keys.test.js.map +1 -0
- package/dist/write-result.d.ts +12 -1
- package/dist/write-result.js +19 -1
- package/dist/write-result.js.map +1 -1
- package/package.json +6 -5
package/README.md
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
#
|
|
1
|
+
# `@antelopejs/rethinkdb`
|
|
2
2
|
|
|
3
3
|
<div align="center">
|
|
4
|
-
<a href="https://www.npmjs.com/package/@antelopejs/rethinkdb"><img alt="npm" src="https://img.shields.io/npm/v/@antelopejs/rethinkdb?style=for-the-badge&labelColor=000000&color=000000"></a>
|
|
5
|
-
<a href="./LICENSE"><img alt="License" src="https://img.shields.io/npm/l/@antelopejs/rethinkdb?style=for-the-badge&labelColor=000000&color=000000"></a>
|
|
6
|
-
<a href="https://discord.gg/
|
|
7
|
-
<a href="https://interfaces.antelopejs.com/docs/database"><img src="https://img.shields.io/badge/Docs-18181B?style=for-the-badge&color=000000" alt="Documentation"></a>
|
|
4
|
+
<a href="https://www.npmjs.com/package/@antelopejs/rethinkdb"><img data-illustration alt="npm" src="https://img.shields.io/npm/v/@antelopejs/rethinkdb?style=for-the-badge&labelColor=000000&color=000000"></a>
|
|
5
|
+
<a href="./LICENSE"><img data-illustration alt="License" src="https://img.shields.io/npm/l/@antelopejs/rethinkdb?style=for-the-badge&labelColor=000000&color=000000"></a>
|
|
6
|
+
<a href="https://discord.gg/g4pFt6eXqu"><img data-illustration src="https://img.shields.io/badge/Discord-18181B?logo=discord&style=for-the-badge&color=000000" alt="Discord"></a>
|
|
7
|
+
<a href="https://interfaces.antelopejs.com/docs/database"><img data-illustration src="https://img.shields.io/badge/Docs-18181B?style=for-the-badge&color=000000" alt="Documentation"></a>
|
|
8
8
|
</div>
|
|
9
9
|
|
|
10
|
-
The RethinkDB backend of AntelopeJS
|
|
10
|
+
The RethinkDB backend of AntelopeJS. It runs the queries of the database interface on RethinkDB through [`rethinkdb-ts`](https://github.com/rethinkdb/rethinkdb-ts), and gives that driver to the modules that need it directly.
|
|
11
|
+
|
|
12
|
+
Part of [AntelopeJS](https://github.com/AntelopeJS/antelopejs). Used by [AntelopeJS DMS](https://github.com/AntelopeJS/dms), the open-source back office for your PostgreSQL, MongoDB or RethinkDB database.
|
|
11
13
|
|
|
12
14
|
## Interfaces
|
|
13
15
|
|
|
@@ -17,7 +19,7 @@ The RethinkDB backend of AntelopeJS: it runs the database interface's queries on
|
|
|
17
19
|
| [`@antelopejs/interface-rethinkdb`](https://github.com/AntelopeJS/interface-rethinkdb) | [RethinkDB](https://interfaces.antelopejs.com/docs/rethinkdb/introduction) |
|
|
18
20
|
| [`@antelopejs/interface-database-catalog`](https://github.com/AntelopeJS/interface-database-catalog) | [External mode](docs/external-mode.md#the-catalog) |
|
|
19
21
|
|
|
20
|
-
|
|
22
|
+
The database interface pages document schemas, tables, queries, change feeds, and atomic mutations.
|
|
21
23
|
|
|
22
24
|
## Install
|
|
23
25
|
|
|
@@ -25,11 +27,11 @@ Schemas, tables, queries, change feeds and atomic mutations are documented on th
|
|
|
25
27
|
ajs project modules add @antelopejs/rethinkdb
|
|
26
28
|
```
|
|
27
29
|
|
|
28
|
-
The command writes the
|
|
30
|
+
The command writes the default configuration of the module, which opens a connection pool to `127.0.0.1:28015` as `admin`.
|
|
29
31
|
|
|
30
32
|
## Configuration
|
|
31
33
|
|
|
32
|
-
The module connects
|
|
34
|
+
The module connects through a connection pool (`pool`) or through a single connection (`connection`). When both are set, `pool` wins. When `url` is set, the module builds the pool from it and ignores `connection`.
|
|
33
35
|
|
|
34
36
|
```typescript [antelope.config.ts]
|
|
35
37
|
import { defineConfig } from "@antelopejs/interface-core/config";
|
|
@@ -62,22 +64,22 @@ export default defineConfig({
|
|
|
62
64
|
|
|
63
65
|
For a single connection:
|
|
64
66
|
|
|
65
|
-
```typescript
|
|
67
|
+
```typescript fragment
|
|
66
68
|
config: {
|
|
67
69
|
connection: { host: "127.0.0.1", port: 28015, user: "admin", password: "" },
|
|
68
70
|
},
|
|
69
71
|
```
|
|
70
72
|
|
|
71
|
-
| Key | Description
|
|
72
|
-
| -------------------- |
|
|
73
|
-
| `pool` | `rethinkdb-ts` pool options (`RPoolConnectionOptions`), passed to `r.connectPool()`.
|
|
74
|
-
| `connection` | `rethinkdb-ts` connection options (`RConnectionOptions`), passed to `r.connect()`. Used when `pool`
|
|
75
|
-
| `url` | `rethinkdb://user:password@host:port/database`, parsed into pool options. Required in external mode.
|
|
76
|
-
| `mode` | `owned` (default)
|
|
77
|
-
| `statementTimeoutMs` | Time limit of each read of an external instance
|
|
78
|
-
| `catalog` | `{ enabled?: boolean }
|
|
73
|
+
| Key | Description |
|
|
74
|
+
| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
75
|
+
| `pool` | `rethinkdb-ts` pool options (`RPoolConnectionOptions`), passed to `r.connectPool()`. |
|
|
76
|
+
| `connection` | `rethinkdb-ts` connection options (`RConnectionOptions`), passed to `r.connect()`. Used when `pool` and `url` are unset. |
|
|
77
|
+
| `url` | `rethinkdb://user:password@host:port/database`, parsed into pool options. The port defaults to `28015` and the user to `admin`. Required in external mode. |
|
|
78
|
+
| `mode` | `owned` (default) creates a database per schema and scopes rows to instances. `external` serves a database the module did not create. See [External mode](docs/external-mode.md). |
|
|
79
|
+
| `statementTimeoutMs` | Time limit, in milliseconds, of each read of an external instance. The module closes the connection of a read that runs past it. It must be a positive safe integer. |
|
|
80
|
+
| `catalog` | `{ enabled?: boolean }`. Turns the catalog of an external instance on or off. Unset, the catalog answers under `ajs project dev` and `ajs project run` only. |
|
|
79
81
|
|
|
80
|
-
The module refuses to start when none of `url`, `pool
|
|
82
|
+
The module refuses to start when none of `url`, `pool`, or `connection` is set, and when `mode` is neither `owned` nor `external`. The option types come from [`rethinkdb-ts`](https://github.com/rethinkdb/rethinkdb-ts).
|
|
81
83
|
|
|
82
84
|
## Quick start
|
|
83
85
|
|
|
@@ -87,26 +89,26 @@ In the module that stores data, add the database interface:
|
|
|
87
89
|
pnpm add @antelopejs/interface-database
|
|
88
90
|
```
|
|
89
91
|
|
|
90
|
-
Then follow the [database interface guide](https://framework.antelopejs.com/docs/guides/database) to declare a schema and query it. The same code runs on [`@antelopejs/mongodb`](https://github.com/AntelopeJS/mongodb).
|
|
92
|
+
Then follow the [database interface guide](https://framework.antelopejs.com/docs/guides/database) to declare a schema and query it. The same code runs on [`@antelopejs/postgres`](https://github.com/AntelopeJS/postgres) and [`@antelopejs/mongodb`](https://github.com/AntelopeJS/mongodb).
|
|
91
93
|
|
|
92
94
|
To use the driver directly instead, add `@antelopejs/interface-rethinkdb` and read its [documentation](https://interfaces.antelopejs.com/docs/rethinkdb/introduction).
|
|
93
95
|
|
|
94
96
|
## Storage layout
|
|
95
97
|
|
|
96
|
-
- Each schema is a RethinkDB database, and each schema table is a table in it. Every table has a `tenant_id` index that scopes it to one instance.
|
|
97
|
-
- Each declared index `<name>` becomes a `<name>__i` index led by the instance. An index declared with `crossInstance: true` also gets an unprefixed `<name>` index for `CROSS_INSTANCE` queries
|
|
98
|
-
- The primary key is the `_id` field,
|
|
99
|
-
- RethinkDB cannot enforce unique secondary indexes
|
|
100
|
-
- Schema initialization creates missing databases, tables and indexes
|
|
98
|
+
- Each schema is a RethinkDB database, and each schema table is a table in it. Every table has a `tenant_id` index that scopes it to one instance. The database also holds an `__instances__` table that records the instances of the schema.
|
|
99
|
+
- Each declared index `<name>` becomes a `<name>__i` index led by the instance. An index declared with `crossInstance: true` also gets an unprefixed `<name>` index for `CROSS_INSTANCE` queries. Without that index, those queries scan the table and log a warning once per index. Initialization refuses a declared index whose name ends in `__i`.
|
|
100
|
+
- The primary key is the `_id` field, which all instances of a table share. An insert of an `_id` that any instance already uses throws a `DuplicateKeyError` on `_id`.
|
|
101
|
+
- RethinkDB cannot enforce unique secondary indexes. Schema initialization refuses a table that declares an index with `unique: true`, and the error names the schema, the table, and the index.
|
|
102
|
+
- Schema initialization creates the missing databases, tables, and indexes. It makes up to five attempts, and it waits for the indexes before the schema accepts queries.
|
|
101
103
|
|
|
102
|
-
|
|
104
|
+
Initialization builds every missing index at boot, so a boot that adds indexes to a large table takes longer. The module never drops an index. Drop an index you no longer need by hand, for example `r.db("<schema>").table("<table>").indexDrop("<name>")`. [`CHANGELOG.md`](CHANGELOG.md) records when the index layout changed.
|
|
103
105
|
|
|
104
106
|
## Documentation
|
|
105
107
|
|
|
106
|
-
- [Database](https://interfaces.antelopejs.com/docs/database)
|
|
107
|
-
- [RethinkDB](https://interfaces.antelopejs.com/docs/rethinkdb/introduction)
|
|
108
|
-
- [External mode](docs/external-mode.md)
|
|
109
|
-
- [Configuration](https://framework.antelopejs.com/docs/concepts/configuration)
|
|
108
|
+
- [Database](https://interfaces.antelopejs.com/docs/database) documents `@antelopejs/interface-database`, which this module implements.
|
|
109
|
+
- [RethinkDB](https://interfaces.antelopejs.com/docs/rethinkdb/introduction) documents `@antelopejs/interface-rethinkdb`, which this module implements.
|
|
110
|
+
- [External mode](docs/external-mode.md) explains how the module serves a database it did not create, and what its catalog answers.
|
|
111
|
+
- [Configuration](https://framework.antelopejs.com/docs/concepts/configuration) documents module sources, `config` blocks, and config variables in `antelope.config.ts`.
|
|
110
112
|
|
|
111
113
|
## Compatibility
|
|
112
114
|
|
|
@@ -115,20 +117,13 @@ Version 1.4 added the `<name>__i` indexes. The first boot after an upgrade build
|
|
|
115
117
|
| Package | Supported | Tested with |
|
|
116
118
|
| ---------------------------------------- | ---------------- | ----------- |
|
|
117
119
|
| `@antelopejs/interface-core` | `>=0.2.4 <1.0.0` | `0.2.4` |
|
|
118
|
-
| `@antelopejs/interface-database` | `>=0.
|
|
120
|
+
| `@antelopejs/interface-database` | `>=0.3.0 <0.4.0` | `0.3.0` |
|
|
119
121
|
| `@antelopejs/interface-database-catalog` | `>=0.0.3 <0.1.0` | `0.0.3` |
|
|
120
122
|
| `@antelopejs/interface-rethinkdb` | `>=0.1.0 <0.2.0` | `0.1.0` |
|
|
121
123
|
|
|
122
124
|
<!-- antelopejs-docs-compat:end -->
|
|
123
125
|
|
|
124
|
-
|
|
125
|
-
| ---------------------------------------- | ---------------- |
|
|
126
|
-
| `@antelopejs/interface-database` | `>=0.2.0 <0.3.0` |
|
|
127
|
-
| `@antelopejs/interface-rethinkdb` | `>=0.1.0 <0.2.0` |
|
|
128
|
-
| `@antelopejs/interface-database-catalog` | `>=0.0.3 <0.1.0` |
|
|
129
|
-
| `@antelopejs/interface-core` | `>=0.2.4 <1.0.0` |
|
|
130
|
-
|
|
131
|
-
The module is developed and tested against `@antelopejs/core` `^1.13.4` on Node.js 24, with `rethinkdb-ts` `^2.7.0` and RethinkDB 2.4.
|
|
126
|
+
The repository pins its Node.js version in `.nvmrc`. The `rethinkdb-ts` range is in the `dependencies` of `package.json`. The RethinkDB image that the tests run against is in `.github/release-services.yml`.
|
|
132
127
|
|
|
133
128
|
## Contributing
|
|
134
129
|
|
|
@@ -146,10 +141,10 @@ pnpm lint
|
|
|
146
141
|
pnpm format:check
|
|
147
142
|
pnpm typecheck
|
|
148
143
|
pnpm knip
|
|
149
|
-
pnpm test # build, then
|
|
144
|
+
pnpm test # build, then the owned and external-mode suites
|
|
150
145
|
```
|
|
151
146
|
|
|
152
|
-
The tests also run the shared conformance
|
|
147
|
+
The tests also run the shared conformance suites of `@antelopejs/interface-database`. Read the [contribution guidelines](CONTRIBUTING.md) before opening a pull request.
|
|
153
148
|
|
|
154
149
|
## License
|
|
155
150
|
|
package/dist/connection.js
CHANGED
|
@@ -82,8 +82,9 @@ async function Resolve(term, cursor) {
|
|
|
82
82
|
}
|
|
83
83
|
const cursorType = cursor.getType();
|
|
84
84
|
if (cursorType === "Atom") {
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
const atom = results[0];
|
|
86
|
+
(0, write_result_1.validateWriteResult)(term, (0, write_result_1.IsWriteResult)(atom) ? atom : undefined);
|
|
87
|
+
return atom;
|
|
87
88
|
}
|
|
88
89
|
if (cursorType === "Cursor") {
|
|
89
90
|
return await cursor.toArray();
|
package/dist/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;;;;;AAkDA,sCAQC;AAED,kCAQC;AAED,gCAYC;AAED,8BAYC;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,10 @@ exports.DescribeTable = DescribeTable;
|
|
|
7
7
|
const rethinkdb_ts_1 = require("rethinkdb-ts");
|
|
8
8
|
const config_1 = require("../../config");
|
|
9
9
|
const external_descriptor_1 = require("../database/external-descriptor");
|
|
10
|
+
const utils_1 = require("../database/utils");
|
|
10
11
|
const external_probe_1 = require("../database/external-probe");
|
|
11
12
|
const measures_1 = require("./measures");
|
|
12
13
|
const DEFAULT_PRIMARY_KEY = "id";
|
|
13
|
-
const KEY_SAMPLE = 1000;
|
|
14
14
|
const FALLBACK_ROWS = 1000;
|
|
15
15
|
const UNREACHABLE_KEY = "__antelopejs_write_probe__ no row has this key";
|
|
16
16
|
const DOMINANT_SHARE = 0.8;
|
|
@@ -34,7 +34,7 @@ async function ReadInfo() {
|
|
|
34
34
|
.catch(() => "unknown");
|
|
35
35
|
return {
|
|
36
36
|
engine: "rethinkdb",
|
|
37
|
-
version,
|
|
37
|
+
version: (0, utils_1.IsText)(version) ? version : "unknown",
|
|
38
38
|
database: (0, config_1.ExternalDatabaseName)(),
|
|
39
39
|
role: (0, config_1.GetOptions)().pool?.user ?? "admin",
|
|
40
40
|
};
|
|
@@ -42,13 +42,12 @@ async function ReadInfo() {
|
|
|
42
42
|
async function ListTable(name) {
|
|
43
43
|
const info = await (0, external_probe_1.Table)(name).info().run();
|
|
44
44
|
const primaryKey = info.primary_key ?? DEFAULT_PRIMARY_KEY;
|
|
45
|
-
const
|
|
45
|
+
const uuidKeys = await (0, external_probe_1.UuidKeys)(name, primaryKey);
|
|
46
46
|
return {
|
|
47
47
|
name,
|
|
48
48
|
primaryKey,
|
|
49
49
|
estimatedRows: (info.doc_count_estimates ?? []).reduce((sum, count) => sum + count, 0),
|
|
50
|
-
uuidKeys
|
|
51
|
-
keys.every((key) => external_probe_1.UUID_TEXT_PATTERN.test(String(key))),
|
|
50
|
+
uuidKeys,
|
|
52
51
|
};
|
|
53
52
|
}
|
|
54
53
|
async function Writes(name) {
|
|
@@ -74,21 +73,6 @@ async function Summarize(table) {
|
|
|
74
73
|
comment: null,
|
|
75
74
|
};
|
|
76
75
|
}
|
|
77
|
-
async function Indexes(name) {
|
|
78
|
-
const statuses = await (0, external_probe_1.Table)(name)
|
|
79
|
-
.indexStatus()
|
|
80
|
-
.map((status) => ({
|
|
81
|
-
index: status("index"),
|
|
82
|
-
multi: status("multi"),
|
|
83
|
-
query: status("query"),
|
|
84
|
-
}))
|
|
85
|
-
.run();
|
|
86
|
-
return statuses.map((status) => ({
|
|
87
|
-
name: status.index,
|
|
88
|
-
fields: (0, external_probe_1.IndexFields)(status.query),
|
|
89
|
-
multi: status.multi,
|
|
90
|
-
}));
|
|
91
|
-
}
|
|
92
76
|
function FieldTypes(rows) {
|
|
93
77
|
return (0, measures_1.Described)(rows
|
|
94
78
|
.concatMap((row) => row.keys().map((key) => ({ f: key, t: row(key).typeOf() })))
|
|
@@ -197,7 +181,7 @@ async function DescribeTable(table) {
|
|
|
197
181
|
return {
|
|
198
182
|
...summary,
|
|
199
183
|
columns,
|
|
200
|
-
indexes: (await Indexes(table.name)).map((index) => ({
|
|
184
|
+
indexes: (await (0, external_probe_1.Indexes)(table.name)).map((index) => ({
|
|
201
185
|
name: index.name,
|
|
202
186
|
columns: index.fields,
|
|
203
187
|
unique: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/implementations/catalog/discovery.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/implementations/catalog/discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const error_1 = require("rethinkdb-ts/lib/error/error");
|
|
|
11
11
|
const query_1 = require("rethinkdb-ts/lib/query-builder/query");
|
|
12
12
|
const atomic_1 = require("@antelopejs/interface-database/atomic");
|
|
13
13
|
const connection_1 = require("../../connection");
|
|
14
|
+
const write_result_1 = require("../../write-result");
|
|
14
15
|
const utils_1 = require("./utils");
|
|
15
16
|
const DEFINITIVE_ERRORS = new Set([
|
|
16
17
|
rethinkdb_ts_1.RethinkDBErrorType.AUTH,
|
|
@@ -33,7 +34,8 @@ async function runAtomicMutation(table, tenantId, key, request) {
|
|
|
33
34
|
(0, atomic_1.ValidateAtomicMutation)(key, request, [utils_1.TENANT_ID_FIELD]);
|
|
34
35
|
const term = buildAtomicTerm(table, tenantId, key, request);
|
|
35
36
|
try {
|
|
36
|
-
|
|
37
|
+
const result = await (0, connection_1.executeTermJson)(term);
|
|
38
|
+
return (0, write_result_1.IsWriteResult)(result) ? mutationOutcome(result) : "unknown";
|
|
37
39
|
}
|
|
38
40
|
catch (error) {
|
|
39
41
|
if ((0, error_1.isRethinkDBError)(error) && DEFINITIVE_ERRORS.has(error.type)) {
|
|
@@ -100,8 +102,8 @@ function fieldEquals(doc, field, value) {
|
|
|
100
102
|
];
|
|
101
103
|
}
|
|
102
104
|
function mutationOutcome(result) {
|
|
103
|
-
if (result
|
|
104
|
-
result
|
|
105
|
+
if (result.errors !== 0 ||
|
|
106
|
+
result.inserted !== 0 ||
|
|
105
107
|
!WRITE_COUNTS.every((field) => Number.isInteger(result[field]) && result[field] >= 0) ||
|
|
106
108
|
WRITE_COUNTS.reduce((sum, field) => sum + result[field], 0) !== 1) {
|
|
107
109
|
return "unknown";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomic.js","sourceRoot":"","sources":["../../../src/implementations/database/atomic.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"atomic.js","sourceRoot":"","sources":["../../../src/implementations/database/atomic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { TermJson } from "rethinkdb-ts/lib/internal-types";
|
|
2
2
|
import type { Value } from "@antelopejs/interface-database/common";
|
|
3
3
|
import { type DecodingContext, type QueryStage } from "./utils";
|
|
4
|
-
export declare function DecodeValue(value: Value<unknown
|
|
5
|
-
export declare function
|
|
4
|
+
export declare function DecodeValue(value: NonNullable<Value<unknown>> | null, context: DecodingContext): TermJson;
|
|
5
|
+
export declare function DecodeOperand(value: Value<unknown>, context: DecodingContext): TermJson | undefined;
|
|
6
|
+
export declare function DecodeFunction(func: QueryStage<"func">, context: DecodingContext, argTerms: TermJson[]): TermJson | undefined;
|