pgkiln 0.47.0 → 0.48.0

package/src/builder/object-actions.ts

@@ -32,6 +32,7 @@ export function objectMenu(schema: string, o: MenuObj): Raw {
       ${table ? item(`${BASE}/sql/objects/table?${new URLSearchParams({ schema, template: o.ref })}`, 'copy', 'Use as template') : ''}
       ${table ? item(`${BASE}/sql/load`, 'upload', 'Load data') : ''}
       ${table ? html`${item(q('index'), 'list', 'Add index')}${item(q('trigger'), 'bolt', 'Add trigger')}${item(q('policy'), 'shield', 'Add policy')}` : ''}
+      ${RELATIONS.has(o.type) ? item(`${BASE}/sql/rest/object?${new URLSearchParams({ schema, name: o.name })}`, 'globe', 'REST › Enable / Disable') : ''}
       ${item(q('ddl'), 'code', 'Quick DDL to the worksheet')}
       ${item(q('download'), 'download', 'Quick DDL as a file')}
       ${item(q('drop'), 'trash', 'Drop…')}

package/src/builder/object-browser.ts

@@ -6,6 +6,7 @@ import { readSchema } from '../ddl.ts';
 import { back, BASE, csrf, developer, flash, region, send, shell, workshopTabs, type Req } from './ui.ts';
 import { currentWorkspace, inWorkspaceSql, sessionSchema, workshopDb } from './workspaces.ts';
 import { objectMenu } from './object-actions.ts';
+import { isPinned, pinButton } from './launchpad.ts';
 import { owner } from '../db.ts';
 import type { Session } from '../session.ts';
 
@@ -142,7 +143,12 @@ export async function objectBrowserRoutes(app: FastifyInstance) {
 
     let detail: Raw;
     if (!schema) detail = html`<p class="muted">No schema you may use.</p>`;
-    else if (selected) detail = await objectDetail(db, s, schema, selected, String(q.tab ?? ''), Number(q.p) || 1, link);
+    else if (selected) {
+      // (sprint 96) pin the object to the SQL Workshop's home
+      const href = `${BASE}/sql/objects?${new URLSearchParams({ schema, k: selected.type, o: selected.ref })}`;
+      const pin = pinButton(s, { href, label: selected.name, icon: OB_TYPES.find(([t]) => t === selected.type)![2] }, await isPinned(s, href), href);
+      detail = html`<div class="ob-pin">${pin}</div>${await objectDetail(db, s, schema, selected, String(q.tab ?? ''), Number(q.p) || 1, link)}`;
+    }
     else
       detail = region(`Create database objects in ${schema}`, html`<div class="ob-tiles">
         <a class="create-source" href="${BASE}/sql/objects/table?${new URLSearchParams({ schema })}">${icon('table')}<span><b>Table (form)</b><small class="muted">Columns, keys, indexes and security in a form</small></span></a>${[

package/src/builder/sql-charts.ts

@@ -0,0 +1,203 @@
+import type { FastifyInstance, FastifyReply } from 'fastify';
+import pg from 'pg';
+import { PageCss } from '../css.ts';
+import { owner } from '../db.ts';
+import { html, raw, type Raw } from '../html.ts';
+import { icon } from '../icons.ts';
+import { isNumeric } from '../runtime/report.ts';
+import { renderChartBody, type ChartKind } from '../runtime/charts.ts';
+import type { Session } from '../session.ts';
+import { unloadStatement } from '../unload.ts';
+import { back, BASE, csrf, developer, flash, region, send, shell, workshopTabs, type Body, type Req } from './ui.ts';
+import { currentWorkspace, sessionSchema, workshopDb } from './workspaces.ts';
+
+// (sprint 97, Database Actions DA-6: Create Chart and Charts) A query drawn as a chart with pgkiln's own
+// server-rendered charts (src/runtime/charts.ts): the worksheet's Chart tab draws the last query, guessing the label
+// column (the first text or date column) and the value columns (the numbers); saved charts (meta.sql_chart,
+// migration 110) are listed under SQL Workshop → Charts, the ones on the dashboard drawn there. A saved chart's
+// SELECT runs read-only, with a statement timeout and at most 500 rows, as the workshop's connection.
+
+export const SQL_CHART_KINDS: [ChartKind, string][] = [['bar', 'Bar'], ['column', 'Column'], ['stacked', 'Stacked bar'], ['line', 'Line'], ['area', 'Area'], ['donut', 'Donut'], ['pie', 'Pie'], ['scatter', 'Scatter']];
+const MAX_ROWS = 500;
+
+export interface ChartSpec { kind: ChartKind; label: string; values: string[] }
+
+/** The columns to draw: the ones asked for when they exist, else a label (first non-number) and the numbers. */
+export function chartSpec(columns: string[], numeric: boolean[], asked: Partial<ChartSpec> = {}): ChartSpec | null {
+  const kind = SQL_CHART_KINDS.some(([k]) => k === asked.kind) ? asked.kind! : 'bar';
+  const label = asked.label && columns.includes(asked.label) ? asked.label : (columns.find((_, i) => !numeric[i]) ?? columns[0]);
+  const wanted = (asked.values ?? []).filter((v) => columns.includes(v) && v !== label);
+  const values = wanted.length ? wanted : columns.filter((c, i) => numeric[i] && c !== label);
+  return label && values.length ? { kind, label, values } : null;
+}
+
+/** A chart of rows (text values from the worksheet, or values from a query), with the rules for the page's <style>. */
+export function drawChart(title: string, columns: string[], rows: unknown[][], spec: ChartSpec): { body: Raw; css: string } {
+  const css = new PageCss();
+  const li = columns.indexOf(spec.label);
+  const vi = spec.values.map((v) => columns.indexOf(v));
+  const data = rows.map((r) => [r[li] === null || r[li] === undefined ? '' : String(r[li]), ...vi.map((i) => (r[i] === null || r[i] === undefined || r[i] === '' ? null : Number(r[i])))]);
+  const body = renderChartBody(spec.kind, title, data, [{ name: spec.label }, ...spec.values.map((name) => ({ name }))], css);
+  return { body, css: css.text };
+}
+
+/** The controls of a chart (type, label column, value columns), named chart_*. */
+export function chartControls(columns: string[], spec: ChartSpec, idPrefix = 'ch'): Raw {
+  return html`<div class="ch-controls">
+    <label><span>Type</span><select name="chart_kind" id="${idPrefix}-kind">${SQL_CHART_KINDS.map(([k, label]) => html`<option value="${k}"${k === spec.kind ? raw(' selected') : ''}>${label}</option>`)}</select></label>
+    <label><span>Labels</span><select name="chart_label" id="${idPrefix}-label">${columns.map((c) => html`<option value="${c}"${c === spec.label ? raw(' selected') : ''}>${c}</option>`)}</select></label>
+    <fieldset><legend>Values</legend>${columns.map((c) => html`<label class="check"><input type="checkbox" name="chart_values" value="${c}"${spec.values.includes(c) ? raw(' checked') : ''}> ${c}</label>`)}</fieldset>
+  </div>`;
+}
+
+const list = (v: unknown) => (Array.isArray(v) ? v : v === undefined || v === null || v === '' ? [] : [v]).map(String);
+export const askedSpec = (b: Body): Partial<ChartSpec> => ({ kind: b.chart_kind as ChartKind, label: typeof b.chart_label === 'string' ? b.chart_label : undefined, values: list(b.chart_values) });
+
+interface SavedChart { id: number; name: string; sql: string; kind: ChartKind; label_col: string; value_cols: string[]; on_dashboard: boolean; created_by: string | null; updated_at: string }
+
+/** A saved chart's SELECT, run read-only: columns, which are numbers, and the rows. */
+async function runChart(s: Session, sql: string) {
+  const db = await workshopDb(s);
+  const schema = await sessionSchema(s, db);
+  const c = await db.pool.connect();
+  try {
+    await c.query('begin transaction read only');
+    await c.query(`select set_config('statement_timeout', '10s', true)`);
+    if (schema) await c.query(`select set_config('search_path', $1, true)`, [`${pg.escapeIdentifier(schema)}, public`]);
+    const res = await c.query({ text: `select * from (${unloadStatement(sql)}\n) chart_rows limit ${MAX_ROWS}`, rowMode: 'array' });
+    return { columns: res.fields.map((f) => f.name), numeric: res.fields.map((f) => isNumeric(f.dataTypeID)), rows: res.rows as unknown[][] };
+  } finally {
+    await c.query('rollback').catch(() => {});
+    c.release(true);
+  }
+}
+
+async function chartCard(s: Session, ch: SavedChart, full = false): Promise<{ body: Raw; css: string }> {
+  try {
+    const r = await runChart(s, ch.sql);
+    const spec = chartSpec(r.columns, r.numeric, { kind: ch.kind, label: ch.label_col, values: ch.value_cols });
+    if (!spec) return { body: html`<p class="muted">The query has no number column to draw.</p>`, css: '' };
+    const d = drawChart(ch.name, r.columns, r.rows, spec);
+    return { body: html`${d.body}${full ? html`<p class="muted small">${r.rows.length} row${r.rows.length === 1 ? '' : 's'}${r.rows.length === MAX_ROWS ? ` (the first ${MAX_ROWS})` : ''}.</p>` : ''}`, css: d.css };
+  } catch (e) {
+    return { body: html`<p class="alert alert-error">${(e as Error).message}</p>`, css: '' };
+  }
+}
+
+const style = (nonce: string, css: string) => (css ? html`<style nonce="${nonce}">${raw(css.replace(/</g, ''))}</style>` : '');
+
+export async function sqlChartRoutes(app: FastifyInstance) {
+  // the list and the dashboard
+  app.get(`${BASE}/sql/charts`, async (req: Req, reply: FastifyReply) => {
+    const s = await developer(req, reply);
+    if (!s) return;
+    const charts = (await owner.query<SavedChart>('select * from meta.sql_chart where workspace_id = $1 order by lower(name)', [currentWorkspace(s)])).rows;
+    let css = '';
+    const cards: Raw[] = [];
+    for (const ch of charts.filter((c) => c.on_dashboard)) {
+      const card = await chartCard(s, ch);
+      css += `\n${card.css}`;
+      cards.push(html`<section class="ch-card"><h2><a href="${BASE}/sql/charts/${ch.id}">${ch.name}</a></h2>${card.body}</section>`);
+    }
+    const main = html`<h1 class="u-mb1">Charts</h1>${workshopTabs('charts')}${style(req.cspNonce, css)}
+      <p class="muted">Queries drawn as charts. Make one from a query in the <a href="${BASE}/sql/worksheet">SQL Worksheet</a> (its Chart tab, Ctrl+F11), then save it.</p>
+      ${cards.length ? html`<div class="ch-dashboard">${cards}</div>` : ''}
+      ${region('All charts', charts.length ? html`<div class="table-wrap"><table class="report"><thead><tr><th>Chart</th><th>Type</th><th>On the dashboard</th><th>Changed</th></tr></thead><tbody>
+        ${charts.map((c) => html`<tr><td><a href="${BASE}/sql/charts/${c.id}">${c.name}</a></td><td>${SQL_CHART_KINDS.find(([k]) => k === c.kind)?.[1] ?? c.kind}</td><td>${c.on_dashboard ? 'Yes' : 'No'}</td>
+          <td>${new Date(c.updated_at).toISOString().slice(0, 16).replace('T', ' ')}${c.created_by ? html` <span class="muted small">by ${c.created_by}</span>` : ''}</td></tr>`)}</tbody></table></div>`
+        : html`<p class="muted">No charts yet.</p>`)}`;
+    return send(reply, s, shell(s, 'Charts', [['SQL Workshop', `${BASE}/sql`], ['Charts']], main, 'sql'));
+  });
+
+  // one chart: drawn, with its settings
+  app.get(`${BASE}/sql/charts/:id`, async (req: Req, reply: FastifyReply) => {
+    const s = await developer(req, reply);
+    if (!s) return;
+    const ch = /^\d{1,9}$/.test(String(req.params.id)) ? await owner.one<SavedChart>('select * from meta.sql_chart where id = $1 and workspace_id = $2', [req.params.id, currentWorkspace(s)]) : undefined;
+    if (!ch) return reply.code(404).send('Not found');
+    const card = await chartCard(s, ch, true);
+    let controls: Raw | '' = '';
+    try {
+      const r = await runChart(s, ch.sql);
+      const spec = chartSpec(r.columns, r.numeric, { kind: ch.kind, label: ch.label_col, values: ch.value_cols });
+      if (spec) controls = chartControls(r.columns, spec, 'sch');
+    } catch {
+      controls = '';
+    }
+    const main = html`<h1 class="u-mb1">${ch.name}</h1>${workshopTabs('charts')}${style(req.cspNonce, card.css)}
+      <div class="ch-view">${card.body}</div>
+      <form method="post" action="${BASE}/sql/charts/${ch.id}" class="ch-edit">${csrf(s)}
+        <div class="field"><label class="label" for="ch-name">Name</label><input id="ch-name" name="name" value="${ch.name}" maxlength="120" required></div>
+        ${controls}
+        <label class="check"><input type="checkbox" name="on_dashboard"${ch.on_dashboard ? raw(' checked') : ''}> On the Charts dashboard</label>
+        <details class="u-mt1"><summary>The query</summary><pre class="source">${ch.sql}</pre></details>
+        <div class="buttons"><button class="btn btn-hot" name="action" value="save">${icon('save')} Save</button>
+          <button class="btn" name="action" value="worksheet">${icon('code')} Open in the worksheet</button>
+          <button class="btn btn-danger" name="action" value="delete" data-confirm="Delete the chart ${ch.name}?">${icon('trash')} Delete</button></div>
+      </form>`;
+    return send(reply, s, shell(s, ch.name, [['SQL Workshop', `${BASE}/sql`], ['Charts', `${BASE}/sql/charts`], [ch.name]], main, 'sql'));
+  });
+
+  // save a chart from the worksheet (a new one), or change, open or delete a saved one
+  const save = async (req: Req, reply: FastifyReply) => {
+    const s = await developer(req, reply);
+    if (!s) return;
+    const b = req.body ?? {};
+    const ws = currentWorkspace(s);
+    const id = req.params?.id;
+    const name = String(b.name ?? b.chart_name ?? '').trim();
+    const asked = askedSpec(b);
+    const kind = SQL_CHART_KINDS.some(([k]) => k === asked.kind) ? asked.kind! : 'bar';
+    if (id !== undefined) {
+      const ch = /^\d{1,9}$/.test(String(id)) ? await owner.one<SavedChart>('select * from meta.sql_chart where id = $1 and workspace_id = $2', [id, ws]) : undefined;
+      if (!ch) return reply.code(404).send('Not found');
+      if (b.action === 'delete') {
+        await owner.query('delete from meta.sql_chart where id = $1', [ch.id]);
+        flash(s, `Deleted the chart ${ch.name}.`);
+        return back(reply, s, `${BASE}/sql/charts`);
+      }
+      if (b.action === 'worksheet') {
+        s.state.__SQLDRAFT = ch.sql;
+        return back(reply, s, `${BASE}/sql/worksheet`);
+      }
+      if (!name || name.length > 120) {
+        flash(s, 'A chart needs a name (at most 120 characters).', 'error');
+        return back(reply, s, `${BASE}/sql/charts/${ch.id}`);
+      }
+      try {
+        await owner.query(`update meta.sql_chart set name = $2, kind = $3, label_col = $4, value_cols = $5, on_dashboard = $6, updated_at = now() where id = $1`,
+          [ch.id, name, kind, asked.label ?? ch.label_col, asked.values?.length ? asked.values : ch.value_cols, b.on_dashboard === 'on']);
+      } catch (e) {
+        if ((e as { code?: string }).code !== '23505') throw e;
+        flash(s, `A chart named “${name}” exists already.`, 'error');
+        return back(reply, s, `${BASE}/sql/charts/${ch.id}`);
+      }
+      flash(s, `Saved the chart ${name}.`);
+      return back(reply, s, `${BASE}/sql/charts/${ch.id}`);
+    }
+    let sql = '';
+    try {
+      sql = unloadStatement(String(b.chart_sql ?? ''));
+    } catch {
+      flash(s, 'Only a chart of one SELECT can be saved.', 'error');
+      return back(reply, s, `${BASE}/sql/worksheet`);
+    }
+    if (!name || name.length > 120) {
+      flash(s, 'Name the chart to save it (at most 120 characters).', 'error');
+      return back(reply, s, `${BASE}/sql/worksheet`);
+    }
+    try {
+      const r = await owner.one<{ id: number }>(
+        `insert into meta.sql_chart (workspace_id, name, sql, kind, label_col, value_cols, created_by) values ($1, $2, $3, $4, $5, $6, $7) returning id`,
+        [ws, name, sql, kind, asked.label ?? '', asked.values ?? [], s.username]);
+      flash(s, `Saved the chart ${name}: it is on the Charts dashboard.`);
+      return back(reply, s, `${BASE}/sql/charts/${r!.id}`);
+    } catch (e) {
+      if ((e as { code?: string }).code !== '23505') throw e;
+      flash(s, `A chart named “${name}” exists already.`, 'error');
+      return back(reply, s, `${BASE}/sql/worksheet`);
+    }
+  };
+  app.post(`${BASE}/sql/charts`, save);
+  app.post(`${BASE}/sql/charts/:id`, save);
+}

package/src/builder/sql-tools.ts

@@ -0,0 +1,49 @@
+// (sprint 96, Database Actions DA-15) The SQL Workshop's tools in one list: the home page's Launchpad tabs
+// (Development, Administration, Monitoring), the More menu's headings and the builder's search (Ctrl+K) read it.
+// `tab` is the SQL Workshop tab a tool's own pages mark (workshopTabs in ui.ts); tools without one are pages
+// elsewhere in the builder.
+
+export type ToolGroup = 'development' | 'administration' | 'monitoring';
+export interface SqlTool {
+  key: string;
+  href: string;
+  icon: string;
+  label: string;
+  description: string;
+  group: ToolGroup;
+  /** the SQL Workshop tab its pages mark */
+  tab?: string;
+  /** one of the main tabs (not in More) */
+  main?: boolean;
+  /** administrators only */
+  admin?: boolean;
+}
+
+export const TOOL_GROUPS: [ToolGroup, string][] = [['development', 'Development'], ['administration', 'Administration'], ['monitoring', 'Monitoring']];
+
+export const SQL_TOOLS: SqlTool[] = [
+  { key: 'worksheet', href: '/builder/sql/worksheet', icon: 'code', label: 'SQL Worksheet', description: 'Run statements and scripts with a navigator, plans, results and history.', group: 'development', tab: 'sql', main: true },
+  { key: 'objects', href: '/builder/sql/objects', icon: 'database', label: 'Object Browser', description: 'Tables, views and functions with their columns, data, keys, policies and DDL.', group: 'development', tab: 'objects', main: true },
+  { key: 'scripts', href: '/builder/sql/scripts', icon: 'file', label: 'SQL Scripts', description: 'Saved scripts of the workspace: upload, run, download, run history.', group: 'development', tab: 'scripts', main: true },
+  { key: 'table', href: '/builder/sql/objects/table', icon: 'table', label: 'Create Table', description: 'A new table in a form: columns, keys, indexes and security.', group: 'development' },
+  { key: 'charts', href: '/builder/sql/charts', icon: 'chart', label: 'Charts', description: 'Queries drawn as charts, and a dashboard of them.', group: 'development', tab: 'charts' },
+  { key: 'quicksql', href: '/builder/sql/quick', icon: 'bolt', label: 'Quick SQL', description: 'A data model in shorthand, turned into DDL.', group: 'development', tab: 'quicksql' },
+  { key: 'query', href: '/builder/sql/query', icon: 'filter', label: 'Query Builder', description: 'A query from tables and their joins, drawn.', group: 'development', tab: 'query' },
+  { key: 'load', href: '/builder/sql/load', icon: 'upload', label: 'Load Data', description: 'CSV, Excel, JSON or XML into a new or existing table.', group: 'development', tab: 'load' },
+  { key: 'unload', href: '/builder/sql/unload', icon: 'download', label: 'Unload Data', description: 'A table, view or query as CSV, JSON, Excel, XML or SQL inserts.', group: 'development', tab: 'unload' },
+  { key: 'sample', href: '/builder/sql/sample-data', icon: 'layers', label: 'Sample Data', description: 'Rows that look real, for development.', group: 'development', tab: 'sample' },
+  { key: 'ddl', href: '/builder/sql/ddl', icon: 'file', label: 'Generate DDL', description: 'A schema\'s objects as one script.', group: 'development', tab: 'ddl' },
+  { key: 'compare', href: '/builder/sql/compare', icon: 'layers', label: 'Schema Comparison', description: 'The differences between two schemas, and the SQL to align them.', group: 'development', tab: 'compare' },
+  { key: 'modeler', href: '/builder/sql/modeler', icon: 'org', label: 'Data Modeler', description: 'Relational diagrams of tables and their foreign keys; DDL and a data dictionary from them.', group: 'development', tab: 'modeler' },
+  { key: 'rest', href: '/builder/sql/rest', icon: 'globe', label: 'RESTful Services', description: 'Tables and views as REST endpoints (AutoREST): URLs, examples, OpenAPI.', group: 'development', tab: 'rest' },
+  { key: 'ai', href: '/builder/sql/ai', icon: 'bolt', label: 'AI', description: 'SQL from a question, explanations and table descriptions.', group: 'development', tab: 'ai' },
+  { key: 'utilities', href: '/builder/sql/utilities', icon: 'wrench', label: 'Utilities', description: 'Object reports, About Database and the other utilities.', group: 'administration', tab: 'utilities', main: true },
+  { key: 'backups', href: '/builder/backups', icon: 'archive', label: 'Manage Backups', description: 'Backups of the workspace\'s applications.', group: 'administration' },
+  { key: 'workspaces', href: '/builder/workspaces', icon: 'layers', label: 'Workspaces', description: 'Workspaces, their developers and database roles.', group: 'administration', admin: true },
+  { key: 'dbusers', href: '/builder/db-users', icon: 'key', label: 'Database Users', description: 'PostgreSQL roles: sign-in, expiry, memberships and schema privileges.', group: 'administration', admin: true },
+  { key: 'developers', href: '/builder/developers', icon: 'users', label: 'Developers', description: 'Builder accounts and their workspaces.', group: 'administration' },
+  { key: 'monitor', href: '/builder/sql/utilities/monitor', icon: 'activity', label: 'Database Monitor', description: 'Sessions, what they run and what blocks them.', group: 'monitoring', admin: true },
+  { key: 'about', href: '/builder/sql/utilities/about', icon: 'info', label: 'About Database', description: 'The server: version, settings, extensions and sizes.', group: 'monitoring' },
+  { key: 'reports', href: '/builder/sql/utilities/reports', icon: 'list', label: 'Object Reports', description: 'Tables without keys, unindexed foreign keys, row level security gaps and more.', group: 'monitoring' },
+  { key: 'activity', href: '/builder/dashboard', icon: 'chart', label: 'Monitor Activity', description: 'Page views, errors and slow pages of the applications.', group: 'monitoring' },
+];

package/src/builder/sql.ts

@@ -8,6 +8,9 @@ import { clientIp, logActivity, type Session } from '../session.ts';
 import { clearCompletions } from './code-editor.ts';
 import { scriptRoutes } from './scripts.ts';
 import { worksheetRoutes } from './worksheet.ts';
+import { launchpad, launchpadRoutes } from './launchpad.ts';
+import { sqlChartRoutes } from './sql-charts.ts';
+import { isAdmin } from './locks.ts';
 import { quickSqlRoutes } from './quicksql.ts';
 import { queryBuilderRoutes } from './querybuilder.ts';
 import { unloadRoutes } from './unload.ts';
@@ -16,6 +19,8 @@ import { sqlUtilityRoutes } from './sql-utilities.ts';
 import { createTemplate, objectBrowserRoutes } from './object-browser.ts';
 import { objectActionRoutes } from './object-actions.ts';
 import { tableEditorRoutes } from './table-editor.ts';
+import { dataModelerRoutes } from './data-modeler.ts';
+import { autoRestBuilderRoutes } from './autorest.ts';
 import { currentWorkspace, sessionSchema, usableSchemas, workshopDb, workshopRunsAs } from './workspaces.ts';
 
 // SQL Workshop: SQL commands and the object browser (owner connection; an isolated
@@ -54,21 +59,13 @@ async function workshopHome(req: Req, reply: FastifyReply) {
       [currentWorkspace(s)],
     ),
   ]);
-  const tile = (href: string, ic: string, title: string, text: string) =>
-    html`<a class="ab-tile sw-tile" href="${BASE}${href}"><span class="ab-tile-icon sw-tile-icon">${icon(ic)}</span><strong>${title}</strong><span>${text}</span></a>`;
   const list = (title: string | Raw, rows: Raw[], empty: string) =>
     html`<section class="sw-recent"><h2>${title}</h2>${rows.length ? html`<ul>${rows}</ul>` : html`<p class="muted">${empty}</p>`}</section>`;
   const main = html`<div class="ab-home">
     <div class="ab-main">
       <h1 class="sr-only">SQL Workshop</h1>
       ${workshopTabs('home')}
-      <div class="ab-tiles sw-tiles">
-        ${tile('/sql/worksheet', 'code', 'SQL Worksheet', 'Run statements and scripts, with a navigator, plans and history.')}
-        ${tile('/sql/objects', 'search', 'Object Browser', 'Browse tables, views and functions, their policies, grants and data.')}
-        ${tile('/sql/scripts', 'file', 'SQL Scripts', 'Create, upload and run stored SQL scripts.')}
-        ${tile('/sql/utilities', 'wrench', 'Utilities', 'Load and unload data, sample data, DDL, schema comparison, object reports and the database.')}
-        ${tile('/sql/quick', 'bolt', 'Quick SQL', 'Write a data model in shorthand and get the DDL.')}
-      </div>
+      ${await launchpad(s, await isAdmin(s.username))}
       <div class="sw-recents">
         ${list('Recently created tables', tables.rows.map((t) => html`<li><a href="${BASE}/sql/objects?o=${encodeURIComponent(t.qname)}">${t.qname}</a><span class="muted">~${Number(t.rows).toLocaleString('en')} rows</span></li>`), 'No tables you can read.')}
         ${list(html`<a href="${BASE}/sql/worksheet?tab=history" title="Open SQL History">Recent SQL commands</a>`, commands.rows.map((c) => html`<li><a href="${BASE}/sql/worksheet?recent=${c.id}" title="${c.detail.slice(0, 500)}">${c.detail.replace(/\s+/g, ' ').slice(0, 60)}</a><span class="muted">${ago(c.at)}</span></li>`), 'You haven\'t run SQL commands yet.')}
@@ -105,6 +102,10 @@ export async function sqlRoutes(app: FastifyInstance) {
   // Generate DDL and Schema Comparison (sprint 56)
   await app.register(ddlToolRoutes);
   await app.register(sqlUtilityRoutes);
+  // (sprint 97) Charts: saved charts and their dashboard
+  await app.register(sqlChartRoutes);
+  // (sprint 96) the Launchpad's pins and the builder's search (Ctrl+K)
+  await app.register(launchpadRoutes);
   // (sprint 91) the SQL Worksheet (was SQL Commands; /sql/commands and a post to /sql are the same page)
   await app.register(worksheetRoutes);
   app.get(`${BASE}/sql`, workshopHome);
@@ -128,4 +129,8 @@ export async function sqlRoutes(app: FastifyInstance) {
   await app.register(objectActionRoutes);
   // (sprint 95) Table Properties: create, edit or copy a table in a form
   await app.register(tableEditorRoutes);
+  // (sprint 98) the Data Modeler: relational diagrams, their DDL and data dictionary
+  await app.register(dataModelerRoutes);
+  // (sprint 100) RESTful Services: AutoREST (autorest.ts)
+  await app.register(autoRestBuilderRoutes);
 }

package/src/builder/ui.ts

@@ -7,6 +7,7 @@ import { html, raw, type Raw } from '../html.ts';
 import { icon } from '../icons.ts';
 import { documentShell } from '../layout.ts';
 import { getSession, saveState, takeFlash, type Session } from '../session.ts';
+import { SQL_TOOLS, TOOL_GROUPS } from './sql-tools.ts';
 import { ensureDevbar } from '../runtime/devbar.ts';
 
 // Shared building blocks of the builder UI.
@@ -51,8 +52,8 @@ export type Section = 'apps' | 'users' | 'sql' | 'developers' | 'gallery';
 // Builder-only stylesheets and scripts, loaded on every builder page after
 // app.css / app.js (the runtime never loads them). Add new builder assets
 // here, and only here.
-export const BUILDER_STYLES = ['/static/builder.css', '/static/code-editor.css', '/static/worksheet.css'];
-export const BUILDER_SCRIPTS = ['/static/builder.js', '/static/code-editor.js', '/static/worksheet.js'];
+export const BUILDER_STYLES = ['/static/builder.css', '/static/code-editor.css', '/static/worksheet.css', '/static/data-modeler.css'];
+export const BUILDER_SCRIPTS = ['/static/builder.js', '/static/code-editor.js', '/static/worksheet.js', '/static/palette.js', '/static/data-modeler.js'];
 export const builderHead = () =>
   html`${BUILDER_STYLES.map((href) => html`<link rel="stylesheet" href="${href}">\n`)}${BUILDER_SCRIPTS.map((src) => html`<script src="${src}" defer></script>\n`)}`;
 
@@ -139,6 +140,7 @@ export function shell(s: Session, title: string, crumbs: [string, string?][], ma
               <a href="${BASE}/users">${icon('user')} Manage users and groups</a>
               <a href="${BASE}/developers">${icon('users')} Developers</a>
               <a href="${BASE}/dashboard">${icon('activity')} Monitor activity</a>
+              ${s.instanceAdmin ? html`<a href="${BASE}/db-users">${icon('key')} Database users</a>` : ''}
               <a href="${BASE}/developers">${icon('key')} Change my password</a>
             </div>
           </div></details></li>
@@ -170,6 +172,9 @@ export function shell(s: Session, title: string, crumbs: [string, string?][], ma
         ${back ? html`<a class="ide-back" href="${back[1]}" title="Back to ${back[0]}">${bicon('back')}<span class="sr-only">Back to ${back[0]}</span></a>` : ''}
         <nav class="ide-crumbs" aria-label="Breadcrumb"><ol>${crumbs.map(([label, href], i) =>
           html`<li>${href && i < crumbs.length - 1 ? html`<a href="${href}">${label}</a>` : html`<span aria-current="page">${label}</span>`}</li>`)}</ol></nav>
+        <form method="get" action="${BASE}/palette" class="ide-search" role="search" data-palette>
+          <label class="sr-only" for="ide-search-q">Search the builder</label>
+          <input id="ide-search-q" name="q" type="search" placeholder="Search (Ctrl+K)" autocomplete="off" aria-keyshortcuts="Control+K"></form>
         <div class="ide-tools">${opts.toolbar ?? ''}</div>
       </header>
       ${s.workspace?.banner_label ? html`<div class="ide-banner ide-banner-${BANNER_COLORS.includes(s.workspace.banner_color ?? '') ? s.workspace.banner_color : 'blue'}" role="note" aria-label="Environment">${s.workspace.banner_label}</div>` : ''}
@@ -247,22 +252,23 @@ export const appHeader = (a: any, active: 'pages' | 'shared' | 'settings' | 'act
 };
 
 /** Tabs of the SQL Workshop. */
-export type WorkshopTab = 'home' | 'sql' | 'scripts' | 'quicksql' | 'query' | 'objects' | 'load' | 'unload' | 'sample' | 'ai' | 'ddl' | 'compare' | 'utilities';
+export type WorkshopTab = 'home' | 'sql' | 'scripts' | 'quicksql' | 'query' | 'objects' | 'load' | 'unload' | 'sample' | 'ai' | 'ddl' | 'compare' | 'utilities' | 'charts' | 'modeler' | 'rest';
 export const workshopTabs = (active: WorkshopTab) => {
-  const tab = (key: WorkshopTab, href: string, ic: string, label: string) =>
-    html`<a class="ide-tab" href="${BASE}${href}"${active === key ? raw(' aria-current="page"') : ''}>${icon(ic)}<span>${label}</span></a>`;
-  // (sprint 75) the main tools as tabs, the others in a More menu (the open one is a tab too), so the strip never scrolls
-  const more: [WorkshopTab, string, string, string][] = [
-    ['quicksql', '/sql/quick', 'bolt', 'Quick SQL'], ['query', '/sql/query', 'filter', 'Query Builder'], ['load', '/sql/load', 'upload', 'Load Data'],
-    ['unload', '/sql/unload', 'download', 'Unload Data'], ['sample', '/sql/sample-data', 'layers', 'Sample Data'], ['ddl', '/sql/ddl', 'file', 'DDL'],
-    ['compare', '/sql/compare', 'layers', 'Compare'], ['ai', '/sql/ai', 'bolt', 'AI'],
-  ];
-  const open = more.find(([k]) => k === active);
+  const tab = (key: string, href: string, ic: string, label: string) =>
+    html`<a class="ide-tab" href="${href}"${active === key ? raw(' aria-current="page"') : ''}>${icon(ic)}<span>${label}</span></a>`;
+  // (sprint 75) the main tools as tabs, the others in a More menu (the open one is a tab too), so the strip never
+  // scrolls; (sprint 96) the More menu under the Launchpad's headings, from SQL_TOOLS
+  const main = SQL_TOOLS.filter((t) => t.main);
+  const open = SQL_TOOLS.find((t) => !t.main && t.tab === active);
   return html`<nav class="ide-tabs sw-tabs u-mb1" aria-label="SQL Workshop">
-    ${tab('home', '/sql', 'home', 'Home')}${tab('sql', '/sql/worksheet', 'code', 'SQL Worksheet')}${tab('objects', '/sql/objects', 'database', 'Object Browser')}${tab('scripts', '/sql/scripts', 'file', 'SQL Scripts')}${tab('utilities', '/sql/utilities', 'wrench', 'Utilities')}
-    ${open ? tab(...open) : ''}
+    ${tab('home', `${BASE}/sql`, 'home', 'Home')}${main.map((t) => tab(t.tab!, t.href, t.icon, t.label))}
+    ${open ? tab(open.tab!, open.href, open.icon, open.label) : ''}
     <details class="menu sw-more"><summary class="ide-tab">${icon('chevron-down')}<span>More</span></summary>
-      <div class="menu-panel align-right"><div class="menu-section menu-links">${more.map(([k, href, ic, label]) => html`<a href="${BASE}${href}"${k === active ? raw(' aria-current="page"') : ''}>${icon(ic)} ${label}</a>`)}</div></div></details></nav>`;
+      <div class="menu-panel align-right">${TOOL_GROUPS.map(([g, heading]) => {
+        // administrators' tools are on the Launchpad and the Utilities page, not in every developer's menu
+        const list = SQL_TOOLS.filter((t) => t.group === g && !t.main && !t.admin);
+        return list.length ? html`<div class="menu-section menu-links"><span class="small muted">${heading}</span>${list.map((t) => html`<a href="${t.href}"${t.tab && t.tab === active ? raw(' aria-current="page"') : ''}>${icon(t.icon)} ${t.label}</a>`)}</div>` : '';
+      })}</div></details></nav>`;
 };
 
 /** Number of app tile colours (.app-color-0 … -7 in app.css). */

package/src/builder/worksheet.ts

@@ -9,6 +9,7 @@ import { back, bicon, BASE, csrf, developer, flash, send, shell, workshopTabs, t
 import { clearCompletions } from './code-editor.ts';
 import { createTemplate, listObjects, OB_TYPES, pickSchema, SYSTEM_SCHEMAS, type Obj } from './object-browser.ts';
 import { objectMenu } from './object-actions.ts';
+import { askedSpec, chartControls, chartSpec, drawChart } from './sql-charts.ts';
 import { currentWorkspace, inWorkspaceSql, sessionSchema, usableSchemas, workshopDb, workshopRunsAs } from './workspaces.ts';
 import { applySubstitutions, explainStatement, pickStatements, runStatements, substitutionNames, textTable, type RunMode, type WorksheetRun } from '../sqlworksheet.ts';
 import { applyBinds, bindNames } from '../binds.ts';
@@ -30,7 +31,7 @@ import { unloadStatement } from '../unload.ts';
 const NAV_TYPES: [string, string][] = [['all', 'All Objects'], ...OB_TYPES.map(([t, label]) => [t, label] as [string, string]), ['policy', 'Policies']];
 const MODES: RunMode[] = ['statement', 'script', 'explain', 'autotrace'];
 const TABS = [
-  ['result', 'Query Result'], ['output', 'Script Output'], ['notices', 'Notices'], ['explain', 'Explain Plan'], ['autotrace', 'Autotrace'], ['history', 'SQL History'],
+  ['result', 'Query Result'], ['chart', 'Chart'], ['output', 'Script Output'], ['notices', 'Notices'], ['explain', 'Explain Plan'], ['autotrace', 'Autotrace'], ['history', 'SQL History'],
 ] as const;
 type Tab = (typeof TABS)[number][0];
 
@@ -150,7 +151,7 @@ async function navigatorTree(db: Awaited<ReturnType<typeof workshopDb>>, schema:
 }
 
 /** The output panes of a run (empty: the page as opened). */
-function outputPanes(run: WorksheetRun | null, mode: RunMode | null, history: HistoryRow[], tabAsked: string): { panes: Record<Tab, Raw>; active: Tab; status: Raw } {
+function outputPanes(run: WorksheetRun | null, mode: RunMode | null, history: HistoryRow[], tabAsked: string, chart: Raw | null): { panes: Record<Tab, Raw>; active: Tab; status: Raw } {
   const results = run?.results ?? [];
   const ran = results.filter((r) => r.status !== 'not_run');
   const query = [...ran].reverse().find((r) => r.columns);
@@ -175,6 +176,7 @@ function outputPanes(run: WorksheetRun | null, mode: RunMode | null, history: Hi
         <p class="muted small ws-info">${rowsLabel(query)} · ${query.ms} ms${query.more ? html` · showing the first ${query.data!.length}` : ''} · line ${query.line}</p>
         <span class="ws-spacer"></span>
         ${query.more ? html`<button class="btn btn-sm" name="mode" value="statement_all" title="Run the statement again and show up to ${ALL_ROWS.toLocaleString('en')} rows">All rows</button>` : ''}
+        <button class="btn btn-sm" name="mode" value="chart" title="Create Chart (Ctrl+F11)">${icon('chart')}<span>Chart</span></button>
         <button type="button" class="btn btn-sm" data-ws-copy hidden>${icon('copy')}<span>Copy</span></button>
         ${download}
       </div>
@@ -220,7 +222,7 @@ function outputPanes(run: WorksheetRun | null, mode: RunMode | null, history: Hi
       </li>`)}</ul>`
     : html`<p class="muted">Your statements show here after you run them.</p>`;
 
-  const active: Tab = !run ? (TABS.find(([k]) => k === tabAsked)?.[0] ?? 'result') : mode === 'explain' ? 'explain' : mode === 'autotrace' ? 'autotrace' : mode === 'script' || !query || errors.length ? 'output' : 'result';
+  const active: Tab = chart && run ? 'chart' : !run ? (TABS.find(([k]) => k === tabAsked)?.[0] ?? 'result') : mode === 'explain' ? 'explain' : mode === 'autotrace' ? 'autotrace' : mode === 'script' || !query || errors.length ? 'output' : 'result';
   const time = new Date().toTimeString().slice(0, 8);
   const last = !run ? 'Ready.' : errors.length
     ? `Error${errors[0].errorLine ? ` at line ${errors[0].errorLine}` : ''}: ${errors[0].error}`
@@ -231,7 +233,7 @@ function outputPanes(run: WorksheetRun | null, mode: RunMode | null, history: Hi
     <span class="ws-count ${warnings ? 'is-warn' : ''}" title="Warnings">${icon('alert')} ${warnings}</span>
     <span class="ws-busy" hidden>${icon('refresh')} Running…</span>
     <span class="ws-last">${last}</span><span class="muted ws-time">${run ? time : ''}</span>`;
-  return { panes: { result, output: log, notices, explain: planOf('explain', 'Explain Plan (F10) shows how PostgreSQL would run the statement at the cursor; nothing runs.'), autotrace: planOf('autotrace', 'Autotrace (F6) runs the statement at the cursor with EXPLAIN ANALYZE and rolls it back: actual rows, time and buffers per step.'), history: hist }, active, status };
+  return { panes: { result, chart: chart ?? html`<p class="muted">Create Chart (Ctrl+F11) draws the last query: a label column and number columns.</p>`, output: log, notices, explain: planOf('explain', 'Explain Plan (F10) shows how PostgreSQL would run the statement at the cursor; nothing runs.'), autotrace: planOf('autotrace', 'Autotrace (F6) runs the statement at the cursor with EXPLAIN ANALYZE and rolls it back: actual rows, time and buffers per step.'), history: hist }, active, status };
 }
 
 /** The applications whose database role a run can take (the developer's workspace). */
@@ -347,6 +349,7 @@ async function worksheet(req: Req, reply: FastifyReply) {
   const continueOnError = body.continue_on_error === 'on';
   // (sprint 93, DA-9) bind variables (:NAME) and substitution variables (&NAME.) asked for before a run
   let askValues: { binds: string[]; subs: string[]; mode: string } | null = null;
+  let chartAsked = false;
   const remembered: Record<string, string> = (() => {
     try {
       const v = JSON.parse(s.state.__WSBINDS ?? '{}');
@@ -358,6 +361,7 @@ async function worksheet(req: Req, reply: FastifyReply) {
   if (isPost && text.trim() && !['nav', 'save', 'save_as', 'rename', 'download'].includes(String(body.mode ?? ''))) {
     const m: RunMode = MODES.find((x) => x === body.mode) ?? 'statement';
     const allRows = body.mode === 'statement_all';
+    chartAsked = body.mode === 'chart';
     mode = m;
     const sel = /^\d{1,9}$/.test(String(body.sel_start ?? '')) && /^\d{1,9}$/.test(String(body.sel_end ?? '')) ? { start: Number(body.sel_start), end: Number(body.sel_end) } : undefined;
     const picked = pickStatements(text, m, sel);
@@ -410,8 +414,25 @@ async function worksheet(req: Req, reply: FastifyReply) {
   const history = (await owner.query<HistoryRow>(
     `select id, sql, status, rows, ms, error, runs, at from meta.sql_history where username = $1 and workspace_id = $2 order by id desc limit $3`,
     [s.username, currentWorkspace(s), HISTORY_SHOWN])).rows;
-  const { panes, active, status } = outputPanes(run, mode, history, String(req.query?.tab ?? ''));
   const lastQuery = [...(run?.results ?? [])].reverse().find((r) => r.status === 'ok' && r.columns);
+  // (sprint 97, DA-6) Create Chart: the last query drawn, its settings and Save
+  let chartPane: Raw | null = null;
+  let chartCss = '';
+  if (chartAsked && lastQuery?.columns) {
+    const spec = chartSpec(lastQuery.columns, lastQuery.numeric ?? [], askedSpec(body));
+    if (!spec) chartPane = html`<p class="muted">Nothing to draw: the query needs a number column next to its labels.</p>`;
+    else {
+      const d = drawChart('', lastQuery.columns, lastQuery.data ?? [], spec);
+      chartCss = d.css;
+      chartPane = html`${chartControls(lastQuery.columns, spec)}
+        <div class="ch-actions"><button class="btn btn-sm" name="mode" value="chart">${icon('refresh')} Draw again</button>
+          <input type="hidden" name="chart_sql" value="${lastQuery.sql}">
+          <label class="sr-only" for="ws-chart-name">Chart name</label><input id="ws-chart-name" name="chart_name" placeholder="Chart name" maxlength="120">
+          <button class="btn btn-sm btn-hot" formaction="${BASE}/sql/charts">${icon('save')} Save chart</button></div>
+        <div class="ch-view">${d.body}</div>`;
+    }
+  }
+  const { panes, active, status } = outputPanes(run, mode, history, String(req.query?.tab ?? ''), chartPane);
   const downloadable = (() => {
     try {
       return lastQuery ? unloadStatement(lastQuery.sql) : null;
@@ -433,7 +454,7 @@ async function worksheet(req: Req, reply: FastifyReply) {
 
   const toolBtn = (m: RunMode, ic: string, label: string, key: string, hot = false) =>
     html`<button class="btn btn-sm${hot ? ' btn-hot' : ''}" name="mode" value="${m}" title="${label} (${key})" data-ws-key="${key}">${icon(ic)}<span>${label}</span></button>`;
-  const main = html`<div class="ws-page">
+  const main = html`${chartCss ? html`<style nonce="${req.cspNonce}">${raw(chartCss.replace(/</g, ''))}</style>` : ''}<div class="ws-page">
     <h1 class="sr-only">SQL Worksheet</h1>
     ${workshopTabs('sql')}
     <form method="post" action="${BASE}/sql/worksheet" class="ws" id="ws" data-ran="${ran ? `${ran.start},${ran.end}` : ''}" data-error-line="${firstError?.errorLine ?? ''}"
@@ -479,7 +500,9 @@ async function worksheet(req: Req, reply: FastifyReply) {
                 ${script ? html`<button class="btn btn-sm" name="mode" value="save_as">Save as new</button><button class="btn btn-sm" name="mode" value="rename">Rename</button>` : ''}
                 <button class="btn btn-sm" name="mode" value="download">${icon('download')} Download</button>
               </div>
-              <div class="ws-file-actions"><a class="btn btn-sm" href="${BASE}/sql/worksheet?new=1" data-ws-new>${icon('plus')} New</a><a class="btn btn-sm" href="#ws-files" data-ws-open>Open…</a></div>
+              <div class="ws-file-actions"><a class="btn btn-sm" href="${BASE}/sql/worksheet?new=1" data-ws-new>${icon('plus')} New</a><a class="btn btn-sm" href="#ws-files" data-ws-open>Open…</a>
+                ${script ? html`<input type="hidden" name="pin_href" value="${BASE}/sql/worksheet?script=${script.id}"><input type="hidden" name="pin_label" value="${script.name}"><input type="hidden" name="back" value="${BASE}/sql/worksheet?script=${script.id}">
+                  <button class="btn btn-sm" formaction="${BASE}/pins" title="Pin this worksheet to the SQL Workshop home">${icon('pin')} Pin</button>` : ''}</div>
             </div></div></details>
           ${toolBtn('statement', 'play', 'Run Statement', 'Ctrl+Enter', true)}
           ${toolBtn('script', 'file', 'Run Script', 'F5')}

package/src/builder/workspaces.ts

@@ -28,12 +28,13 @@ export const DEFAULT_WORKSPACE = 1;
 /** The workspaces a developer may use (administrators: all), and the current one, on the session object. */
 export async function loadWorkspaces(s: Session) {
   const rows = (
-    await owner.query<WorkspaceRef>(
+    await owner.query<WorkspaceRef & { instance_admin?: boolean }>(
       `select w.id, w.name, w.message, w.banner_label, w.banner_color, w.isolated, w.sql_workshop, w.rest_services,
               coalesce((select json_agg(json_build_object('label', l.label, 'url', l.url, 'description', l.description) order by l.position, lower(l.label))
                           from meta.workspace_link l where l.workspace_id = w.id), '[]') as links,
               exists (select 1 from meta.developer d where d.username = $1 and d.is_admin)
-                or exists (select 1 from meta.workspace_member m where m.workspace_id = w.id and m.username = $1 and m.is_admin) as admin
+                or exists (select 1 from meta.workspace_member m where m.workspace_id = w.id and m.username = $1 and m.is_admin) as admin,
+              exists (select 1 from meta.developer d where d.username = $1 and d.is_admin) as instance_admin
          from meta.workspace w
         where exists (select 1 from meta.developer d where d.username = $1 and d.is_admin)
            or exists (select 1 from meta.workspace_member m where m.workspace_id = w.id and m.username = $1)
@@ -42,6 +43,7 @@ export async function loadWorkspaces(s: Session) {
     )
   ).rows;
   s.workspaces = rows;
+  s.instanceAdmin = !!rows[0]?.instance_admin;
   const wanted = Number(s.state.__WS);
   s.workspace = rows.find((w) => w.id === wanted) ?? rows[0] ?? null;
 }

package/src/cli/replace.ts

@@ -72,7 +72,9 @@ export const KEPT = ['app_access', 'api_client', 'session', 'sso_pending', 'save
   // (081) the mail service an application sends through, and its queued and sent mail
   'app_mail_service', 'mail_queue',
   // (086) users' preferences
-  'user_preference'];
+  'user_preference',
+  // (113) AutoREST: the tables and views the application publishes (SQL Workshop › RESTful Services)
+  'rest_object'];
 /** Children of pages (replaced with their page). */
 const PAGE_CHILDREN = ['region', 'item', 'button', 'dynamic_action', 'validation', 'process', 'computation', 'branch'];
 /** References into replaced tables from kept data, repointed below: "table.column". */