@alineo-labs/postgres 0.2.2 → 0.3.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.
Files changed (2) hide show
  1. package/dist/index.mjs +24 -15
  2. package/package.json +3 -2
package/dist/index.mjs CHANGED
@@ -1,5 +1,6 @@
1
1
  import postgres from "postgres";
2
2
  import { 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
- CREATE INDEX IF NOT EXISTS alineo_events_sandbox_id ON alineo_events(sandbox_id);
18
- CREATE INDEX IF NOT EXISTS alineo_events_name ON alineo_events(name);
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,
@@ -71,7 +75,12 @@ var PostgresAdapter = class {
71
75
  this.sql = postgres(connectionString);
72
76
  }
73
77
  async connect() {
78
+ await this.sql.unsafe("DROP INDEX IF EXISTS alineo_events_sandbox_id;");
79
+ await this.sql.unsafe("DROP INDEX IF EXISTS alineo_events_name;");
74
80
  await this.sql.unsafe(MIGRATION_SQL);
81
+ const rename = renameEventsStatement();
82
+ let n = 0;
83
+ await this.sql.unsafe(rename.sql.replace(/\?/g, () => `$${++n}`), rename.params);
75
84
  }
76
85
  async close() {
77
86
  await this.sql.end();
@@ -96,15 +105,15 @@ var PostgresAdapter = class {
96
105
  SELECT sandbox_id, name, step_idx, branch, event, payload, error, ts
97
106
  FROM alineo_events
98
107
  WHERE name = ${name} AND sandbox_id = ${sandboxId}
99
- ORDER BY ts ASC
108
+ ORDER BY ts ASC, id ASC
100
109
  `).map(rowToEntry);
101
110
  }
102
111
  async lastCheckpoint(name, sandboxId) {
103
112
  const rows = await this.sql`
104
113
  SELECT sandbox_id, name, step_idx, branch, event, payload, error, ts
105
114
  FROM alineo_events
106
- WHERE name = ${name} AND sandbox_id = ${sandboxId} AND event = 'checkpoint_created'
107
- ORDER BY ts DESC
115
+ WHERE name = ${name} AND sandbox_id = ${sandboxId} AND event = 'sandbox.checkpoint_created'
116
+ ORDER BY ts DESC, id DESC
108
117
  LIMIT 1
109
118
  `;
110
119
  return rows.length ? rowToEntry(rows[0]) : null;
@@ -114,14 +123,14 @@ var PostgresAdapter = class {
114
123
  SELECT
115
124
  name,
116
125
  sandbox_id,
117
- MIN(CASE WHEN event = 'sandbox_created' THEN ts END) AS started_at,
118
- MAX(CASE WHEN event = 'sandbox_closed' THEN ts END) AS completed_at,
119
- MAX(CASE WHEN event = 'sandbox_closed' THEN 1 ELSE 0 END)::int AS is_closed,
120
- COUNT(CASE WHEN event = 'exec_complete' THEN 1 END)::int AS exec_count,
121
- MAX(CASE WHEN event = 'sandbox_created' THEN payload->>'runId' END) AS run_id,
122
- MAX(CASE WHEN event = 'sandbox_created' THEN payload->>'resourceId' END) AS resource_id,
123
- MAX(CASE WHEN event = 'sandbox_created' THEN payload->>'teamId' END) AS team_id,
124
- MAX(CASE WHEN event = 'sandbox_created' THEN payload->>'parentSandboxId' END) AS parent_sandbox_id
126
+ MIN(CASE WHEN event = 'sandbox.created' THEN ts END) AS started_at,
127
+ MAX(CASE WHEN event = 'sandbox.closed' THEN ts END) AS completed_at,
128
+ MAX(CASE WHEN event = 'sandbox.closed' THEN 1 ELSE 0 END)::int AS is_closed,
129
+ COUNT(CASE WHEN event = 'exec.completed' THEN 1 END)::int AS exec_count,
130
+ MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'runId' END) AS run_id,
131
+ MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'resourceId' END) AS resource_id,
132
+ MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'teamId' END) AS team_id,
133
+ MAX(CASE WHEN event = 'sandbox.created' THEN payload->>'parentSandboxId' END) AS parent_sandbox_id
125
134
  FROM alineo_events
126
135
  ${whereClause}
127
136
  GROUP BY name, sandbox_id
@@ -145,8 +154,8 @@ var PostgresAdapter = class {
145
154
  return (await this.sql`
146
155
  SELECT sandbox_id, name, step_idx, branch, event, payload, error, ts
147
156
  FROM alineo_events
148
- WHERE name = ${name} AND sandbox_id = ${sandboxId} AND event = 'checkpoint_created'
149
- ORDER BY ts ASC
157
+ WHERE name = ${name} AND sandbox_id = ${sandboxId} AND event = 'sandbox.checkpoint_created'
158
+ ORDER BY ts ASC, id ASC
150
159
  `).map((r) => {
151
160
  const p = r.payload ?? {};
152
161
  return {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alineo-labs/postgres",
3
- "version": "0.2.2",
3
+ "version": "0.3.0",
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.4.1",
30
+ "@alineo-labs/core": "0.5.0",
31
+ "@alineo-labs/ledger": "0.2.0",
31
32
  "postgres": "3.4.9"
32
33
  },
33
34
  "devDependencies": {