@alineo-labs/postgres 0.2.3 → 0.3.1
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/dist/index.mjs +29 -17
- package/package.json +3 -2
package/dist/index.mjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import postgres from "postgres";
|
|
2
|
-
import { SandboxStatus } from "@alineo-labs/core";
|
|
2
|
+
import { DEFAULT_PROVIDER_ID, SandboxStatus } from "@alineo-labs/core";
|
|
3
|
+
import { renameEventsStatement } from "@alineo-labs/ledger";
|
|
3
4
|
//#region src/migrations.ts
|
|
4
5
|
const MIGRATION_SQL = `
|
|
5
6
|
CREATE TABLE IF NOT EXISTS alineo_events (
|
|
@@ -14,8 +15,11 @@ CREATE TABLE IF NOT EXISTS alineo_events (
|
|
|
14
15
|
ts BIGINT NOT NULL
|
|
15
16
|
);
|
|
16
17
|
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
-- Replaces the two single-column indexes below (dropped for an existing database in
|
|
19
|
+
-- adapter.ts's connect()) -- see packages/adapters/sqlite/src/migrations.ts's matching
|
|
20
|
+
-- comment for why 'ts' (not 'id') stays the primary sort key, with 'id' only as a tie-breaker.
|
|
21
|
+
CREATE INDEX IF NOT EXISTS alineo_events_name_sandbox_ts
|
|
22
|
+
ON alineo_events(name, sandbox_id, ts, id);
|
|
19
23
|
|
|
20
24
|
CREATE TABLE IF NOT EXISTS alineo_environments (
|
|
21
25
|
name TEXT PRIMARY KEY,
|
|
@@ -37,7 +41,8 @@ function aggRowToDetails(row) {
|
|
|
37
41
|
runId: row.run_id ?? row.sandbox_id,
|
|
38
42
|
resourceId: row.resource_id ?? void 0,
|
|
39
43
|
teamId: row.team_id ?? void 0,
|
|
40
|
-
parentSandboxId: row.parent_sandbox_id ?? void 0
|
|
44
|
+
parentSandboxId: row.parent_sandbox_id ?? void 0,
|
|
45
|
+
provider: row.provider ?? DEFAULT_PROVIDER_ID
|
|
41
46
|
};
|
|
42
47
|
}
|
|
43
48
|
function applyOpts(details, opts) {
|
|
@@ -50,6 +55,7 @@ function applyOpts(details, opts) {
|
|
|
50
55
|
if (opts?.runId != null) result = result.filter((d) => d.runId === opts.runId);
|
|
51
56
|
if (opts?.resourceId != null) result = result.filter((d) => d.resourceId === opts.resourceId);
|
|
52
57
|
if (opts?.teamId != null) result = result.filter((d) => d.teamId === opts.teamId);
|
|
58
|
+
if (opts?.provider != null) result = result.filter((d) => d.provider === opts.provider);
|
|
53
59
|
if (opts?.limit != null) result = result.slice(0, opts.limit);
|
|
54
60
|
return result;
|
|
55
61
|
}
|
|
@@ -71,7 +77,12 @@ var PostgresAdapter = class {
|
|
|
71
77
|
this.sql = postgres(connectionString);
|
|
72
78
|
}
|
|
73
79
|
async connect() {
|
|
80
|
+
await this.sql.unsafe("DROP INDEX IF EXISTS alineo_events_sandbox_id;");
|
|
81
|
+
await this.sql.unsafe("DROP INDEX IF EXISTS alineo_events_name;");
|
|
74
82
|
await this.sql.unsafe(MIGRATION_SQL);
|
|
83
|
+
const rename = renameEventsStatement();
|
|
84
|
+
let n = 0;
|
|
85
|
+
await this.sql.unsafe(rename.sql.replace(/\?/g, () => `$${++n}`), rename.params);
|
|
75
86
|
}
|
|
76
87
|
async close() {
|
|
77
88
|
await this.sql.end();
|
|
@@ -96,15 +107,15 @@ var PostgresAdapter = class {
|
|
|
96
107
|
SELECT sandbox_id, name, step_idx, branch, event, payload, error, ts
|
|
97
108
|
FROM alineo_events
|
|
98
109
|
WHERE name = ${name} AND sandbox_id = ${sandboxId}
|
|
99
|
-
ORDER BY ts ASC
|
|
110
|
+
ORDER BY ts ASC, id ASC
|
|
100
111
|
`).map(rowToEntry);
|
|
101
112
|
}
|
|
102
113
|
async lastCheckpoint(name, sandboxId) {
|
|
103
114
|
const rows = await this.sql`
|
|
104
115
|
SELECT sandbox_id, name, step_idx, branch, event, payload, error, ts
|
|
105
116
|
FROM alineo_events
|
|
106
|
-
WHERE name = ${name} AND sandbox_id = ${sandboxId} AND event = 'checkpoint_created'
|
|
107
|
-
ORDER BY ts DESC
|
|
117
|
+
WHERE name = ${name} AND sandbox_id = ${sandboxId} AND event = 'sandbox.checkpoint_created'
|
|
118
|
+
ORDER BY ts DESC, id DESC
|
|
108
119
|
LIMIT 1
|
|
109
120
|
`;
|
|
110
121
|
return rows.length ? rowToEntry(rows[0]) : null;
|
|
@@ -114,14 +125,15 @@ var PostgresAdapter = class {
|
|
|
114
125
|
SELECT
|
|
115
126
|
name,
|
|
116
127
|
sandbox_id,
|
|
117
|
-
MIN(CASE WHEN event = '
|
|
118
|
-
MAX(CASE WHEN event = '
|
|
119
|
-
MAX(CASE WHEN event = '
|
|
120
|
-
COUNT(CASE WHEN event = '
|
|
121
|
-
MAX(CASE WHEN event = '
|
|
122
|
-
MAX(CASE WHEN event = '
|
|
123
|
-
MAX(CASE WHEN event = '
|
|
124
|
-
MAX(CASE WHEN event = '
|
|
128
|
+
MIN(CASE WHEN event = 'sandbox.created' THEN ts END) AS started_at,
|
|
129
|
+
MAX(CASE WHEN event = 'sandbox.closed' THEN ts END) AS completed_at,
|
|
130
|
+
MAX(CASE WHEN event = 'sandbox.closed' THEN 1 ELSE 0 END)::int AS is_closed,
|
|
131
|
+
COUNT(CASE WHEN event = 'exec.completed' THEN 1 END)::int AS exec_count,
|
|
132
|
+
MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'runId' END) AS run_id,
|
|
133
|
+
MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'resourceId' END) AS resource_id,
|
|
134
|
+
MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'teamId' END) AS team_id,
|
|
135
|
+
MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'parentSandboxId' END) AS parent_sandbox_id,
|
|
136
|
+
MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'provider' END) AS provider
|
|
125
137
|
FROM alineo_events
|
|
126
138
|
${whereClause}
|
|
127
139
|
GROUP BY name, sandbox_id
|
|
@@ -145,8 +157,8 @@ var PostgresAdapter = class {
|
|
|
145
157
|
return (await this.sql`
|
|
146
158
|
SELECT sandbox_id, name, step_idx, branch, event, payload, error, ts
|
|
147
159
|
FROM alineo_events
|
|
148
|
-
WHERE name = ${name} AND sandbox_id = ${sandboxId} AND event = 'checkpoint_created'
|
|
149
|
-
ORDER BY ts ASC
|
|
160
|
+
WHERE name = ${name} AND sandbox_id = ${sandboxId} AND event = 'sandbox.checkpoint_created'
|
|
161
|
+
ORDER BY ts ASC, id ASC
|
|
150
162
|
`).map((r) => {
|
|
151
163
|
const p = r.payload ?? {};
|
|
152
164
|
return {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alineo-labs/postgres",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -27,7 +27,8 @@
|
|
|
27
27
|
"build": "tsdown"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@alineo-labs/core": "0.
|
|
30
|
+
"@alineo-labs/core": "0.6.0",
|
|
31
|
+
"@alineo-labs/ledger": "0.2.1",
|
|
31
32
|
"postgres": "3.4.9"
|
|
32
33
|
},
|
|
33
34
|
"devDependencies": {
|